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 2012/05/23 12:42:27 UTC
svn commit: r1341824 - in /incubator/syncope/trunk:
archetype/src/main/resources/archetype-resources/core/pom.xml
archetype/src/main/resources/archetype-resources/pom.xml console/pom.xml
core/pom.xml parent/pom.xml
Author: ilgrosso
Date: Wed May 23 10:42:26 2012
New Revision: 1341824
URL: http://svn.apache.org/viewvc?rev=1341824&view=rev
Log:
[SYNCOPE-85] Using openjpa strict dependencies + latest BVal; keep using openjpa-all as cargo dependency (for IT)
Modified:
incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/pom.xml
incubator/syncope/trunk/console/pom.xml
incubator/syncope/trunk/core/pom.xml
incubator/syncope/trunk/parent/pom.xml
Modified: incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml?rev=1341824&r1=1341823&r2=1341824&view=diff
==============================================================================
--- incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml (original)
+++ incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml Wed May 23 10:42:26 2012
@@ -73,8 +73,25 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-jdbc</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-all</artifactId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr303</artifactId>
</dependency>
<dependency>
Modified: incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/pom.xml?rev=1341824&r1=1341823&r2=1341824&view=diff
==============================================================================
--- incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/pom.xml Wed May 23 10:42:26 2012
@@ -88,8 +88,30 @@ under the License.
<build>
+ <pluginManagement>
+ <plugins>
+ <!-- Disable LICENSE / NOTICE inclusion: see SYNCOPE-84 -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <inherited>false</inherited>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>**/*.jsp</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<!-- Disable legal check for generated projects: see SYNCOPE-84 -->
- <plugins>
+ <plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>ianal-maven-plugin</artifactId>
Modified: incubator/syncope/trunk/console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/pom.xml?rev=1341824&r1=1341823&r2=1341824&view=diff
==============================================================================
--- incubator/syncope/trunk/console/pom.xml (original)
+++ incubator/syncope/trunk/console/pom.xml Wed May 23 10:42:26 2012
@@ -44,7 +44,7 @@ under the License.
<version>${project.version}</version>
</dependency>
- <!-- Only needed for running core alongside -->
+ <!-- Only needed for running core -->
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
Modified: incubator/syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/pom.xml?rev=1341824&r1=1341823&r2=1341824&view=diff
==============================================================================
--- incubator/syncope/trunk/core/pom.xml (original)
+++ incubator/syncope/trunk/core/pom.xml Wed May 23 10:42:26 2012
@@ -205,10 +205,36 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-jdbc</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr303</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -488,7 +514,7 @@ under the License.
<groupId>${jdbcdriver.groupId}</groupId>
<artifactId>${jdbcdriver.artifactId}</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
Modified: incubator/syncope/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/parent/pom.xml?rev=1341824&r1=1341823&r2=1341824&view=diff
==============================================================================
--- incubator/syncope/trunk/parent/pom.xml (original)
+++ incubator/syncope/trunk/parent/pom.xml Wed May 23 10:42:26 2012
@@ -254,6 +254,7 @@ under the License.
<quartz.version>1.8.6</quartz.version>
<openjpa.version>2.2.0</openjpa.version>
+ <bval.version>0.4</bval.version>
<cocoon.version>3.0.0-alpha-3</cocoon.version>
@@ -317,13 +318,6 @@ under the License.
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>1.1</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
<version>1.7.1</version>
@@ -392,10 +386,36 @@ under the License.
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-all</artifactId>
<version>${openjpa.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-jdbc</artifactId>
+ <version>${openjpa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-persistence-jdbc</artifactId>
+ <version>${openjpa.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>1.0.0.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr303</artifactId>
+ <version>${bval.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -795,14 +815,14 @@ under the License.
<include>META-INF/DEPENDENCIES*</include>
</includes>
</resource>
- <resource>
- <directory>${basedir}/../legal_ext</directory>
- <targetPath>META-INF</targetPath>
- <includes>
+ <resource>
+ <directory>${basedir}/../legal_ext</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
<include>LICENSE</include>
<include>NOTICE</include>
- </includes>
- </resource>
+ </includes>
+ </resource>
</webResources>
<packagingExcludes>WEB-INF/classes/META-INF/LICENSE*,WEB-INF/classes/META-INF/NOTICE*,WEB-INF/classes/META-INF/DISCLAIMER*,WEB-INF/classes/META-INF/DEPENDENCIES*</packagingExcludes>
</configuration>