[javapackages] [test] modified pom macros test to use xml_compare
by Michael Šimáček
commit 5c7ec726993483dcb96cd45c3e5c7fd8f771e261
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Thu Nov 7 09:36:33 2013 +0100
[test] modified pom macros test to use xml_compare
test/pom_macros_test.py | 195 +++++++++++++++++++++++------------------------
1 files changed, 96 insertions(+), 99 deletions(-)
---
diff --git a/test/pom_macros_test.py b/test/pom_macros_test.py
index 784079c..95b844b 100644
--- a/test/pom_macros_test.py
+++ b/test/pom_macros_test.py
@@ -7,6 +7,7 @@ from lxml import etree
from formencode import doctest_xml_compare
from test_rpmbuild import Package
+from xml_compare import compare_xml_files
ns = dict(a='http://maven.apache.org/POM/4.0.0')
dirpath = os.path.dirname(os.path.realpath(__file__))
@@ -54,15 +55,11 @@ class PomMacrosTest(unittest.TestCase):
pass
os.chdir(cls.olddir)
- def xml_compare_reporter(self, report):
- print report
-
def check_result(self, pom_path):
- got = etree.parse(pom_path).getroot()
wantpath = '{pom}-want'.format(pom=os.path.basename(pom_path))
- want = etree.parse(wantpath).getroot()
- res = doctest_xml_compare.xml_compare(got, want, self.xml_compare_reporter)
- return got, want, res
+ report = compare_xml_files(pom_path, wantpath)
+ res = not report
+ return report, res
def get_result_literally(self, pom_path):
with open(pom_path, 'r') as gotfile:
@@ -77,86 +74,86 @@ class PomMacrosTest(unittest.TestCase):
def test_remove_dep(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_remove_dep commons-io:commons-io", "pom_remove_dep2.xml")
def test_remove_deps(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_remove_dep junit:", "pom_remove_dep_nons.xml")
def test_remove_dep_nons(self, stdin, stderr, returncode, pom_path):
# no namespace
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_remove_dep not:there", "pom_remove_dep_ret1.xml")
def test_remove_dep_no_effect(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 1, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_remove_plugin :my-plugin", "pom_remove_plugin.xml")
def test_remove_plugin(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_remove_plugin my.group:my-plugin", "pom_remove_plugin2.xml")
def test_remove_plugins(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_remove_plugin :my-plugin", "pom_remove_plugin_nons.xml")
def test_remove_plugin_nons(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_remove_plugin not:there", "pom_remove_plugin_ret1.xml")
def test_remove_plugin_ret1(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 1)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_disable_module module", "pom_disable_module.xml")
def test_disable_module(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_disable_module module", "pom_disable_module_nons.xml")
def test_disable_module_nons(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_disable_module notthere", "pom_disable_module_ret1.xml")
def test_disable_module_no_effect(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 1)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_add_dep gdep:adep:3.2:test", "pom_add_dep.xml")
def test_add_dep(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_add_dep gdep:adep:3.2:test", "pom_add_dep_whitespace.xml")
def test_add_dep_whitespace(self, stdin, stderr, returncode, pom_path):
@@ -169,78 +166,78 @@ class PomMacrosTest(unittest.TestCase):
def test_add_dep2(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_add_dep A:B::compile", "pom_add_dep_nons.xml")
def test_add_dep_nons(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_add_dep_mgmt gdep:adep:3.2:test", "pom_add_dep_mgmt.xml")
def test_add_dep_mgmt(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_add_dep_mgmt gdep:adep", "pom_add_dep_mgmt2.xml")
def test_add_dep_mgmt2(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_add_dep_mgmt gdep:adep", "pom_add_dep_mgmt_nons.xml")
def test_add_dep_mgmt_nons(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_add_plugin plugin:plug:3", "pom_add_plugin.xml")
def test_add_plugin(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_add_plugin plug:plug", "pom_add_plugin2.xml")
def test_add_plugin2(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_add_plugin g:a:15", "pom_add_plugin_nons.xml")
def test_add_plugin_nons(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_add_plugin :A-A", "pom_add_plugin_default_gid.xml")
def test_add_plugin_default_gid(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_remove_parent", "pom_remove_parent.xml")
def test_remove_parent(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_remove_parent", "pom_remove_parent_nons.xml")
def test_remove_parent_nons(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_remove_parent", "pom_remove_parent_fail.xml")
def test_remove_parent_fail(self, stdin, stderr, returncode, pom_path):
@@ -250,80 +247,80 @@ class PomMacrosTest(unittest.TestCase):
def test_add_parent(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_add_parent pg:pa", "pom_add_parent_nons.xml")
def test_add_parent_nons(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_add_parent pg:p-a:1", "pom_add_parent_second.xml")
def test_add_parent_second(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_set_parent pg:aa:5", "pom_set_parent.xml")
def test_set_parent(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_set_parent pg:aa", "pom_set_parent_nons.xml")
def test_set_parent_nons(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_set_parent pg:aa", "pom_set_parent_fail.xml")
def test_set_parent_fail(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 1, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_xpath_remove pom:maven-old", "pom_xpath_remove.xml")
def test_xpath_remove(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_xpath_remove \"pom:dependency[pom:artifactId[text()='m-m']]\"",
"pom_xpath_remove2.xml")
def test_xpath_remove2(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_xpath_remove pom:dependencies", "pom_xpath_remove_nons.xml")
def test_xpath_remove_nons(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_xpath_remove pom:not/pom:there", "pom_xpath_remove_fail.xml")
def test_xpath_remove_fail(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 1, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_xpath_inject pom:parent '<version>1.2</version>'",
"pom_xpath_inject.xml")
def test_xpath_inject(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_xpath_inject pom:parent '<version>1.2</version>'",
"pom_xpath_inject_whitespace.xml")
@@ -347,16 +344,16 @@ class PomMacrosTest(unittest.TestCase):
def test_xpath_inject2(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_xpath_inject pom:project '<name>Commons Lang</name>'",
"pom_xpath_inject_nons.xml")
def test_xpath_inject_nons(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_xpath_inject pom:project '<name>Commons Lang<name>'",
"pom_xpath_inject_fail.xml")
@@ -364,16 +361,16 @@ class PomMacrosTest(unittest.TestCase):
# invalid XML code
self.assertEqual(returncode, 1, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_xpath_replace pom:parent/pom:groupId '<groupId>commons</groupId>'",
"pom_xpath_replace.xml")
def test_xpath_replace(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_xpath_replace pom:parent/pom:groupId '<groupId>commons</groupId>'",
"pom_xpath_replace_whitespace.xml")
@@ -388,63 +385,63 @@ class PomMacrosTest(unittest.TestCase):
def test_xpath_replace2(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_xpath_replace pom:parent '<groupId>org.apache.commons</groupId>'",
"pom_xpath_replace_nons.xml")
def test_xpath_replace_nons(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_xpath_replace pom:project/pom:not/pom:there '<groupId>commons</groupId>'",
"pom_xpath_replace_fail.xml")
def test_xpath_replace_fail(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 1, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_xpath_replace pom:project/pom:groupId '<groupId>commons<groupId>'",
"pom_xpath_replace_invalid.xml")
def test_xpath_replace_invalid_xml(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 1, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_xpath_set pom:project/pom:groupId 'commons'",
"pom_xpath_set.xml")
def test_xpath_set(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_xpath_set \"pom:build/pom:plugins/pom:plugin[pom:groupId\
[text()='org.codehaus.mojo']]/pom:version\" 2", "pom_xpath_set2.xml")
def test_xpath_set2(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_xpath_set pom:parent/pom:artifactId 'a-Id'", "pom_xpath_set_nons.xml")
def test_xpath_set_nons(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 0, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_xpath_set pom:project/pom:parent/pom:notThere Project",
"pom_xpath_set_fail.xml")
def test_xpath_set_fail(self, stdin, stderr, returncode, pom_path):
self.assertEqual(returncode, 1, stderr)
- got, want, res = self.check_result(pom_path)
- self.assertEqual(res, True)
+ report, res = self.check_result(pom_path)
+ self.assertEqual(res, True, report)
@exec_macro("pom_remove_parent", "unparsable_xml.pom")
def test_unparsable_xml(self, stdin, stderr, returncode, pom_path):
10 years, 6 months
Broken dependencies: maven-doxia
by Fedora Koji Build System
maven-doxia has broken dependencies in the rawhide tree:
On x86_64:
maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7)
On i386:
maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7)
On armhfp:
maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7)
Please resolve this as soon as possible.
10 years, 6 months
[hibernate] Upstream release 4.3.0.Beta4
by Marek Goldmann
commit 2d030486f30b2e7d4122d92793105f5edc93dba2
Author: Marek Goldmann <marek.goldmann(a)gmail.com>
Date: Thu Nov 7 14:11:49 2013 +0100
Upstream release 4.3.0.Beta4
- Switched from Gradle to Maven for easier maintenance
- Switched to XMvn
- Latest guidelines
.gitignore | 1 +
...ate-4.1.6.Final-fix-incorrect-fsf-address.patch | 20 -
hibernate-4.1.7.Final-build.patch | 344 ---------------
hibernate-c3p0-4.1.7.Final.pom | 234 -----------
hibernate-c3p0-4.3.0.Beta4.pom | 65 +++
hibernate-core-4.1.7.Final.pom | 330 ---------------
hibernate-core-4.3.0.Beta4.pom | 95 +++++
hibernate-ehcache-4.1.7.Final.pom | 222 ----------
hibernate-ehcache-4.3.0.Beta4.pom | 65 +++
hibernate-entitymanager-4.1.7.Final.pom | 306 --------------
hibernate-entitymanager-4.3.0.Beta4.pom | 89 ++++
hibernate-envers-4.1.7.Final.pom | 222 ----------
hibernate-envers-4.3.0.Beta4.pom | 65 +++
hibernate-infinispan-4.1.7.Final.pom | 363 ----------------
hibernate-infinispan-4.3.0.Beta4.pom | 71 ++++
hibernate-parent-4.3.0.Beta4.pom | 21 +
hibernate-proxool-4.1.7.Final.pom | 222 ----------
hibernate-proxool-4.3.0.Beta4.pom | 65 +++
hibernate-testing-4.1.7.Final.pom | 222 ----------
hibernate-testing-4.3.0.Beta4.pom | 95 +++++
hibernate.spec | 443 ++++++++------------
sources | 2 +-
22 files changed, 807 insertions(+), 2755 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 32b5854..a459ec7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/hibernate-release-4.1.7.Final.tgz
+/4.3.0.Beta4.tar.gz
diff --git a/hibernate-c3p0-4.3.0.Beta4.pom b/hibernate-c3p0-4.3.0.Beta4.pom
new file mode 100644
index 0000000..1c6d130
--- /dev/null
+++ b/hibernate-c3p0-4.3.0.Beta4.pom
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-c3p0</artifactId>
+ <version>4.3.0.Beta4</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.1.3.GA</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ <version>1.2.0.Beta1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>4.3.0.Beta4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.mchange</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>0.9.2.1</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <name>Hibernate/c3p0 Integration</name>
+ <description>Integration for c3p0 Connection pooling into Hibernate O/RM</description>
+ <url>http://hibernate.org</url>
+ <organization>
+ <name>Hibernate.org</name>
+ <url>http://hibernate.org</url>
+ </organization>
+ <issueManagement>
+ <system>jira</system>
+ <url>https://hibernate.atlassian.net/browse/HHH</url>
+ </issueManagement>
+ <scm>
+ <url>http://github.com/hibernate/hibernate-orm</url>
+ <connection>scm:git:http://github.com/hibernate/hibernate-orm.git</connection>
+ <developerConnection>scm:git:git@github.com:hibernate/hibernate-orm.git</developerConnection>
+ </scm>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+ <comments>See discussion at http://hibernate.org/license for more details.</comments>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>hibernate-team</id>
+ <name>The Hibernate Development Team</name>
+ <organization>Hibernate.org</organization>
+ <organizationUrl>http://hibernate.org</organizationUrl>
+ </developer>
+ </developers>
+</project>
diff --git a/hibernate-core-4.3.0.Beta4.pom b/hibernate-core-4.3.0.Beta4.pom
new file mode 100644
index 0000000..dbe99bc
--- /dev/null
+++ b/hibernate-core-4.3.0.Beta4.pom
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>4.3.0.Beta4</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.1.3.GA</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ <version>1.2.0.Beta1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+ <version>1.0.0.Alpha1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.common</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>4.0.4.Final</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
+ <version>1.0.0.Final</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.18.1-GA</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>2.7.7</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jandex</artifactId>
+ <version>1.1.0.Alpha1</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <name>Core Hibernate O/RM functionality</name>
+ <description>The core O/RM functionality as provided by Hibernate</description>
+ <url>http://hibernate.org</url>
+ <organization>
+ <name>Hibernate.org</name>
+ <url>http://hibernate.org</url>
+ </organization>
+ <issueManagement>
+ <system>jira</system>
+ <url>https://hibernate.atlassian.net/browse/HHH</url>
+ </issueManagement>
+ <scm>
+ <url>http://github.com/hibernate/hibernate-orm</url>
+ <connection>scm:git:http://github.com/hibernate/hibernate-orm.git</connection>
+ <developerConnection>scm:git:git@github.com:hibernate/hibernate-orm.git</developerConnection>
+ </scm>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+ <comments>See discussion at http://hibernate.org/license for more details.</comments>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>hibernate-team</id>
+ <name>The Hibernate Development Team</name>
+ <organization>Hibernate.org</organization>
+ <organizationUrl>http://hibernate.org</organizationUrl>
+ </developer>
+ </developers>
+</project>
diff --git a/hibernate-ehcache-4.3.0.Beta4.pom b/hibernate-ehcache-4.3.0.Beta4.pom
new file mode 100644
index 0000000..dc19fd7
--- /dev/null
+++ b/hibernate-ehcache-4.3.0.Beta4.pom
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-ehcache</artifactId>
+ <version>4.3.0.Beta4</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.1.3.GA</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ <version>1.2.0.Beta1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>4.3.0.Beta4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ <version>2.4.3</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <name>Hibernate/Ehcache Integration</name>
+ <description>Integration for Ehcache into Hibernate as a second-level caching service</description>
+ <url>http://hibernate.org</url>
+ <organization>
+ <name>Hibernate.org</name>
+ <url>http://hibernate.org</url>
+ </organization>
+ <issueManagement>
+ <system>jira</system>
+ <url>https://hibernate.atlassian.net/browse/HHH</url>
+ </issueManagement>
+ <scm>
+ <url>http://github.com/hibernate/hibernate-orm</url>
+ <connection>scm:git:http://github.com/hibernate/hibernate-orm.git</connection>
+ <developerConnection>scm:git:git@github.com:hibernate/hibernate-orm.git</developerConnection>
+ </scm>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+ <comments>See discussion at http://hibernate.org/license for more details.</comments>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>hibernate-team</id>
+ <name>The Hibernate Development Team</name>
+ <organization>Hibernate.org</organization>
+ <organizationUrl>http://hibernate.org</organizationUrl>
+ </developer>
+ </developers>
+</project>
diff --git a/hibernate-entitymanager-4.3.0.Beta4.pom b/hibernate-entitymanager-4.3.0.Beta4.pom
new file mode 100644
index 0000000..a26d10c
--- /dev/null
+++ b/hibernate-entitymanager-4.3.0.Beta4.pom
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>4.3.0.Beta4</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.1.3.GA</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ <version>1.2.0.Beta1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>4.3.0.Beta4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.common</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>4.0.4.Final</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.1-api</artifactId>
+ <version>1.0.0.Final</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+ <version>1.0.0.Alpha1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.18.1-GA</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <name>Hibernate JPA Support</name>
+ <description>Hibernate O/RM implementation of the JPA specification</description>
+ <url>http://hibernate.org</url>
+ <organization>
+ <name>Hibernate.org</name>
+ <url>http://hibernate.org</url>
+ </organization>
+ <issueManagement>
+ <system>jira</system>
+ <url>https://hibernate.atlassian.net/browse/HHH</url>
+ </issueManagement>
+ <scm>
+ <url>http://github.com/hibernate/hibernate-orm</url>
+ <connection>scm:git:http://github.com/hibernate/hibernate-orm.git</connection>
+ <developerConnection>scm:git:git@github.com:hibernate/hibernate-orm.git</developerConnection>
+ </scm>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+ <comments>See discussion at http://hibernate.org/license for more details.</comments>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>hibernate-team</id>
+ <name>The Hibernate Development Team</name>
+ <organization>Hibernate.org</organization>
+ <organizationUrl>http://hibernate.org</organizationUrl>
+ </developer>
+ </developers>
+</project>
diff --git a/hibernate-envers-4.3.0.Beta4.pom b/hibernate-envers-4.3.0.Beta4.pom
new file mode 100644
index 0000000..5964f72
--- /dev/null
+++ b/hibernate-envers-4.3.0.Beta4.pom
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-envers</artifactId>
+ <version>4.3.0.Beta4</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.1.3.GA</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ <version>1.2.0.Beta1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>4.3.0.Beta4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>4.3.0.Beta4</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <name>Entity versioning support</name>
+ <description>Entity versioning support</description>
+ <url>http://hibernate.org</url>
+ <organization>
+ <name>Hibernate.org</name>
+ <url>http://hibernate.org</url>
+ </organization>
+ <issueManagement>
+ <system>jira</system>
+ <url>https://hibernate.atlassian.net/browse/HHH</url>
+ </issueManagement>
+ <scm>
+ <url>http://github.com/hibernate/hibernate-orm</url>
+ <connection>scm:git:http://github.com/hibernate/hibernate-orm.git</connection>
+ <developerConnection>scm:git:git@github.com:hibernate/hibernate-orm.git</developerConnection>
+ </scm>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+ <comments>See discussion at http://hibernate.org/license for more details.</comments>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>hibernate-team</id>
+ <name>The Hibernate Development Team</name>
+ <organization>Hibernate.org</organization>
+ <organizationUrl>http://hibernate.org</organizationUrl>
+ </developer>
+ </developers>
+</project>
diff --git a/hibernate-infinispan-4.3.0.Beta4.pom b/hibernate-infinispan-4.3.0.Beta4.pom
new file mode 100644
index 0000000..34ca3f4
--- /dev/null
+++ b/hibernate-infinispan-4.3.0.Beta4.pom
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-infinispan</artifactId>
+ <version>4.3.0.Beta4</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.1.3.GA</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ <version>1.2.0.Beta1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>4.3.0.Beta4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.infinispan</groupId>
+ <artifactId>infinispan-core</artifactId>
+ <version>5.3.0.Final</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.rhq.helpers</groupId>
+ <artifactId>rhq-pluginAnnotations</artifactId>
+ <version>3.0.4</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <name>Hibernate/Infinispan Integration</name>
+ <description>Integration for Infinispan into Hibernate as a second-level caching service</description>
+ <url>http://hibernate.org</url>
+ <organization>
+ <name>Hibernate.org</name>
+ <url>http://hibernate.org</url>
+ </organization>
+ <issueManagement>
+ <system>jira</system>
+ <url>https://hibernate.atlassian.net/browse/HHH</url>
+ </issueManagement>
+ <scm>
+ <url>http://github.com/hibernate/hibernate-orm</url>
+ <connection>scm:git:http://github.com/hibernate/hibernate-orm.git</connection>
+ <developerConnection>scm:git:git@github.com:hibernate/hibernate-orm.git</developerConnection>
+ </scm>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+ <comments>See discussion at http://hibernate.org/license for more details.</comments>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>hibernate-team</id>
+ <name>The Hibernate Development Team</name>
+ <organization>Hibernate.org</organization>
+ <organizationUrl>http://hibernate.org</organizationUrl>
+ </developer>
+ </developers>
+</project>
diff --git a/hibernate-parent-4.3.0.Beta4.pom b/hibernate-parent-4.3.0.Beta4.pom
new file mode 100644
index 0000000..c97ee37
--- /dev/null
+++ b/hibernate-parent-4.3.0.Beta4.pom
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-parent</artifactId>
+ <version>4.3.0.Beta4</version>
+ <packaging>pom</packaging>
+ <name>Hibernate Parent</name>
+
+ <modules>
+ <module>hibernate-core</module>
+ <module>hibernate-c3p0</module>
+ <module>hibernate-envers</module>
+ <module>hibernate-ehcache</module>
+ <module>hibernate-entitymanager</module>
+ <module>hibernate-infinispan</module>
+ <module>hibernate-proxool</module>
+ <module>hibernate-testing</module>
+ </modules>
+
+</project>
diff --git a/hibernate-proxool-4.3.0.Beta4.pom b/hibernate-proxool-4.3.0.Beta4.pom
new file mode 100644
index 0000000..73616c5
--- /dev/null
+++ b/hibernate-proxool-4.3.0.Beta4.pom
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-proxool</artifactId>
+ <version>4.3.0.Beta4</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.1.3.GA</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ <version>1.2.0.Beta1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>4.3.0.Beta4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>proxool</groupId>
+ <artifactId>proxool</artifactId>
+ <version>0.8.3</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <name>Hibernate/Proxool Integration</name>
+ <description>Integration for Proxool Connection pooling into Hibernate O/RM</description>
+ <url>http://hibernate.org</url>
+ <organization>
+ <name>Hibernate.org</name>
+ <url>http://hibernate.org</url>
+ </organization>
+ <issueManagement>
+ <system>jira</system>
+ <url>https://hibernate.atlassian.net/browse/HHH</url>
+ </issueManagement>
+ <scm>
+ <url>http://github.com/hibernate/hibernate-orm</url>
+ <connection>scm:git:http://github.com/hibernate/hibernate-orm.git</connection>
+ <developerConnection>scm:git:git@github.com:hibernate/hibernate-orm.git</developerConnection>
+ </scm>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+ <comments>See discussion at http://hibernate.org/license for more details.</comments>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>hibernate-team</id>
+ <name>The Hibernate Development Team</name>
+ <organization>Hibernate.org</organization>
+ <organizationUrl>http://hibernate.org</organizationUrl>
+ </developer>
+ </developers>
+</project>
diff --git a/hibernate-testing-4.3.0.Beta4.pom b/hibernate-testing-4.3.0.Beta4.pom
new file mode 100644
index 0000000..1c95ef1
--- /dev/null
+++ b/hibernate-testing-4.3.0.Beta4.pom
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-testing</artifactId>
+ <version>4.3.0.Beta4</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.1.3.GA</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-annotations</artifactId>
+ <version>1.2.0.Beta1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>4.3.0.Beta4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.byteman</groupId>
+ <artifactId>byteman</artifactId>
+ <version>2.1.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.byteman</groupId>
+ <artifactId>byteman-install</artifactId>
+ <version>2.1.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.byteman</groupId>
+ <artifactId>byteman-bmunit</artifactId>
+ <version>2.1.2</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.experlog</groupId>
+ <artifactId>xapool</artifactId>
+ <version>1.5.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossts</groupId>
+ <artifactId>jbossjta</artifactId>
+ <version>4.16.4.Final</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <name>A Hibernate O/RM module</name>
+ <description>A module of the Hibernate O/RM project</description>
+ <url>http://hibernate.org</url>
+ <organization>
+ <name>Hibernate.org</name>
+ <url>http://hibernate.org</url>
+ </organization>
+ <issueManagement>
+ <system>jira</system>
+ <url>https://hibernate.atlassian.net/browse/HHH</url>
+ </issueManagement>
+ <scm>
+ <url>http://github.com/hibernate/hibernate-orm</url>
+ <connection>scm:git:http://github.com/hibernate/hibernate-orm.git</connection>
+ <developerConnection>scm:git:git@github.com:hibernate/hibernate-orm.git</developerConnection>
+ </scm>
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License</name>
+ <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+ <comments>See discussion at http://hibernate.org/license for more details.</comments>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>hibernate-team</id>
+ <name>The Hibernate Development Team</name>
+ <organization>Hibernate.org</organization>
+ <organizationUrl>http://hibernate.org</organizationUrl>
+ </developer>
+ </developers>
+</project>
diff --git a/hibernate.spec b/hibernate.spec
index 8dd9773..0380194 100644
--- a/hibernate.spec
+++ b/hibernate.spec
@@ -1,15 +1,15 @@
-%global namedreltag .Final
+%global namedreltag .Beta4
%global namedversion %{version}%{?namedreltag}
Name: hibernate
-Version: 4.1.7
-Release: 8%{?dist}
+Version: 4.3.0
+Release: 0.1%{namedreltag}%{?dist}
Summary: Relational persistence and query service
Group: Development/Libraries
License: LGPLv2+ and ASL 2.0
URL: http://www.hibernate.org/
-Source0: http://sourceforge.net/projects/hibernate/files/hibernate4/%{namedversion...
-# TODO remove these poms when gradle maven plugin work properly
+Source0: https://github.com/hibernate/hibernate-orm/archive/%{namedversion}.tar.gz
+
Source1: http://repo1.maven.org/maven2/org/hibernate/hibernate-c3p0/%{namedversion...
Source2: http://repo1.maven.org/maven2/org/hibernate/hibernate-core/%{namedversion...
Source3: http://repo1.maven.org/maven2/org/hibernate/hibernate-ehcache/%{namedvers...
@@ -19,35 +19,34 @@ Source6: http://repo1.maven.org/maven2/org/hibernate/hibernate-infinispan/
Source7: http://repo1.maven.org/maven2/org/hibernate/hibernate-proxool/%{namedvers...
Source8: http://repo1.maven.org/maven2/org/hibernate/hibernate-testing/%{namedvers...
+# Custom hibernate-parent POM
+Source50: hibernate-parent-%{namedversion}.pom
+
# hibernate package don't include ASL license file
Source9: http://www.apache.org/licenses/LICENSE-2.0.txt
-Patch0: hibernate-4.1.7.Final-build.patch
-Patch1: hibernate-4.1.6.Final-fix-incorrect-fsf-address.patch
-
BuildRequires: java-devel
-BuildRequires: jpackage-utils
+BuildRequires: maven-local
BuildRequires: ant
BuildRequires: antlr-tool
BuildRequires: bean-validation-api
BuildRequires: byteman
BuildRequires: c3p0
+BuildRequires: cdi-api
BuildRequires: classmate
BuildRequires: dom4j
BuildRequires: ehcache-core
BuildRequires: h2
BuildRequires: hibernate-commons-annotations
BuildRequires: hibernate-jpa-2.0-api
-# BuildRequires: hibernate-tools https://bugzilla.redhat.com/show_bug.cgi?id=826701
BuildRequires: hibernate-validator
BuildRequires: infinispan
BuildRequires: jandex
BuildRequires: javassist
BuildRequires: jboss-common-core
BuildRequires: jboss-jacc-1.4-api
-# jboss-jts 4.16.4.Final
-BuildRequires: jboss-jts
+BuildRequires: narayana
BuildRequires: jboss-logging
BuildRequires: jboss-naming
BuildRequires: jboss-transaction-1.1-api
@@ -60,8 +59,6 @@ BuildRequires: rhq-plugin-annotations
BuildRequires: shrinkwrap
BuildRequires: slf4j
BuildRequires: xapool
-
-# build tools and deps
BuildRequires: annox
BuildRequires: apache-commons-beanutils
BuildRequires: apache-commons-lang
@@ -69,32 +66,18 @@ BuildRequires: apache-commons-logging
BuildRequires: codemodel
BuildRequires: glassfish-jaxb
BuildRequires: glassfish-jaxb-api
-BuildRequires: gradle
BuildRequires: hibernate-jpamodelgen
BuildRequires: istack-commons
BuildRequires: jaxb2-common-basics
BuildRequires: jboss-logging-tools
-# BuildRequires: maven-wagon
-BuildRequires: rngom
-BuildRequires: txw2
-BuildRequires: xsom
-
-Requires: ant
-Requires: antlr-tool
-Requires: bean-validation-api
-Requires: classmate
-Requires: dom4j
-Requires: hibernate-commons-annotations
-Requires: hibernate-jpa-2.0-api
-Requires: hibernate-validator
-Requires: jandex
-Requires: javassist
-Requires: jboss-jacc-1.4-api
-Requires: jboss-logging
-Requires: jboss-transaction-1.1-api
-
-Requires: java
-Requires: jpackage-utils
+
+BuildRequires: mvn(org.jvnet.jaxb2_commons:jaxb2-basics-runtime)
+BuildRequires: mvn(org.jvnet.jaxb2.maven2:maven-jaxb22-plugin)
+BuildRequires: antlr-maven-plugin
+
+BuildRequires: maven-jaxb2-plugin
+BuildRequires: hibernate-hql
+
BuildArch: noarch
%description
@@ -111,83 +94,50 @@ provides an elegant bridge between the object and
relational worlds. Hibernate is now the most
popular ORM solution for Java.
+%package core
+Summary: Hibernate Core
+
+%description core
+Core Hibernate O/RM functionality
+
%package c3p0
-Group: Development/Libraries
Summary: Hibernate C3P0 ConnectionProvider
-Requires: c3p0
-Requires: jboss-logging
-Requires: %{name} = %{version}-%{release}
%description c3p0
C3P0-based implementation of the Hibernate ConnectionProvder contract.
%package ehcache
-Group: Development/Libraries
Summary: Hibernate Ehcache Integration
-Requires: ehcache-core
-Requires: jboss-logging
-Requires: %{name} = %{version}-%{release}
%description ehcache
Integration of Hibernate with Ehcache.
%package entitymanager
-Group: Development/Libraries
Summary: Hibernate Entity Manager
-Requires: dom4j
-Requires: hibernate-commons-annotations
-Requires: hibernate-jpa-2.0-api
-Requires: javassist
-Requires: jboss-logging
-Requires: jboss-transaction-1.1-api
-Requires: %{name} = %{version}-%{release}
%description entitymanager
Hibernate Entity Manager.
%package envers
-Group: Development/Libraries
Summary: Hibernate Envers
-# Requires: hibernate-tools
-Requires: jboss-logging
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-entitymanager = %{version}-%{release}
%description envers
Support for entity auditing.
%package infinispan
-Group: Development/Libraries
Summary: Hibernate Infinispan Integration
-Requires: infinispan
-Requires: jboss-common-core
-Requires: jboss-logging
-Requires: rhq-plugin-annotations
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-testing = %{version}-%{release}
%description infinispan
Integration of Hibernate with Infinispan.
%package proxool
-Group: Development/Libraries
Summary: Hibernate Proxool ConnectionProvider
-Requires: jboss-logging
-Requires: proxool
-Requires: %{name} = %{version}-%{release}
%description proxool
Proxool-based implementation of the Hibernate ConnectionProvder contract.
%package testing
-Group: Development/Libraries
Summary: Hibernate Testing
-Requires: byteman
-# jboss-jts 4.16.4.Final
-Requires: jboss-jts
-Requires: junit
-Requires: xapool
-Requires: %{name} = %{version}-%{release}
%description testing
Hibernate JUnit test utilities.
@@ -195,236 +145,191 @@ Hibernate JUnit test utilities.
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
%prep
-%setup -q -n hibernate-release-%{namedversion}
+%setup -q -n hibernate-orm-%{namedversion}
find . -name "*.jar" -delete
find . -name "*.class" -delete
rm -r documentation/*
-mv -f project/* .
-
-%patch0 -p1
-%patch1 -p0
-
-
-# FIXME
-cp -p %{SOURCE6} .
-# infinispan
-sed -i "s|<version>5.1.6.FINAL</version>|<version>5.1.2.FINAL</version>|" hibernate-infinispan-%{namedversion}.pom
-cp -p %{SOURCE8} .
-# jboss-jts
-sed -i "s|<version>4.16.4.Final</version>|<version>4.16.2.Final</version>|" hibernate-testing-%{namedversion}.pom
-
-sed -i "s|<artifactId>jbossjta</artifactId>|<artifactId>jbossjts</artifactId>|" hibernate-testing-%{namedversion}.pom
-# jbossjta was removed in jboss-jts 4.16.2-10 package
-sed -i "s|org.jboss.jbossts:jboss-jts/jbossjta:4.16.4.Final|org.jboss.jbossts:jboss-jts/jbossjts:4.16.4.Final|" libraries.gradle
+# Copy poms
+cp %{SOURCE50} pom.xml
+cp %{SOURCE1} hibernate-c3p0/pom.xml
+cp %{SOURCE2} hibernate-core/pom.xml
+cp %{SOURCE3} hibernate-ehcache/pom.xml
+cp %{SOURCE4} hibernate-entitymanager/pom.xml
+cp %{SOURCE5} hibernate-envers/pom.xml
+cp %{SOURCE6} hibernate-infinispan/pom.xml
+cp %{SOURCE7} hibernate-proxool/pom.xml
+cp %{SOURCE8} hibernate-testing/pom.xml
+
+pushd hibernate-core
+
+%pom_add_plugin "org.jvnet.jaxb2.maven2:maven-jaxb22-plugin"
+%pom_xpath_inject "pom:plugins/pom:plugin[pom:artifactId = 'maven-jaxb22-plugin']" "
+<executions>
+ <execution>
+ <id>hibernate-configuration</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <schemaIncludes>
+ <include>hibernate-configuration-4.0.xsd</include>
+ </schemaIncludes>
+ <bindingIncludes>
+ <include>hbm-configuration-bindings.xjb</include>
+ </bindingIncludes>
+ <generatePackage>org.hibernate.internal.jaxb.cfg</generatePackage>
+ <generateDirectory>\${project.build.directory}/generated-sources/hibernate-configuration</generateDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>hibernate-mapping</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <schemaIncludes>
+ <include>hibernate-mapping-4.0.xsd</include>
+ </schemaIncludes>
+ <bindingIncludes>
+ <include>hbm-mapping-bindings.xjb</include>
+ </bindingIncludes>
+ <generatePackage>org.hibernate.internal.jaxb.mapping.hbm</generatePackage>
+ <generateDirectory>\${project.build.directory}/generated-sources/hibernate-mapping</generateDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>hibernate-orm</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <schemaIncludes>
+ <include>jpa/orm_2_0.xsd</include>
+ </schemaIncludes>
+ <bindingIncludes>
+ <include>orm-bindings.xjb</include>
+ </bindingIncludes>
+ <generatePackage>org.hibernate.internal.jaxb.mapping.orm</generatePackage>
+ <generateDirectory>\${project.build.directory}/generated-sources/hibernate-orm</generateDirectory>
+ </configuration>
+ </execution>
+</executions>
+<configuration>
+ <schemaDirectory>src/main/resources/org/hibernate</schemaDirectory>
+ <bindingDirectory>src/main/xjb</bindingDirectory>
+ <extension>true</extension>
+ <plugins>
+ <plugin>
+ <groupId>org.jvnet.jaxb2_commons</groupId>
+ <artifactId>jaxb2-basics</artifactId>
+ <version>0.6.3</version>
+ </plugin>
+ </plugins>
+ <args>
+ <arg>-Xinheritance</arg>
+ </args>
+</configuration>"
+
+
+%pom_add_plugin "org.codehaus.mojo:antlr-maven-plugin"
+%pom_xpath_inject "pom:plugins/pom:plugin[pom:artifactId = 'antlr-maven-plugin']" "
+<configuration>
+ <grammars>*</grammars>
+</configuration>
+<executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+</executions>"
+
+%pom_add_plugin "org.apache.maven.plugins:maven-compiler-plugin"
+%pom_xpath_inject "pom:plugins/pom:plugin[pom:artifactId = 'maven-compiler-plugin']" "
+<configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+</configuration>
+<inherited>true</inherited>"
+
+popd
+
+# Add missing deps
+%pom_add_dep "com.fasterxml:classmate" hibernate-core/pom.xml
+%pom_add_dep "org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec" hibernate-core/pom.xml
+%pom_add_dep "org.apache.ant:ant" hibernate-core/pom.xml
+%pom_add_dep "javax.validation:validation-api" hibernate-core/pom.xml
+%pom_add_dep "junit:junit:4:test" hibernate-core/pom.xml
+%pom_add_dep "org.hibernate:hibernate-testing:%{namedversion}:test" hibernate-core/pom.xml
+%pom_add_dep "javax.enterprise:cdi-api" hibernate-entitymanager/pom.xml
+
+# Small workaround to include the parent pom in the main package when building with xmvn
+#%pom_add_parent "org.hibernate:hibernate-parent:%{namedversion}" hibernate-core/pom.xml
+#%pom_xpath_inject pom:parent "<relativePath>../pom.xml</relativePath>" hibernate-core/pom.xml
+
+# Use narayana instead of old jboss-jts
+%pom_remove_dep "org.jboss.jbossts:jbossjta" hibernate-testing/pom.xml
+%pom_add_dep "org.jboss.narayana.jta:jta" hibernate-testing/pom.xml
+
+# Infinispan 6.0.0 support
+sed -i "s|org.infinispan.util.FileLookupFactory|org.infinispan.commons.util.FileLookupFactory|" hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java
cp -p %{SOURCE9} .
sed -i 's/\r//' LICENSE-2.0.txt
-# fix non ASCII chars
-for s in hibernate-core/src/main/java/org/hibernate/annotations/FlushModeType.java\
- hibernate-core/src/main/java/org/hibernate/annotations/SQLUpdate.java\
- hibernate-core/src/main/java/org/hibernate/annotations/NamedQueries.java\
- hibernate-core/src/main/java/org/hibernate/annotations/NaturalId.java\
- hibernate-core/src/main/java/org/hibernate/annotations/ResultCheckStyle.java\
- hibernate-core/src/main/java/org/hibernate/annotations/SQLDeleteAll.java\
- hibernate-core/src/main/java/org/hibernate/annotations/SQLDelete.java\
- hibernate-core/src/main/java/org/hibernate/annotations/Loader.java\
- hibernate-core/src/main/java/org/hibernate/annotations/SQLInsert.java\
- hibernate-envers/src/main/java/org/hibernate/envers/event/BaseEnversEventListener.java\
- hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPreCollectionUpdateEventListenerImpl.java\
- hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostDeleteEventListenerImpl.java\
- hibernate-envers/src/main/java/org/hibernate/envers/event/BaseEnversCollectionEventListener.java\
- hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostUpdateEventListenerImpl.java\
- hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPreCollectionRemoveEventListenerImpl.java\
- hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostInsertEventListenerImpl.java\
- hibernate-envers/src/main/java/org/hibernate/envers/event/EnversPostCollectionRecreateEventListenerImpl.java\
- hibernate-envers/src/main/java/org/hibernate/envers/configuration/metadata/CollectionMetadataGenerator.java\
- hibernate-envers/src/main/java/org/hibernate/envers/entities/EntityConfiguration.java\
- hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/OneToOneNotOwningMapper.java\
- hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/ToOneIdMapper.java\
- hibernate-envers/src/main/java/org/hibernate/envers/entities/mapper/relation/lazy/ToOneDelegateSessionImplementor.java\
- hibernate-envers/src/main/java/org/hibernate/envers/query/AuditQueryCreator.java\
- hibernate-envers/src/main/java/org/hibernate/envers/query/impl/AbstractAuditQuery.java\
- hibernate-envers/src/main/java/org/hibernate/envers/query/impl/RevisionsOfEntityQuery.java\
- hibernate-envers/src/main/java/org/hibernate/envers/query/impl/EntitiesAtRevisionQuery.java\
- hibernate-envers/src/main/java/org/hibernate/envers/tools/Tools.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/JndiInfinispanRegionFactory.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/InfinispanRegionFactory.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/TypeOverrides.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/AddressAdapterImpl.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/EvictAllCommand.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheCommandInitializer.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheCommandFactory.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/AddressAdapter.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/FlagAdapter.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapter.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheCommandIds.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheAdapterImpl.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheHelper.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/util/CacheCommandExtensions.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/EntityRegionImpl.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/ReadOnlyAccess.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/entity/TransactionalAccess.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseRegion.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseTransactionalDataRegion.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/impl/BaseGeneralDataRegion.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/CollectionRegionImpl.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/collection/TransactionalAccess.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampsRegionImpl.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/timestamp/TimestampTypeOverrides.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/PutFromLoadValidator.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/access/TransactionalAccessDelegate.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/query/QueryResultsRegionImpl.java\
- hibernate-infinispan/src/main/java/org/hibernate/cache/infinispan/tm/HibernateTransactionManagerLookup.java\
- hibernate-proxool/src/main/java/org/hibernate/service/jdbc/connections/internal/ProxoolConnectionProvider.java;do
- native2ascii -encoding UTF8 ${s} ${s}
-done
-
-# disable hibernate-tools support
-rm -r hibernate-envers/src/main/java/org/hibernate/tool/ant/*.java \
- hibernate-envers/src/main/java/org/hibernate/envers/ant/*.java
-sed -i "s|provided( |//provided(|" hibernate-envers/hibernate-envers.gradle
-
-# require gradle maven plugin
-# Caused by: org.gradle.api.InvalidUserDataException: You can't change a configuration which is not in unresolved state!
-sed -i "s|provided( libraries.validation )|compile( libraries.validation )|" hibernate-c3p0/hibernate-c3p0.gradle
-sed -i "s|provided( libraries.jandex )|compile( libraries.jandex )|" hibernate-core/hibernate-core.gradle
-sed -i "s|provided( libraries.classmate )|compile( libraries.classmate )|" hibernate-core/hibernate-core.gradle
-sed -i "s|provided( libraries.ant )|compile( libraries.ant )|" hibernate-core/hibernate-core.gradle
-sed -i "s|provided( libraries.jacc )|compile( libraries.jacc )|" hibernate-core/hibernate-core.gradle
-sed -i "s|provided( libraries.validation )|compile( libraries.validation )|" hibernate-core/hibernate-core.gradle
-sed -i "s|all|//all|" hibernate-infinispan/hibernate-infinispan.gradle
-
-# TODO test fails also for unavailable test deps,
-# should be updated the test deps list in each sub module
-# e.g. Test testHHH6635(org.hibernate.test.c3p0.C3P0ConnectionProviderTest) FAILED: java.lang.NoClassDefFoundError: Could not initialize class com.arjuna.ats.internal.jts.OTSImpleManager
-rm -r hibernate-c3p0/src/test/java/org \
- hibernate-core/src/test/java/org \
- hibernate-ehcache/src/test/java/org \
- hibernate-entitymanager/src/test/java/org \
- hibernate-envers/src/test/java/org \
- hibernate-infinispan/src/test/java/org \
- hibernate-proxool/src/test/java/org
-
-
-sed -i "s|jboss-logging:3.1.0.GA|jboss-logging/jboss-logging:3.1.0.GA|" libraries.gradle
-sed -i "s|mchange-commons|mchange-commons-java|" hibernate-c3p0/hibernate-c3p0.gradle
-# require maven2/empty.jar for empty commons-logging:commons-logging:99.0-does-not-exist
-sed -i "s|jcl_api:|//jcl_api:|" libraries.gradle
-sed -i "s|jcl:|//jcl:|" libraries.gradle
-sed -i "s|testRuntime( libraries.jcl_api )|//testRuntime( libraries.jcl_api )|" build.gradle
-sed -i "s|testRuntime( libraries.jcl )|//testRuntime( libraries.jcl )|" build.gradle
+#%mvn_package ":hibernate-{*}" hibernate-@1
%build
-
-unset JAVA_HOME
-export JAVA_HOME=%{_jvmdir}/java
-export GRADLE_USER_HOME=$PWD SKIP_UNIT_TEST=true
-mkdir -p gradlehome
-# build buildSrc.jar
-gradle --debug -S jar javadoc -g $PWD/gradlehome -b $PWD/buildSrc/build.gradle
-# use buildReleaseBundles for aggregate javadoc
-gradle --debug -S build buildReleaseBundles -g $PWD/gradlehome -b $PWD/build.gradle
+# Disabled beacuse of cyclic dep between core and testing modules
+%mvn_build -s -f -- -Dproject.build.sourceEncoding=UTF-8
%install
+%mvn_install
-mkdir -p %{buildroot}%{_javadir}/%{name}
-for module in c3p0 core ehcache entitymanager envers infinispan proxool testing; do
- install -m 644 hibernate-${module}/target/libs/hibernate-${module}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/hibernate-${module}.jar
-done
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-# TODO use the poms files generated by gradle maven plugin
-install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP.%{name}-hibernate-c3p0.pom
-%add_maven_depmap JPP.%{name}-hibernate-c3p0.pom %{name}/hibernate-c3p0.jar -f c3p0
-
-install -pm 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP.%{name}-hibernate-core.pom
-%add_maven_depmap JPP.%{name}-hibernate-core.pom %{name}/hibernate-core.jar
-
-install -pm 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP.%{name}-hibernate-ehcache.pom
-%add_maven_depmap JPP.%{name}-hibernate-ehcache.pom %{name}/hibernate-ehcache.jar -f ehcache
-
-install -pm 644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/JPP.%{name}-hibernate-entitymanager.pom
-%add_maven_depmap JPP.%{name}-hibernate-entitymanager.pom %{name}/hibernate-entitymanager.jar -f entitymanager
-
-install -pm 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP.%{name}-hibernate-envers.pom
-%add_maven_depmap JPP.%{name}-hibernate-envers.pom %{name}/hibernate-envers.jar -f envers
-
-install -pm 644 hibernate-infinispan-%{namedversion}.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-hibernate-infinispan.pom
-%add_maven_depmap JPP.%{name}-hibernate-infinispan.pom %{name}/hibernate-infinispan.jar -f infinispan
-
-install -pm 644 %{SOURCE7} %{buildroot}%{_mavenpomdir}/JPP.%{name}-hibernate-proxool.pom
-%add_maven_depmap JPP.%{name}-hibernate-proxool.pom %{name}/hibernate-proxool.jar -f proxool
-
-install -pm 644 hibernate-testing-%{namedversion}.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-hibernate-testing.pom
-%add_maven_depmap JPP.%{name}-hibernate-testing.pom %{name}/hibernate-testing.jar -f testing
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp release/target/documentation/javadocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%dir %{_javadir}/%{name}
-%{_javadir}/%{name}/hibernate-core.jar
-%{_mavenpomdir}/JPP.%{name}-hibernate-core.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles-hibernate-parent
%doc changelog.txt lgpl.txt LICENSE-2.0.txt README.md
-%files javadoc
-%{_javadocdir}/%{name}
-%doc lgpl.txt LICENSE-2.0.txt
+%files core -f .mfiles-hibernate-core
+%doc changelog.txt lgpl.txt LICENSE-2.0.txt README.md
-%files c3p0
-%{_javadir}/%{name}/hibernate-c3p0.jar
-%{_mavenpomdir}/JPP.%{name}-hibernate-c3p0.pom
-%{_mavendepmapfragdir}/%{name}-c3p0
+%files c3p0 -f .mfiles-hibernate-c3p0
%doc lgpl.txt
-%files ehcache
-%{_javadir}/%{name}/hibernate-ehcache.jar
-%{_mavenpomdir}/JPP.%{name}-hibernate-ehcache.pom
-%{_mavendepmapfragdir}/%{name}-ehcache
+%files ehcache -f .mfiles-hibernate-ehcache
%doc lgpl.txt LICENSE-2.0.txt
-%files entitymanager
-%{_javadir}/%{name}/hibernate-entitymanager.jar
-%{_mavenpomdir}/JPP.%{name}-hibernate-entitymanager.pom
-%{_mavendepmapfragdir}/%{name}-entitymanager
+%files entitymanager -f .mfiles-hibernate-entitymanager
%doc lgpl.txt
-%files envers
-%{_javadir}/%{name}/hibernate-envers.jar
-%{_mavenpomdir}/JPP.%{name}-hibernate-envers.pom
-%{_mavendepmapfragdir}/%{name}-envers
+%files envers -f .mfiles-hibernate-envers
+%doc lgpl.txt LICENSE-2.0.txt
+
+%files infinispan -f .mfiles-hibernate-infinispan
%doc lgpl.txt LICENSE-2.0.txt
-%files infinispan
-%{_javadir}/%{name}/hibernate-infinispan.jar
-%{_mavenpomdir}/JPP.%{name}-hibernate-infinispan.pom
-%{_mavendepmapfragdir}/%{name}-infinispan
+%files proxool -f .mfiles-hibernate-proxool
%doc lgpl.txt LICENSE-2.0.txt
-%files proxool
-%{_javadir}/%{name}/hibernate-proxool.jar
-%{_mavenpomdir}/JPP.%{name}-hibernate-proxool.pom
-%{_mavendepmapfragdir}/%{name}-proxool
+%files testing -f .mfiles-hibernate-testing
%doc lgpl.txt LICENSE-2.0.txt
-%files testing
-%{_javadir}/%{name}/hibernate-testing.jar
-%{_mavenpomdir}/JPP.%{name}-hibernate-testing.pom
-%{_mavendepmapfragdir}/%{name}-testing
+%files javadoc -f .mfiles-javadoc
%doc lgpl.txt LICENSE-2.0.txt
%changelog
+* Thu Nov 07 2013 Marek Goldmann <mgoldman(a)redhat.com> - 4.3.0-0.1.Beta4
+- Upstream release 4.3.0.Beta4
+- Switched from Gradle to Maven for easier maintenance
+- Switched to XMvn
+- Latest guidelines
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 4.1.7-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -457,4 +362,4 @@ cp -rp release/target/documentation/javadocs/* %{buildroot}%{_javadocdir}/%{name
- update to 4.1.6.Final
* Thu Aug 02 2012 gil cattaneo <puntogil(a)libero.it> 4.1.5-1.SP1
-- initial rpm
\ No newline at end of file
+- initial rpm
diff --git a/sources b/sources
index 6e4499d..bc8fd93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b4a959fcd49e2daff89071fbbda6bba3 hibernate-release-4.1.7.Final.tgz
+62c992994b532b0c1c2cbb9c33cfa7ae 4.3.0.Beta4.tar.gz
10 years, 6 months
[javapackages] [doc] Add another anchor
by Michal Srb
commit 49c20831c824a2be9efcb2b0a2e50503ca87575c
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Nov 7 14:01:20 2013 +0100
[doc] Add another anchor
doc/introduction_for_developers.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/doc/introduction_for_developers.txt b/doc/introduction_for_developers.txt
index bebe75c..5625144 100644
--- a/doc/introduction_for_developers.txt
+++ b/doc/introduction_for_developers.txt
@@ -67,6 +67,7 @@ dependencies. There are two types of dependencies in RPM:
- build time dependencies (BuildRequires tag in `spec` file)
- runtime dependencies (Requires tag in `spec` file)
+[[querying_repositories]]
==== Querying repositories
Fedora comes with several useful tools which can provide great
10 years, 6 months
[javapackages] [doc] Add tip to packaging maven project section
by Michal Srb
commit f2b177829c2dbeb731e78072626b5aa192f8c0af
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Nov 7 14:00:11 2013 +0100
[doc] Add tip to packaging maven project section
doc/packaging_maven_project.txt | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/doc/packaging_maven_project.txt b/doc/packaging_maven_project.txt
index 2f206bc..c2db075 100644
--- a/doc/packaging_maven_project.txt
+++ b/doc/packaging_maven_project.txt
@@ -114,6 +114,11 @@ See <<mvn_file,Alternative JAR File Names>> section for more information.
Another quite common thing to do is adding aliases to Maven artifact. Try to run `rpm
-qp --provides` on your locally built RPM package:
+[TIP]
+======
+See also section about <<querying_repositories,querying repositories>>
+======
+
[source,shell]
------
$ rpm -qp --provides simplemaven-1.0-1.fc21.noarch.rpm
10 years, 6 months
[javapackages] [doc] Move whole section about qeurying repositories down a bit
by Michal Srb
commit 3dc4b12b464457a25928997a3e91fd7d1db989e7
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Nov 7 11:54:43 2013 +0100
[doc] Move whole section about qeurying repositories down a bit
doc/introduction_for_developers.txt | 97 +++++++++++++++++------------------
1 files changed, 48 insertions(+), 49 deletions(-)
---
diff --git a/doc/introduction_for_developers.txt b/doc/introduction_for_developers.txt
index 61ad847..bebe75c 100644
--- a/doc/introduction_for_developers.txt
+++ b/doc/introduction_for_developers.txt
@@ -19,6 +19,54 @@ several reasons for it, among others:
licenses used, homepage for the project, changelogs and other information
that users or administrators can find useful
+==== Example RPM Project
+RPM uses `spec` files as recipes for building software packages. A simple
+example of such spec file is below.
+
+[source,spec,numbered]
+------
+include::rpm_project/minimal.spec[]
+------
+
+RPM `spec` files contain several basic sections:
+
+ * header containing package metadata
+ * %prep section used for source unpacking, patching and steps to prepare for
+ building
+ * %build section containing compilation instructions such as Maven or Ant
+ invocation
+ * %install section used to preparing filesystem layout inside directory
+ * %files section containing list of files to be included in the binary RPM itself
+ * %changelog containing RPM changelog with prescribed format used mostly to
+ document changes to spec file (not upstream)
+
+To build RPM from link:rpm_project/minimal.spec[this `spec` file] save it in
+your current directory and run `rpmbuild`:
+[source,shell]
+------
+$ rpmbuild -bb minimal.spec
+------
+
+If everything worked OK, this should produce RPM file
+`~/rpmbuild/RPMS/x86_64/minimal-1.0-1.fc18.x86_64.rpm`. You can use `rpm` or
+`yum` commands to install this package and it will add `/bin/minimalistic` shell
+script to your system. Above `spec` file doesn't specify any build or runtime
+dependencies and lacks several other common parts for simplification.
+[NOTE]
+======
+Paths and filenames might be slightly different depending on your architecture
+and distribution. Output of the commands will tell you exact paths
+======
+
+As you can see to build RPM files you can use `rpmbuild` command. It has several
+other options, which we will cover later on.
+
+One of the most important RPM features is already mentioned handling of
+dependencies. There are two types of dependencies in RPM:
+
+ - build time dependencies (BuildRequires tag in `spec` file)
+ - runtime dependencies (Requires tag in `spec` file)
+
==== Querying repositories
Fedora comes with several useful tools which can provide great
@@ -85,55 +133,6 @@ mvn(simplemaven:simplemaven) = 1.0
simplemaven = 1.0-2.fc21
------
-==== Example RPM Project
-RPM uses `spec` files as recipes for building software packages. A simple
-example of such spec file is below.
-
-[source,spec,numbered]
-------
-include::rpm_project/minimal.spec[]
-------
-
-RPM `spec` files contain several basic sections:
-
- * header containing package metadata
- * %prep section used for source unpacking, patching and steps to prepare for
- building
- * %build section containing compilation instructions such as Maven or Ant
- invocation
- * %install section used to preparing filesystem layout inside directory
- * %files section containing list of files to be included in the binary RPM itself
- * %changelog containing RPM changelog with prescribed format used mostly to
- document changes to spec file (not upstream)
-
-To build RPM from link:rpm_project/minimal.spec[this `spec` file] save it in
-your current directory and run `rpmbuild`:
-[source,shell]
-------
-$ rpmbuild -bb minimal.spec
-------
-
-If everything worked OK, this should produce RPM file
-`~/rpmbuild/RPMS/x86_64/minimal-1.0-1.fc18.x86_64.rpm`. You can use `rpm` or
-`yum` commands to install this package and it will add `/bin/minimalistic` shell
-script to your system. Above `spec` file doesn't specify any build or runtime
-dependencies and lacks several other common parts for simplification.
-[NOTE]
-======
-Paths and filenames might be slightly different depending on your architecture
-and distribution. Output of the commands will tell you exact paths
-======
-
-As you can see to build RPM files you can use `rpmbuild` command. It has several
-other options, which we will cover later on.
-
-One of the most important RPM features is already mentioned handling of
-dependencies. There are two types of dependencies in RPM:
-
- - build time dependencies (BuildRequires tag in `spec` file)
- - runtime dependencies (Requires tag in `spec` file)
-
-
==== Quiz for Java Developers
1. How would you build a binary RPM if you were given a source RPM?
10 years, 6 months
[javapackages] [doc] Fix typo
by Michal Srb
commit 8db33cc37bf26a19d80f58ad41e36d3dd44e5464
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Nov 7 11:42:38 2013 +0100
[doc] Fix typo
queryied -> queried
doc/introduction_for_developers.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/doc/introduction_for_developers.txt b/doc/introduction_for_developers.txt
index a0f7343..61ad847 100644
--- a/doc/introduction_for_developers.txt
+++ b/doc/introduction_for_developers.txt
@@ -72,7 +72,7 @@ for more information on this topic.
Another useful tool is `rpm`. It can do a lot of stuff, but most
importantly it can replace `repoquery` if one only needs to query local
RPM database. Only installed packages, or local `.rpm` files, can be
-queryied with this tool.
+queried with this tool.
Common use case could be checking which Maven artifacts provide locally
built packages.
10 years, 6 months
[javapackages] [doc] Initial text for repoquery and rpm
by Michal Srb
commit d109effcdae0e0a152bdcad978d27d3665e907c9
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Nov 7 11:40:25 2013 +0100
[doc] Initial text for repoquery and rpm
doc/introduction_for_developers.txt | 66 +++++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 deletions(-)
---
diff --git a/doc/introduction_for_developers.txt b/doc/introduction_for_developers.txt
index ea295f7..a0f7343 100644
--- a/doc/introduction_for_developers.txt
+++ b/doc/introduction_for_developers.txt
@@ -19,6 +19,72 @@ several reasons for it, among others:
licenses used, homepage for the project, changelogs and other information
that users or administrators can find useful
+==== Querying repositories
+
+Fedora comes with several useful tools which can provide great
+assistance in getting information from RPM repositories.
+
+`repoquery` is a tool for querying information from YUM repositories.
+Maintainer of Java packages might typically query the repository for
+information like "which package contains Maven artifact
+`groupId:artifactId`".
+
+.Find out which package provides given artifact
+[source,shell]
+------
+$ repoquery -f 'mvn(commons-io:commons-io)'
+apache-commons-io-1:2.4-9.fc19.noarch
+------
+
+The example above shows that one can get to `commons-io:commons-io`
+artifact by installing `apache-commons-io` package.
+
+By default, repoquery uses all enabled repositories in YUM
+configuration, but it is possible to explicitly specify any other
+repository. For example following command will query only Rawhide
+repository:
+
+[source,shell]
+------
+$ repoquery --repoid rawhide -f 'mvn(commons-io:commons-io)'
+apache-commons-io-1:2.4-10.fc20.noarch
+------
+
+Sometimes it may be useful to just list all the artifacts provided by
+given package:
+
+[source,shell]
+------
+$ repoquery --provides apache-commons-io
+apache-commons-io = 1:2.4-9.fc19
+jakarta-commons-io = 1:2.4-9.fc19
+mvn(commons-io:commons-io) = 2.4
+mvn(org.apache.commons:commons-io) = 2.4
+osgi(org.apache.commons.io) = 2.4.0
+------
+
+Output above means that package `apache-commons-io` provides two Maven
+artifacts: previously mentioned `commons-io:commons-io` and
+`org.apache.commons:commons-io`. In this case the second one is just an
+alias for same JAR file. See section about <<aliases,artifact aliases>>
+for more information on this topic.
+
+Another useful tool is `rpm`. It can do a lot of stuff, but most
+importantly it can replace `repoquery` if one only needs to query local
+RPM database. Only installed packages, or local `.rpm` files, can be
+queryied with this tool.
+
+Common use case could be checking which Maven artifacts provide locally
+built packages.
+
+[source,shell]
+------
+$ rpm -qp --provides simplemaven-1.0-2.fc21.noarch.rpm
+mvn(com.example:simplemaven) = 1.0
+mvn(simplemaven:simplemaven) = 1.0
+simplemaven = 1.0-2.fc21
+------
+
==== Example RPM Project
RPM uses `spec` files as recipes for building software packages. A simple
example of such spec file is below.
10 years, 6 months
[javapackages] [doc] Add anchor for aliases
by Michal Srb
commit d175ebcf2a9ec5899ecd5162e74bfa6e4ea54aa6
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Nov 7 11:40:01 2013 +0100
[doc] Add anchor for aliases
doc/jar_file_id.txt | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/doc/jar_file_id.txt b/doc/jar_file_id.txt
index 26a3859..4f1e4a6 100644
--- a/doc/jar_file_id.txt
+++ b/doc/jar_file_id.txt
@@ -19,6 +19,7 @@ include::jar_file_id_relative.txt[]
==== Artifact specification
include::jar_file_id_artifact.txt[]
+[[aliases]]
==== Aliases
include::jar_file_id_aliases.txt[]
10 years, 6 months