Adding openjpa version to parent pom
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/374a9cf1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/374a9cf1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/374a9cf1 Branch: refs/heads/master-jaxrs-2.1 Commit: 374a9cf133b8acce890b06909f56025bedbfd8f2 Parents: e578ea9 Author: Sergey Beryozkin <[email protected]> Authored: Fri Jun 3 13:08:54 2016 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Fri Jun 3 13:08:54 2016 +0100 ---------------------------------------------------------------------- parent/pom.xml | 1 + rt/rs/security/oauth-parent/oauth2/pom.xml | 13 ++++++------- rt/rs/security/sso/oidc/pom.xml | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/374a9cf1/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index adeefb4..0ccff5f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -104,6 +104,7 @@ <cxf.geronimo.jms.version>1.1.1</cxf.geronimo.jms.version> <cxf.geronimo.j2ee.management.version>1.0.1</cxf.geronimo.j2ee.management.version> <cxf.geronimo.jpa.version>1.0</cxf.geronimo.jpa.version> + <cxf.openjpa.version>2.4.1</cxf.openjpa.version> <cxf.geronimo.servlet.version>1.0</cxf.geronimo.servlet.version> <cxf.geronimo.servlet25.version>1.2</cxf.geronimo.servlet25.version> <cxf.geronimo.transaction.version>1.1.1</cxf.geronimo.transaction.version> http://git-wip-us.apache.org/repos/asf/cxf/blob/374a9cf1/rt/rs/security/oauth-parent/oauth2/pom.xml ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/pom.xml b/rt/rs/security/oauth-parent/oauth2/pom.xml index e11491a..57d109d 100644 --- a/rt/rs/security/oauth-parent/oauth2/pom.xml +++ b/rt/rs/security/oauth-parent/oauth2/pom.xml @@ -37,7 +37,6 @@ </cxf.osgi.import> <hibernate.em.version>4.1.0.Final</hibernate.em.version> <hsqldb.version>2.3.4</hsqldb.version> - <openjpa.version>2.4.0</openjpa.version> </properties> <dependencies> <dependency> @@ -119,8 +118,8 @@ <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> - <version>${openjpa.version}</version> - <scope>test</scope> + <version>${cxf.openjpa.version}</version> + <scope>provided</scope> </dependency> --> <dependency> @@ -163,7 +162,7 @@ <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> - <version>${openjpa.version}</version> + <version>${cxf.openjpa.version}</version> </dependency> </dependencies> </plugin> @@ -186,11 +185,11 @@ </execution> </executions> </plugin> - <!-- + <!-- <plugin> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-maven-plugin</artifactId> - <version>${openjpa.version}</version> + <version>${cxf.openjpa.version}</version> <configuration> <includes> org/apache/cxf/rs/security/oauth2/common/Client.class, @@ -214,7 +213,7 @@ </execution> </executions> </plugin> - --> + --> </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/cxf/blob/374a9cf1/rt/rs/security/sso/oidc/pom.xml ---------------------------------------------------------------------- diff --git a/rt/rs/security/sso/oidc/pom.xml b/rt/rs/security/sso/oidc/pom.xml index 3ad097e..839b08a 100644 --- a/rt/rs/security/sso/oidc/pom.xml +++ b/rt/rs/security/sso/oidc/pom.xml @@ -33,7 +33,6 @@ <properties> <hibernate.em.version>4.1.0.Final</hibernate.em.version> <hsqldb.version>1.8.0.10</hsqldb.version> - <openjpa.version>2.4.0</openjpa.version> </properties> <dependencies> <dependency> @@ -74,7 +73,7 @@ <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> - <version>${openjpa.version}</version> + <version>${cxf.openjpa.version}</version> <scope>provided</scope> </dependency> --> @@ -106,12 +105,12 @@ <outputDirectory>target/generated-sources/metamodel</outputDirectory> </configuration> </execution> - </executions> + </executions> <dependencies> <dependency> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> - <version>${openjpa.version}</version> + <version>${cxf.openjpa.version}</version> </dependency> </dependencies> </plugin> @@ -134,13 +133,14 @@ </execution> </executions> </plugin> - <!-- + <!-- <plugin> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-maven-plugin</artifactId> - <version>${openjpa.version}</version> + <version>${cxf.openjpa.version}</version> <configuration> <includes> + org/apache/cxf/rs/security/oidc/idp/OidcUserSubject.class, org/apache/cxf/rs/security/oauth2/common/Client.class, org/apache/cxf/rs/security/oauth2/common/UserSubject.class, org/apache/cxf/rs/security/oauth2/grants/code/AuthorizationCodeGrant, @@ -162,7 +162,7 @@ </execution> </executions> </plugin> - --> + --> </plugins> </build> </project>
