You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2018/06/18 07:00:11 UTC

tomee git commit: clean up openjpa versions

Repository: tomee
Updated Branches:
  refs/heads/master e4e57a06e -> f18e21821


clean up openjpa versions


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f18e2182
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f18e2182
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f18e2182

Branch: refs/heads/master
Commit: f18e21821196cf5e4a22b897499cc3c54ee1f0f1
Parents: e4e57a0
Author: Mark Struberg <st...@apache.org>
Authored: Mon Jun 18 08:59:54 2018 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Mon Jun 18 08:59:54 2018 +0200

----------------------------------------------------------------------
 .../arquillian-tomee-webprofile-tests/pom.xml                   | 2 +-
 examples/deltaspike-fullstack/pom.xml                           | 3 ++-
 examples/polling-parent/polling-domain/pom.xml                  | 5 ++++-
 itests/openejb-itests-beans/pom.xml                             | 4 ++--
 .../src/main/resources/archetype-resources/pom.xml              | 5 +++--
 5 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/f18e2182/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
index a06aa3c..b015fd7 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
@@ -54,7 +54,7 @@
       <plugin>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-maven-plugin</artifactId>
-        <version>2.4.1</version>
+        <version>${openjpa.version}</version>
         <configuration>
           <includes>org/apache/openejb/arquillian/tests/datasourcerealm/*.class</includes>
           <persistenceXmlFile>${project.basedir}/src/test/resources/META-INF/build-persistence.xml</persistenceXmlFile>

http://git-wip-us.apache.org/repos/asf/tomee/blob/f18e2182/examples/deltaspike-fullstack/pom.xml
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/pom.xml b/examples/deltaspike-fullstack/pom.xml
index 990b0ae..27dcbdc 100644
--- a/examples/deltaspike-fullstack/pom.xml
+++ b/examples/deltaspike-fullstack/pom.xml
@@ -26,6 +26,7 @@
     <version.deltaspike>1.3.0</version.deltaspike>
     <version.extval>2.0.8</version.extval>
     <tomee.version>7.0.5-SNAPSHOT</tomee.version>
+    <openjpa.version>2.4.3</openjpa.version>
   </properties>
 
   <build>
@@ -48,7 +49,7 @@
       <plugin>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-maven-plugin</artifactId>
-        <version>2.4.0</version>
+        <version>${openjpa.version}</version>
         <configuration>
           <includes>org/superbiz/deltaspike/domain/*.class</includes>
         </configuration>

http://git-wip-us.apache.org/repos/asf/tomee/blob/f18e2182/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 0a02c9b..28d0e2b 100644
--- a/examples/polling-parent/polling-domain/pom.xml
+++ b/examples/polling-parent/polling-domain/pom.xml
@@ -35,13 +35,16 @@
       <artifactId>javaee-api</artifactId>
     </dependency>
   </dependencies>
+  <properties>
+    <openjpa.version>2.4.3</openjpa.version>
+  </properties>
 
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-maven-plugin</artifactId>
-        <version>2.4.0</version>
+        <version>${openjpa.version}</version>
         <configuration>
           <includes>jug/domain/*.class</includes>
           <addDefaultConstructor>true</addDefaultConstructor>

http://git-wip-us.apache.org/repos/asf/tomee/blob/f18e2182/itests/openejb-itests-beans/pom.xml
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/pom.xml b/itests/openejb-itests-beans/pom.xml
index b78b533..ec4b199 100644
--- a/itests/openejb-itests-beans/pom.xml
+++ b/itests/openejb-itests-beans/pom.xml
@@ -33,9 +33,9 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
+        <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-maven-plugin</artifactId>
-        <version>1.2</version>
+        <version>${openjpa.version}</version>
 
         <configuration>
           <includes>org/apache/openejb/test/entity/**/*.class</includes>

http://git-wip-us.apache.org/repos/asf/tomee/blob/f18e2182/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 f0dd24f..59c5dff 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
@@ -28,6 +28,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <openjpa.version>2.4.1</openjpa.version>
   </properties>
 
   <dependencies>
@@ -112,7 +113,7 @@
       <plugin>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-maven-plugin</artifactId>
-        <version>2.4.1</version>
+        <version>${openjpa.version}</version>
         <configuration>
           <includes>**/entities/*.class</includes>
           <excludes>**/entities/XML*.class</excludes>
@@ -133,7 +134,7 @@
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
             <!-- set the version to be the same as the level in your runtime -->
-            <version>2.4.1</version>
+            <version>${openjpa.version}</version>
           </dependency>
         </dependencies>
       </plugin>