airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata] branch group-based-auth updated: AIRAVATA-2827 Upgrade OpenJPA to 2.4.3
Date Thu, 14 Jun 2018 14:06:51 GMT
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch group-based-auth
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/group-based-auth by this push:
     new 1c5e648  AIRAVATA-2827 Upgrade OpenJPA to 2.4.3
1c5e648 is described below

commit 1c5e648797a7ea6aa28eea7a1050ff5cdb55ac0b
Author: Marcus Christie <machristie@apache.org>
AuthorDate: Thu Jun 14 10:05:57 2018 -0400

    AIRAVATA-2827 Upgrade OpenJPA to 2.4.3
---
 .../profile-service-commons/pom.xml                | 26 ++++++++++------------
 .../profile-service/profile-tenant-core/pom.xml    |  1 -
 .../profile-service/profile-user-core/pom.xml      | 10 +--------
 modules/distribution/pom.xml                       |  4 ++--
 modules/registry-refactoring/pom.xml               | 11 ++-------
 modules/registry/registry-core/pom.xml             |  6 ++---
 .../sharing-registry-distribution/pom.xml          |  4 ++--
 .../sharing-registry-server/pom.xml                | 13 +++--------
 pom.xml                                            |  1 +
 9 files changed, 26 insertions(+), 50 deletions(-)

diff --git a/airavata-services/profile-service/profile-service-commons/pom.xml b/airavata-services/profile-service/profile-service-commons/pom.xml
index 1e198ab..4bbb4a6 100644
--- a/airavata-services/profile-service/profile-service-commons/pom.xml
+++ b/airavata-services/profile-service/profile-service-commons/pom.xml
@@ -27,7 +27,6 @@
         <surefire.version>2.18.1</surefire.version>
         <skipTests>true</skipTests>
         <mysql.connector.version>5.1.34</mysql.connector.version>
-        <openjpa.version>2.2.0</openjpa.version>
     </properties>
 
     <dependencies>
@@ -38,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-all</artifactId>
+            <artifactId>openjpa</artifactId>
             <version>${openjpa.version}</version>
         </dependency>
         <dependency>
@@ -80,22 +79,21 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>${antrun.version}</version>
+                <groupId>org.apache.openjpa</groupId>
+                <artifactId>openjpa-maven-plugin</artifactId>
+                <version>2.4.3</version>
+                <configuration>
+                    <includes>**/entities/*.class</includes>
+                    <excludes>**/entities/XML*.class</excludes>
+                    <addDefaultConstructor>true</addDefaultConstructor>
+                    <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+                </configuration>
                 <executions>
                     <execution>
+                        <id>enhancer</id>
                         <phase>process-classes</phase>
-                        <configuration>
-                            <tasks>
-                                <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask"
classpathref="maven.compile.classpath"/>
-                                <openjpac>
-                                    <classpath refid="maven.compile.classpath"/>
-                                </openjpac>
-                            </tasks>
-                        </configuration>
                         <goals>
-                            <goal>run</goal>
+                            <goal>enhance</goal>
                         </goals>
                     </execution>
                 </executions>
diff --git a/airavata-services/profile-service/profile-tenant-core/pom.xml b/airavata-services/profile-service/profile-tenant-core/pom.xml
index f7694ab..3ee5710 100644
--- a/airavata-services/profile-service/profile-tenant-core/pom.xml
+++ b/airavata-services/profile-service/profile-tenant-core/pom.xml
@@ -27,7 +27,6 @@
         <surefire.version>2.18.1</surefire.version>
         <skipTests>false</skipTests>
         <mysql.connector.version>5.1.34</mysql.connector.version>
-        <openjpa.version>2.2.0</openjpa.version>
     </properties>
 
     <dependencies>
diff --git a/airavata-services/profile-service/profile-user-core/pom.xml b/airavata-services/profile-service/profile-user-core/pom.xml
index 1ad210c..bba789e 100644
--- a/airavata-services/profile-service/profile-user-core/pom.xml
+++ b/airavata-services/profile-service/profile-user-core/pom.xml
@@ -18,7 +18,6 @@
         <surefire.version>2.18.1</surefire.version>
         <skipTests>false</skipTests>
         <mysql.connector.version>5.1.34</mysql.connector.version>
-        <openjpa.version>2.2.0</openjpa.version>
     </properties>
 
     <dependencies>
@@ -43,7 +42,7 @@
             <plugin>
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa-maven-plugin</artifactId>
-                <version>2.2.0</version>
+                <version>${openjpa.version}</version>
                 <configuration>
                     <includes>**/entities/*.class</includes>
                     <excludes>**/entities/XML*.class</excludes>
@@ -59,13 +58,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.openjpa</groupId>
-                        <artifactId>openjpa</artifactId>
-                        <version>${openjpa.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index b940653..8348c8d 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -257,8 +257,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-all</artifactId>
-            <version>2.2.0</version>
+            <artifactId>openjpa</artifactId>
+            <version>${openjpa.version}</version>
         </dependency>
 
         <dependency>
diff --git a/modules/registry-refactoring/pom.xml b/modules/registry-refactoring/pom.xml
index 60ebdda..509603a 100644
--- a/modules/registry-refactoring/pom.xml
+++ b/modules/registry-refactoring/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
-            <version>2.3.0</version>
+            <version>${openjpa.version}</version>
         </dependency>
 
         <dependency>
@@ -112,7 +112,7 @@
             <plugin>
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa-maven-plugin</artifactId>
-                <version>2.2.0</version>
+                <version>${openjpa.version}</version>
                 <configuration>
                     <includes>**/entities/*.class</includes>
                     <excludes>**/entities/XML*.class</excludes>
@@ -128,13 +128,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.openjpa</groupId>
-                        <artifactId>openjpa</artifactId>
-                        <version>2.2.0</version>
-                    </dependency>
-                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/modules/registry/registry-core/pom.xml b/modules/registry/registry-core/pom.xml
index da2cf34..6b6f4a4 100644
--- a/modules/registry/registry-core/pom.xml
+++ b/modules/registry/registry-core/pom.xml
@@ -62,9 +62,9 @@
 			<scope>test</scope>
 		</dependency>
         <dependency>
-        	<groupId>org.apache.openjpa</groupId>
-        	<artifactId>openjpa</artifactId>
-        	<version>2.2.0</version>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa</artifactId>
+            <version>${openjpa.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
diff --git a/modules/sharing-registry/sharing-registry-distribution/pom.xml b/modules/sharing-registry/sharing-registry-distribution/pom.xml
index f909525..13c2490 100644
--- a/modules/sharing-registry/sharing-registry-distribution/pom.xml
+++ b/modules/sharing-registry/sharing-registry-distribution/pom.xml
@@ -53,8 +53,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-all</artifactId>
-            <version>2.2.0</version>
+            <artifactId>openjpa</artifactId>
+            <version>${openjpa.version}</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
diff --git a/modules/sharing-registry/sharing-registry-server/pom.xml b/modules/sharing-registry/sharing-registry-server/pom.xml
index 1ee1bc7..f6b2514 100644
--- a/modules/sharing-registry/sharing-registry-server/pom.xml
+++ b/modules/sharing-registry/sharing-registry-server/pom.xml
@@ -70,8 +70,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa-all</artifactId>
-            <version>2.2.0</version>
+            <artifactId>openjpa</artifactId>
+            <version>${openjpa.version}</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -114,7 +114,7 @@
             <plugin>
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa-maven-plugin</artifactId>
-                <version>2.2.0</version>
+                <version>${openjpa.version}</version>
                 <configuration>
                     <includes>**/entities/*.class</includes>
                     <excludes>**/entities/XML*.class</excludes>
@@ -130,13 +130,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.openjpa</groupId>
-                        <artifactId>openjpa</artifactId>
-                        <version>2.2.0</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>
diff --git a/pom.xml b/pom.xml
index 0473e9c..29caf3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,6 +114,7 @@
         <commons.io.version>2.4</commons.io.version>
         <google.guava.version>20.0</google.guava.version>
         <jacoco.version>0.8.1</jacoco.version>
+        <openjpa.version>2.4.3</openjpa.version>
     </properties>
 
     <developers>

-- 
To stop receiving notification emails like this one, please contact
machristie@apache.org.

Mime
View raw message