Author: cschneider
Date: Mon Jun 8 10:09:49 2015
New Revision: 1684140
URL: http://svn.apache.org/r1684140
Log:
[ARIES-1332] Update to parent 2.0.1
Removed:
aries/trunk/jpa/examples/tasklist-ds/LICENSE
aries/trunk/jpa/examples/tasklist-ds/NOTICE
Modified:
aries/trunk/jpa/examples/tasklist-ds/pom.xml
aries/trunk/jpa/itests/jpa-container-advancedtestbundle/pom.xml
aries/trunk/jpa/itests/jpa-container-itest/pom.xml
aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/pom.xml
aries/trunk/jpa/itests/jpa-container-testbundle/pom.xml
aries/trunk/jpa/jpa-api/pom.xml
aries/trunk/jpa/jpa-blueprint/pom.xml
aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml
aries/trunk/jpa/jpa-container/pom.xml
aries/trunk/jpa/jpa-parent/pom.xml
aries/trunk/jpa/jpa-support/pom.xml
aries/trunk/jpa/pom.xml
Modified: aries/trunk/jpa/examples/tasklist-ds/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/examples/tasklist-ds/pom.xml?rev=1684140&r1=1684139&r2=1684140&view=diff
==============================================================================
--- aries/trunk/jpa/examples/tasklist-ds/pom.xml (original)
+++ aries/trunk/jpa/examples/tasklist-ds/pom.xml Mon Jun 8 10:09:49 2015
@@ -79,6 +79,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<version>2.5.4</version>
<extensions>true</extensions>
+ <inherited>true</inherited>
<configuration>
<instructions>
<_dsannotations>*</_dsannotations>
@@ -87,4 +88,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: aries/trunk/jpa/itests/jpa-container-advancedtestbundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-advancedtestbundle/pom.xml?rev=1684140&r1=1684139&r2=1684140&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-advancedtestbundle/pom.xml (original)
+++ aries/trunk/jpa/itests/jpa-container-advancedtestbundle/pom.xml Mon Jun 8
10:09:49 2015
@@ -30,17 +30,10 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.advanced.itest.bundle</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Aries JPA test bundle advanced iTests</name>
<description>For load time weaving and annotation scanning
tests</description>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-advancedtestbundle</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-advancedtestbundle</developerConnection>
-
<url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-advancedtestbundle</url>
- </scm>
-
<properties>
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg>
Modified: aries/trunk/jpa/itests/jpa-container-itest/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-itest/pom.xml?rev=1684140&r1=1684139&r2=1684140&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-itest/pom.xml (original)
+++ aries/trunk/jpa/itests/jpa-container-itest/pom.xml Mon Jun 8 10:09:49 2015
@@ -30,15 +30,8 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.itest</artifactId>
- <version>2.0.0-SNAPSHOT</version>
<name>Apache Aries JPA iTests</name>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-itest</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-itest</developerConnection>
-
<url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest</url>
- </scm>
-
<properties>
<exam.version>4.5.0</exam.version>
<url.version>1.6.0</url.version>
@@ -121,26 +114,26 @@
<dependency>
<artifactId>org.apache.aries.jpa.api</artifactId>
<groupId>org.apache.aries.jpa</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.support</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.blueprint</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <!--<scope>test</scope> -->
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/pom.xml?rev=1684140&r1=1684139&r2=1684140&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/pom.xml
(original)
+++ aries/trunk/jpa/itests/jpa-container-testbundle-eclipselink/pom.xml Mon Jun
8 10:09:49 2015
@@ -30,16 +30,9 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.itest.bundle.eclipselink</artifactId>
- <version>1.0.3-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Aries JPA test bundle Eclipselink</name>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-testbundle-eclipselink</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-testbundle-eclipselink</developerConnection>
-
<url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-testbundle-eclipselink</url>
- </scm>
-
<properties>
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg>
Modified: aries/trunk/jpa/itests/jpa-container-testbundle/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/itests/jpa-container-testbundle/pom.xml?rev=1684140&r1=1684139&r2=1684140&view=diff
==============================================================================
--- aries/trunk/jpa/itests/jpa-container-testbundle/pom.xml (original)
+++ aries/trunk/jpa/itests/jpa-container-testbundle/pom.xml Mon Jun 8 10:09:49
2015
@@ -30,16 +30,9 @@
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.container.itest.bundle</artifactId>
- <version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Aries JPA test bundle container</name>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-testbundle</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-testbundle</developerConnection>
-
<url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-testbundle</url>
- </scm>
-
<properties>
<!-- As this is only a test bundle we skip the check -->
<aries.skip.version.check>true</aries.skip.version.check>
Modified: aries/trunk/jpa/jpa-api/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api/pom.xml?rev=1684140&r1=1684139&r2=1684140&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-api/pom.xml (original)
+++ aries/trunk/jpa/jpa-api/pom.xml Mon Jun 8 10:09:49 2015
@@ -32,12 +32,6 @@
<packaging>bundle</packaging>
<name>Apache Aries JPA Container API</name>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-api</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-api</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-api</url>
- </scm>
-
<properties>
<!-- Export package versions are maintained in packageinfo files -->
<aries.osgi.export.pkg>
Modified: aries/trunk/jpa/jpa-blueprint/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-blueprint/pom.xml?rev=1684140&r1=1684139&r2=1684140&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-blueprint/pom.xml (original)
+++ aries/trunk/jpa/jpa-blueprint/pom.xml Mon Jun 8 10:09:49 2015
@@ -58,4 +58,4 @@
</plugins>
</build>
<description>Blueprint integration for injecting EntityManager,
EntityManagerFactory and EmSupplier.</description>
-</project>
\ No newline at end of file
+</project>
Modified: aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml?rev=1684140&r1=1684139&r2=1684140&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml (original)
+++ aries/trunk/jpa/jpa-container-eclipselink-adapter/pom.xml Mon Jun 8
10:09:49 2015
@@ -22,24 +22,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.aries</groupId>
- <artifactId>parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <groupId>org.apache.aries.jpa</groupId>
+ <artifactId>org.apache.aries.jpa.parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <relativePath>../jpa-parent</relativePath>
</parent>
<groupId>org.apache.aries.jpa</groupId>
<artifactId>org.apache.aries.jpa.eclipselink.adapter</artifactId>
<packaging>bundle</packaging>
- <version>1.0.0-SNAPSHOT</version>
<name>Apache Aries JPA Container adapter for EclipseLink</name>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-eclipselink-adapter</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container-eclipselink-adapter</developerConnection>
-
<url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-eclipselink-adapter</url>
- </scm>
-
<properties>
<aries.osgi.export.pkg>
org.apache.aries.jpa.eclipselink.adapter,
Modified: aries/trunk/jpa/jpa-container/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/pom.xml?rev=1684140&r1=1684139&r2=1684140&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/pom.xml (original)
+++ aries/trunk/jpa/jpa-container/pom.xml Mon Jun 8 10:09:49 2015
@@ -42,12 +42,6 @@
</aries.osgi.activator>
</properties>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa/jpa-container</developerConnection>
- <url>http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container</url>
- </scm>
-
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
Modified: aries/trunk/jpa/jpa-parent/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-parent/pom.xml?rev=1684140&r1=1684139&r2=1684140&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-parent/pom.xml (original)
+++ aries/trunk/jpa/jpa-parent/pom.xml Mon Jun 8 10:09:49 2015
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
<relativePath>../../parent</relativePath>
</parent>
Modified: aries/trunk/jpa/jpa-support/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-support/pom.xml?rev=1684140&r1=1684139&r2=1684140&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-support/pom.xml (original)
+++ aries/trunk/jpa/jpa-support/pom.xml Mon Jun 8 10:09:49 2015
@@ -54,4 +54,4 @@
</plugins>
</build>
<description>Builds upon JPA container and provides EmSupplier and
JPATemplate service per persistence unit. These make it easier to use
EntityManager in a thread safe way</description>
-</project>
\ No newline at end of file
+</project>
Modified: aries/trunk/jpa/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/pom.xml?rev=1684140&r1=1684139&r2=1684140&view=diff
==============================================================================
--- aries/trunk/jpa/pom.xml (original)
+++ aries/trunk/jpa/pom.xml Mon Jun 8 10:09:49 2015
@@ -13,13 +13,19 @@
<parent>
<groupId>org.apache.aries</groupId>
<artifactId>parent</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/aries/trunk/jpa</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/aries/trunk/jpa</developerConnection>
+ <url>http://svn.apache.org/viewvc/aries/trunk/jpa</url>
+ </scm>
<modules>
<module>jpa-api</module>
