Updated POMs for issue #13 and issue #14.

highsource · Nov 8, 2014 · b942be0 · b942be0
1 parent ad7f3cd
commit b942be0
Show file tree

Hide file tree

Showing 25 changed files with 134 additions and 163 deletions.
diff --git a/ejb/plugin/pom.xml b/ejb/plugin/pom.xml
@@ -31,6 +31,10 @@
 			<groupId>org.jvnet.hyperjaxb3</groupId>
 			<artifactId>hyperjaxb3-ejb-roundtrip</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.jvnet.hyperjaxb3</groupId>
+			<artifactId>hyperjaxb3-ejb-runtime</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.jvnet.hyperjaxb3</groupId>
 			<artifactId>hyperjaxb3-ejb-schemas-persistence</artifactId>
@@ -40,15 +44,20 @@
 			<artifactId>hyperjaxb3-ejb-schemas-customizations</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
+			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-xjc</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-core</artifactId>
+			<scope>provided</scope>
+		</dependency>
 		<!--dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-annotations</artifactId>
@@ -59,7 +68,7 @@
 		</dependency-->
 		<dependency>
 			<groupId>org.hibernate.javax.persistence</groupId>
-			<artifactId>hibernate-jpa-2.0-api</artifactId>
+			<artifactId>hibernate-jpa-2.1-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>

diff --git a/ejb/roundtrip/pom.xml b/ejb/roundtrip/pom.xml
@@ -13,11 +13,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.hibernate.javax.persistence</groupId>
-			<artifactId>hibernate-jpa-2.0-api</artifactId>
+			<artifactId>hibernate-jpa-2.1-api</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -32,16 +33,16 @@
 		<dependency>
 			<groupId>org.jvnet.hyperjaxb3</groupId>
 			<artifactId>hyperjaxb3-ejb-runtime</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>hsqldb</groupId>
+			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>${hsqldb17.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/ejb/runtime/pom.xml b/ejb/runtime/pom.xml
@@ -28,16 +28,10 @@
 		<dependency>
 			<groupId>org.jvnet.jaxb2_commons</groupId>
 			<artifactId>jaxb2-basics-runtime</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>com.sun.xml.bind</groupId>
-					<artifactId>jaxb-impl</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/ejb/samples/customerservice-cxf/pom.xml b/ejb/samples/customerservice-cxf/pom.xml
@@ -35,25 +35,25 @@
 		<!-- Hibernate -->
 		<dependency>
 			<groupId>org.hibernate.javax.persistence</groupId>
-			<artifactId>hibernate-jpa-2.0-api</artifactId>
-			<version>1.0.0.Final</version>
+			<artifactId>hibernate-jpa-2.1-api</artifactId>
+			<version>${hibernate-jpa-2.1-api.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
-			<version>3.6.5.Final</version>
+			<version>${hibernate-entitymanager.version}</version>
 		</dependency>
 		<!-- Hyperjaxb3 -->
 		<dependency>
 			<groupId>org.jvnet.hyperjaxb3</groupId>
 			<artifactId>hyperjaxb3-ejb-runtime</artifactId>
-			<version>0.6.1-SNAPSHOT</version>
+			<version>${project.version}</version>
 		</dependency>
 		<!-- HSQLDB -->
 		<dependency>
-			<groupId>hsqldb</groupId>
+			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.7.3.3</version>
+			<version>${hsqldb.version}</version>
 			<scope>runtime</scope>
 		</dependency>
 		<!-- Logging -->

diff --git a/ejb/samples/po-customized-toplink/pom.xml b/ejb/samples/po-customized-toplink/pom.xml
@@ -21,12 +21,12 @@
 			<artifactId>jaxb2-basics-ant</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
+			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-xjc</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>toplink.essentials</groupId>
@@ -40,7 +40,7 @@
 		</dependency>
 		<!-- Database -->
 		<dependency>
-			<groupId>hsqldb</groupId>
+			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
 			<scope>test</scope>
 		</dependency>

diff --git a/ejb/samples/po-customized-toplink/project-build.xml b/ejb/samples/po-customized-toplink/project-build.xml
@@ -8,7 +8,7 @@
 			<include name="jaxb-api-*.jar"/>
 			<include name="jaxb2-basics-runtime-*.jar"/>
 
-			<include name="hibernate-jpa-2.0-api-*.jar"/>
+			<include name="hibernate-jpa-2.1-api-*.jar"/>
 			<include name="persistence-api-*.jar"/>
 			<include name="hyperjaxb3-ejb-runtime-*.jar"/>
 
@@ -32,7 +32,7 @@
 			<include name="commons-lang3-*.jar"/>
 			<include name="commons-logging-*.jar"/>
 
-			<include name="hibernate-jpa-2.0-api-*.jar"/>
+			<include name="hibernate-jpa-2.1-api-*.jar"/>
 			<include name="persistence-api-*.jar"/>
 			<include name="hyperjaxb3-ejb-runtime-*.jar"/>
 
@@ -66,7 +66,7 @@
 			<include name="hsqldb-*.jar"/>
 			<include name="hyperjaxb3-ejb-runtime-*.jar"/>
 			<include name="hyperjaxb3-ejb-roundtrip-*.jar"/>
-			<include name="hibernate-jpa-2.0-api-*.jar"/>
+			<include name="hibernate-jpa-2.1-api-*.jar"/>
 			<include name="persistence-api-*.jar"/>
 			<include name="jta-*.jar"/>
 			<include name="log4j-*.jar"/>

diff --git a/ejb/samples/po-customized-toplink/project-pom.xml b/ejb/samples/po-customized-toplink/project-pom.xml
@@ -14,8 +14,8 @@
 			<version>1.0</version>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
 			<version>${jaxb.version}</version>
 		</dependency>
 		<dependency>
@@ -47,9 +47,9 @@
 		</dependency>
 		<!-- Database -->
 		<dependency>
-			<groupId>hsqldb</groupId>
+			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>${hsqldb18.version}</version>
+			<version>${hsqldb.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/ejb/samples/po-initial/pom.xml b/ejb/samples/po-initial/pom.xml
@@ -21,12 +21,12 @@
 			<artifactId>jaxb2-basics-ant</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
+			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-xjc</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
 		</dependency>
 		<!-- Hibernate Dependencies -->
 		<dependency>
@@ -41,9 +41,9 @@
 		</dependency>
 		<!-- Database -->
 		<dependency>
-			<groupId>hsqldb</groupId>
+			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.8.0.7</version>
+			<version>${hsqldb.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/ejb/samples/po-initial/project-build.xml b/ejb/samples/po-initial/project-build.xml
@@ -8,7 +8,7 @@
 			<include name="jaxb-api-*.jar"/>
 			<include name="jaxb2-basics-runtime-*.jar"/>
 
-			<include name="hibernate-jpa-2.0-api-*.jar"/>
+			<include name="hibernate-jpa-2.1-api-*.jar"/>
 			<include name="persistence-api-*.jar"/>
 			<include name="hyperjaxb3-ejb-runtime-*.jar"/>
 
@@ -32,7 +32,7 @@
 			<include name="commons-lang3-*.jar"/>
 			<include name="commons-logging-*.jar"/>
 
-			<include name="hibernate-jpa-2.0-api-*.jar"/>
+			<include name="hibernate-jpa-2.1-api-*.jar"/>
 			<include name="persistence-api-*.jar"/>
 			<include name="hyperjaxb3-ejb-runtime-*.jar"/>
 
@@ -71,7 +71,7 @@
 			<include name="hsqldb-*.jar"/>
 			<include name="hyperjaxb3-ejb-runtime-*.jar"/>
 			<include name="hyperjaxb3-ejb-roundtrip-*.jar"/>
-			<include name="hibernate-jpa-2.0-api-*.jar"/>
+			<include name="hibernate-jpa-2.1-api-*.jar"/>
 			<include name="persistence-api-*.jar"/>
 			<include name="jta-*.jar"/>
 			<include name="log4j-*.jar"/>

diff --git a/ejb/samples/po-initial/project-pom.xml b/ejb/samples/po-initial/project-pom.xml
@@ -10,12 +10,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.hibernate.javax.persistence</groupId>
-			<artifactId>hibernate-jpa-2.0-api</artifactId>
-			<version>1.0.0.Final</version>
+			<artifactId>hibernate-jpa-2.1-api</artifactId>
+			<version>${hibernate-jpa-2.1-api.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
 			<version>${jaxb.version}</version>
 		</dependency>
 		<dependency>
@@ -42,14 +42,14 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
-			<version>3.6.5.Final</version>
+			<version>${hibernate-entitymanager.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- Database -->
 		<dependency>
-			<groupId>hsqldb</groupId>
+			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>${hsqldb18.version}</version>
+			<version>${hsqldb.version}</version>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/ejb/samples/po-maven-jaxb2-plugin/project-pom.xml b/ejb/samples/po-maven-jaxb2-plugin/project-pom.xml
@@ -10,12 +10,12 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.hibernate.javax.persistence</groupId>
-			<artifactId>hibernate-jpa-2.0-api</artifactId>
-			<version>1.0.0.Final</version>
+			<artifactId>hibernate-jpa-2.1-api</artifactId>
+			<version>${hibernate-jpa-2.1-api.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
 			<version>${jaxb.version}</version>
 		</dependency>
 		<dependency>
@@ -37,14 +37,14 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
-			<version>3.6.5.Final</version>
+			<version>${hibernate-entitymanager.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- Database -->
 		<dependency>
-			<groupId>hsqldb</groupId>
+			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>${hsqldb18.version}</version>
+			<version>${hsqldb.version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/ejb/samples/uniprot/pom.xml b/ejb/samples/uniprot/pom.xml
@@ -21,12 +21,12 @@
 			<artifactId>jaxb2-basics-ant</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
+			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-xjc</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
 		</dependency>
 		<!-- Hibernate Dependencies -->
 		<dependency>
@@ -41,7 +41,7 @@
 		</dependency>
 		<!-- Database -->
 		<dependency>
-			<groupId>hsqldb</groupId>
+			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
 			<scope>test</scope>
 		</dependency>

diff --git a/ejb/samples/uniprot/project-build.xml b/ejb/samples/uniprot/project-build.xml
@@ -8,7 +8,7 @@
 			<include name="jaxb-api-*.jar"/>
 			<include name="jaxb2-basics-runtime-*.jar"/>
 
-			<include name="hibernate-jpa-2.0-api-*.jar"/>
+			<include name="hibernate-jpa-2.1-api-*.jar"/>
 			<include name="persistence-api-*.jar"/>
 			<include name="hyperjaxb3-ejb-runtime-*.jar"/>
 
@@ -32,7 +32,7 @@
 			<include name="commons-lang3-*.jar"/>
 			<include name="commons-logging-*.jar"/>
 
-			<include name="hibernate-jpa-2.0-api-*.jar"/>
+			<include name="hibernate-jpa-2.1-api-*.jar"/>
 			<include name="persistence-api-*.jar"/>
 			<include name="hyperjaxb3-ejb-runtime-*.jar"/>
 
@@ -71,7 +71,7 @@
 			<include name="hsqldb-*.jar"/>
 			<include name="hyperjaxb3-ejb-runtime-*.jar"/>
 			<include name="hyperjaxb3-ejb-roundtrip-*.jar"/>
-			<include name="hibernate-jpa-2.0-api-*.jar"/>
+			<include name="hibernate-jpa-2.1-api-*.jar"/>
 			<include name="persistence-api-*.jar"/>
 			<include name="jta-*.jar"/>
 			<include name="log4j-*.jar"/>