You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/10/04 17:38:29 UTC
svn commit: r1529193 - in /syncope/trunk: ./ core/pom.xml pom.xml
Author: ilgrosso
Date: Fri Oct 4 15:38:28 2013
New Revision: 1529193
URL: http://svn.apache.org/r1529193
Log:
[SYNCOPE-424] Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/pom.xml
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1528108-1529191
Modified: syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1529193&r1=1529192&r2=1529193&view=diff
==============================================================================
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Fri Oct 4 15:38:28 2013
@@ -218,10 +218,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jdbc</artifactId>
</dependency>
<dependency>
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1529193&r1=1529192&r2=1529193&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Fri Oct 4 15:38:28 2013
@@ -474,18 +474,7 @@ under the License.
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<version>1.1</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
- <exclusions>
- <exclusion>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-jdbc</artifactId>