You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2015/04/22 21:46:17 UTC
[6/6] tomee git commit: Fix compile error and update to OpenJPA 2.4.0
Fix compile error and update to OpenJPA 2.4.0
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/037cb47f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/037cb47f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/037cb47f
Branch: refs/heads/tomee-1.7.x
Commit: 037cb47fbf1a33e27186d2b3c9918162ae97cdca
Parents: 56905f6
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Wed Apr 22 20:45:27 2015 +0100
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Wed Apr 22 20:45:27 2015 +0100
----------------------------------------------------------------------
arquillian/arquillian-tomee-common/pom.xml | 2 +-
arquillian/arquillian-tomee-webapp-remote/pom.xml | 2 +-
container/openejb-core/pom.xml | 2 +-
.../org/apache/openejb/assembler/classic/ResourceInfo.java | 2 +-
.../java/org/apache/openejb/assembler/classic/ServiceInfo.java | 2 +-
examples/alternate-descriptors/pom.xml | 2 +-
examples/multi-jpa-provider-testing/pom.xml | 2 +-
examples/polling-parent/polling-client/pom.xml | 2 +-
examples/polling-parent/polling-domain/pom.xml | 6 +++---
examples/pom.xml | 2 +-
examples/resources-jmx-example/pom.xml | 2 +-
examples/rest-example/pom.xml | 2 +-
examples/simple-osgi/simple-osgi-core/pom.xml | 4 ++--
.../src/main/resources/archetype-resources/pom.xml | 2 +-
pom.xml | 4 ++--
tomee/pom.xml | 2 +-
utils/openejb-core-eclipselink/pom.xml | 2 +-
utils/openejb-core-hibernate/pom.xml | 2 +-
18 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/arquillian/arquillian-tomee-common/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml
index 76eccf9..3b3d71a 100644
--- a/arquillian/arquillian-tomee-common/pom.xml
+++ b/arquillian/arquillian-tomee-common/pom.xml
@@ -184,7 +184,7 @@
</exclusion>
<exclusion>
<artifactId>openjpa</artifactId>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
</exclusion>
<exclusion>
<artifactId>openwebbeans-web</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/arquillian/arquillian-tomee-webapp-remote/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-webapp-remote/pom.xml b/arquillian/arquillian-tomee-webapp-remote/pom.xml
index eb72444..ca427b0 100644
--- a/arquillian/arquillian-tomee-webapp-remote/pom.xml
+++ b/arquillian/arquillian-tomee-webapp-remote/pom.xml
@@ -203,7 +203,7 @@
</exclusion>
<exclusion>
<artifactId>openjpa</artifactId>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
</exclusion>
<exclusion>
<artifactId>openwebbeans-web</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/container/openejb-core/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index af58db5..8d6fa6b 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -657,7 +657,7 @@
<artifactId>openwebbeans-web</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</dependency>
<!--
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceInfo.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceInfo.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceInfo.java
index d7ed93d..c24ae24 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceInfo.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceInfo.java
@@ -25,5 +25,5 @@ public class ResourceInfo extends ServiceInfo {
public String postConstruct;
public String preDestroy;
public String originAppName; // if define by an app
- public List<String> aliases = new ArrayList<>();
+ public List<String> aliases = new ArrayList<String>();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java
index bd55d12..06dfc45 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ServiceInfo.java
@@ -33,7 +33,7 @@ public class ServiceInfo extends InfoObject {
public String codebase;
public URI[] classpath;
public Properties properties;
- public final List<String> constructorArgs = new ArrayList<>();
+ public final List<String> constructorArgs = new ArrayList<String>();
public Properties unsetProperties; // keep it in the model to be able to investigate it dumping Infos
/**
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/examples/alternate-descriptors/pom.xml
----------------------------------------------------------------------
diff --git a/examples/alternate-descriptors/pom.xml b/examples/alternate-descriptors/pom.xml
index 94812a6..b75acc5 100644
--- a/examples/alternate-descriptors/pom.xml
+++ b/examples/alternate-descriptors/pom.xml
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/examples/multi-jpa-provider-testing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/multi-jpa-provider-testing/pom.xml b/examples/multi-jpa-provider-testing/pom.xml
index 423f6ca..d401095 100644
--- a/examples/multi-jpa-provider-testing/pom.xml
+++ b/examples/multi-jpa-provider-testing/pom.xml
@@ -132,7 +132,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0</version>
<scope>test</scope>
</dependency>
<dependency> <!-- just a facade pom which will bring hibernate for us -->
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/examples/polling-parent/polling-client/pom.xml
----------------------------------------------------------------------
diff --git a/examples/polling-parent/polling-client/pom.xml b/examples/polling-parent/polling-client/pom.xml
index 0a7edce..67e183a 100644
--- a/examples/polling-parent/polling-client/pom.xml
+++ b/examples/polling-parent/polling-client/pom.xml
@@ -91,7 +91,7 @@
<dependency> <!-- because entities was enhanced -->
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0</version>
</dependency>
</dependencies>
</plugin>
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/examples/polling-parent/polling-domain/pom.xml
----------------------------------------------------------------------
diff --git a/examples/polling-parent/polling-domain/pom.xml b/examples/polling-parent/polling-domain/pom.xml
index c13f5ba..6884da5 100644
--- a/examples/polling-parent/polling-domain/pom.xml
+++ b/examples/polling-parent/polling-domain/pom.xml
@@ -41,7 +41,7 @@
<plugin>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0</version>
<configuration>
<includes>jug/domain/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -58,9 +58,9 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.0-nonfinal-1598334</version>
+ <version>2.4.0</version>
</dependency>
</dependencies>
</plugin>
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 0a9d548..d701286 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -165,7 +165,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/examples/resources-jmx-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/resources-jmx-example/pom.xml b/examples/resources-jmx-example/pom.xml
index 62f5d03..d7d95e1 100644
--- a/examples/resources-jmx-example/pom.xml
+++ b/examples/resources-jmx-example/pom.xml
@@ -32,7 +32,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.openejb>4.7.2-SNAPSHOT</version.openejb>
<version.tomee>1.7.2-SNAPSHOT</version.tomee>
- <version.openjpa>2.3.0</version.openjpa>
+ <version.openjpa>2.4.0</version.openjpa>
</properties>
<repositories>
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/examples/rest-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-example/pom.xml b/examples/rest-example/pom.xml
index 3e9b895..609e8d7 100644
--- a/examples/rest-example/pom.xml
+++ b/examples/rest-example/pom.xml
@@ -28,7 +28,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<openejb.version>4.7.2-SNAPSHOT</openejb.version>
<tomee.version>1.7.2-SNAPSHOT</tomee.version>
- <version.openjpa>2.3.0</version.openjpa>
+ <version.openjpa>2.4.0</version.openjpa>
</properties>
<repositories>
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/examples/simple-osgi/simple-osgi-core/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-osgi/simple-osgi-core/pom.xml b/examples/simple-osgi/simple-osgi-core/pom.xml
index 71fdcc7..199aaf5 100644
--- a/examples/simple-osgi/simple-osgi-core/pom.xml
+++ b/examples/simple-osgi/simple-osgi-core/pom.xml
@@ -45,7 +45,7 @@
<plugin> <!-- needed otherwise it will not work at runtime -->
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0</version>
<configuration>
<includes>org/superbiz/osgi/moviefun/Movie.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0</version>
</dependency>
</dependencies>
</plugin>
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
index 549d6e6..bae2811 100644
--- a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
@@ -29,7 +29,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <version.openjpa>2.3.0</version.openjpa>
+ <version.openjpa>2.4.0</version.openjpa>
</properties>
<dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 97fe4c4..66fe197 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
<openejb.version>4.7.2-SNAPSHOT</openejb.version>
<tomee.version>1.7.2-SNAPSHOT</tomee.version>
- <openjpa.version>2.4.0-nonfinal-1598334</openjpa.version>
+ <openjpa.version>2.4.0</openjpa.version>
<org.apache.openwebbeans.version>1.2.7</org.apache.openwebbeans.version>
<!-- Maven module versions -->
@@ -1515,7 +1515,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>${openjpa.version}</version>
<exclusions>
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/pom.xml b/tomee/pom.xml
index 7515c10..774f8bc 100644
--- a/tomee/pom.xml
+++ b/tomee/pom.xml
@@ -128,7 +128,7 @@
<version>${version.openejb}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</exclusion>
<exclusion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/utils/openejb-core-eclipselink/pom.xml
----------------------------------------------------------------------
diff --git a/utils/openejb-core-eclipselink/pom.xml b/utils/openejb-core-eclipselink/pom.xml
index 8ede3e5..b3e6d6e 100644
--- a/utils/openejb-core-eclipselink/pom.xml
+++ b/utils/openejb-core-eclipselink/pom.xml
@@ -35,7 +35,7 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</exclusion>
</exclusions>
http://git-wip-us.apache.org/repos/asf/tomee/blob/037cb47f/utils/openejb-core-hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/utils/openejb-core-hibernate/pom.xml b/utils/openejb-core-hibernate/pom.xml
index 19bd7b5..8c67390 100644
--- a/utils/openejb-core-hibernate/pom.xml
+++ b/utils/openejb-core-hibernate/pom.xml
@@ -35,7 +35,7 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</exclusion>
<exclusion>