You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/05/08 15:24:05 UTC
svn commit: r1593271 - in /tomee/tomee/trunk: ./
arquillian/arquillian-tomee-common/
arquillian/arquillian-tomee-webapp-remote/ container/openejb-core/
examples/alternate-descriptors/ examples/multi-jpa-provider-testing/
examples/polling-parent/polling...
Author: andygumbrecht
Date: Thu May 8 13:24:04 2014
New Revision: 1593271
URL: http://svn.apache.org/r1593271
Log:
Need a vote
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
tomee/tomee/trunk/container/openejb-core/pom.xml
tomee/tomee/trunk/examples/alternate-descriptors/pom.xml
tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml
tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml
tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml
tomee/tomee/trunk/examples/rest-example/pom.xml
tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml
tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
tomee/tomee/trunk/pom.xml
tomee/tomee/trunk/tomee/pom.xml
tomee/tomee/trunk/tomee/tomee-deb/pom.xml
tomee/tomee/trunk/utils/openejb-core-eclipselink/pom.xml
tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml Thu May 8 13:24:04 2014
@@ -179,7 +179,7 @@
</exclusion>
<exclusion>
<artifactId>openjpa</artifactId>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
</exclusion>
<exclusion>
<artifactId>openwebbeans-web</artifactId>
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml Thu May 8 13:24:04 2014
@@ -203,7 +203,7 @@
</exclusion>
<exclusion>
<artifactId>openjpa</artifactId>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
</exclusion>
<exclusion>
<artifactId>openwebbeans-web</artifactId>
Modified: tomee/tomee/trunk/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/pom.xml Thu May 8 13:24:04 2014
@@ -698,7 +698,7 @@
<artifactId>openwebbeans-web</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</dependency>
<!--
Modified: tomee/tomee/trunk/examples/alternate-descriptors/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/alternate-descriptors/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/alternate-descriptors/pom.xml (original)
+++ tomee/tomee/trunk/examples/alternate-descriptors/pom.xml Thu May 8 13:24:04 2014
@@ -58,9 +58,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.2.1</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -91,7 +91,7 @@
<exclusions>
<exclusion>
<artifactId>openjpa</artifactId>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
</exclusion>
</exclusions>
</dependency>
Modified: tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml (original)
+++ tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml Thu May 8 13:24:04 2014
@@ -130,9 +130,9 @@
otherwise arquillian has some difficulties in embedded mode to find your classes
-->
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.2.0</version>
<scope>test</scope>
</dependency>
<dependency> <!-- just a facade pom which will bring hibernate for us -->
Modified: tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml (original)
+++ tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml Thu May 8 13:24:04 2014
@@ -89,9 +89,9 @@
<version>6.0-5</version>
</dependency>
<dependency> <!-- because entities was enhanced -->
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.2.0</version>
</dependency>
</dependencies>
</plugin>
Modified: tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml (original)
+++ tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml Thu May 8 13:24:04 2014
@@ -39,9 +39,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.2.0</version>
<configuration>
<includes>jug/domain/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -58,9 +58,9 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.2.0</version>
</dependency>
</dependencies>
</plugin>
Modified: tomee/tomee/trunk/examples/rest-example/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-example/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-example/pom.xml (original)
+++ tomee/tomee/trunk/examples/rest-example/pom.xml Thu May 8 13:24:04 2014
@@ -107,9 +107,9 @@
</configuration>
</plugin>
<plugin> <!-- needed otherwise it will not work at runtime -->
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.3.0</version>
<configuration>
<includes>org/superbiz/rest/model/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -126,9 +126,9 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.3.0</version>
</dependency>
</dependencies>
</plugin>
Modified: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml Thu May 8 13:24:04 2014
@@ -43,9 +43,9 @@
</configuration>
</plugin>
<plugin> <!-- needed otherwise it will not work at runtime -->
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.2.1</version>
<configuration>
<includes>org/superbiz/osgi/moviefun/Movie.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -62,9 +62,9 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.2.1</version>
</dependency>
</dependencies>
</plugin>
Modified: tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml Thu May 8 13:24:04 2014
@@ -106,9 +106,9 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.3.0</version>
<configuration>
<includes>**/entities/*.class</includes>
<excludes>**/entities/XML*.class</excludes>
@@ -126,10 +126,10 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<!-- set the version to be the same as the level in your runtime -->
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.3.0</version>
</dependency>
</dependencies>
</plugin>
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Thu May 8 13:24:04 2014
@@ -97,7 +97,7 @@
<openejb.version>4.6.1-SNAPSHOT</openejb.version>
<tomee.version>1.6.1-SNAPSHOT</tomee.version>
- <openjpa.version>2.4.0-nonfinal-1591689</openjpa.version>
+ <openjpa.version>2.4.0-SNAPSHOT</openjpa.version>
<org.apache.openwebbeans.version>1.2.4</org.apache.openwebbeans.version>
<!-- Maven module versions -->
@@ -155,7 +155,7 @@
<commons-codec.version>1.9</commons-codec.version>
<commons-fileupload.version>1.3.1</commons-fileupload.version>
<commons-discovery.version>0.5</commons-discovery.version>
- <commons-lang3.version>3.3.2</commons-lang3.version>
+ <commons-lang3.version>3.2.1</commons-lang3.version>
<commons-io.version>2.4</commons-io.version>
<commons-net.version>3.3</commons-net.version>
@@ -1330,7 +1330,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>${openjpa.version}</version>
<exclusions>
@@ -1622,11 +1622,6 @@
<version>${commons-collections.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>1.8</version>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
Modified: tomee/tomee/trunk/tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/pom.xml (original)
+++ tomee/tomee/trunk/tomee/pom.xml Thu May 8 13:24:04 2014
@@ -54,7 +54,7 @@
<module>tomee-jaxrs-webapp</module>
<module>apache-tomee</module>
<module>tomee-util</module>
- <module>tomee-deb</module>
+ <!--module>tomee-deb</module-->
</modules>
<repositories>
@@ -126,7 +126,7 @@
<version>${version.openejb}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</exclusion>
<exclusion>
Modified: tomee/tomee/trunk/tomee/tomee-deb/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-deb/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-deb/pom.xml Thu May 8 13:24:04 2014
@@ -23,12 +23,25 @@
<artifactId>tomee-deb</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: TomEE :: Debian Package Builder</name>
-
<properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <commons.compress>1.8</commons.compress>
+ <commons.io>2.4</commons.io>
+ <commons.codec>1.9</commons.codec>
<distribution.workdir>${project.build.directory}/work-dir</distribution.workdir>
</properties>
<repositories>
<repository>
+ <id>apache.snapshots</id>
+ <url>http://repository.apache.org/snapshots/</url>
+ <releases>
+ <updatePolicy>daily</updatePolicy>
+ </releases>
+ <snapshots>
+ <updatePolicy>daily</updatePolicy>
+ </snapshots>
+ </repository>
+ <repository>
<id>atlassian-public</id>
<url>https://m2proxy.atlassian.com/repository/public</url>
<snapshots>
@@ -42,8 +55,8 @@
</releases>
</repository>
</repositories>
-
<dependencies>
+
<!-- Dependencies used by builder logic. -->
<dependency>
<groupId>org.apache.maven</groupId>
@@ -57,18 +70,22 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
+ <version>${commons.compress}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
+ <version>3.3.2</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <version>${commons.io}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ <version>${commons.codec}</version>
</dependency>
<!-- We need to be sure the ZIP files are built before the debian package. -->
Modified: tomee/tomee/trunk/utils/openejb-core-eclipselink/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/utils/openejb-core-eclipselink/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/utils/openejb-core-eclipselink/pom.xml (original)
+++ tomee/tomee/trunk/utils/openejb-core-eclipselink/pom.xml Thu May 8 13:24:04 2014
@@ -35,7 +35,7 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</exclusion>
</exclusions>
Modified: tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml (original)
+++ tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml Thu May 8 13:24:04 2014
@@ -35,7 +35,7 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</exclusion>
<exclusion>
Fwd: svn commit: r1593271 - in /tomee/tomee/trunk: ./
arquillian/arquillian-tomee-common/ arquillian/arquillian-tomee-webapp-remote/
container/openejb-core/ examples/alternate-descriptors/ examples/multi-jpa-provider-testing/
examples/polling-parent/polling...
Posted by Romain Manni-Bucau <rm...@gmail.com>.
Hey Andy
The best is surely to use a patched snapshot openjpa version to ensure we
are stable IMHO
Wdyt?
---------- Message transféré ----------
De : <an...@apache.org>
Date : 12 mai 2014 04:59
Objet : svn commit: r1593271 - in /tomee/tomee/trunk: ./
arquillian/arquillian-tomee-common/
arquillian/arquillian-tomee-webapp-remote/ container/openejb-core/
examples/alternate-descriptors/ examples/multi-jpa-provider-testing/
examples/polling-parent/polling...
À : <co...@tomee.apache.org>
Author: andygumbrecht
Date: Thu May 8 13:24:04 2014
New Revision: 1593271
URL: http://svn.apache.org/r1593271
Log:
Need a vote
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
tomee/tomee/trunk/container/openejb-core/pom.xml
tomee/tomee/trunk/examples/alternate-descriptors/pom.xml
tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml
tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml
tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml
tomee/tomee/trunk/examples/rest-example/pom.xml
tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml
tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
tomee/tomee/trunk/pom.xml
tomee/tomee/trunk/tomee/pom.xml
tomee/tomee/trunk/tomee/tomee-deb/pom.xml
tomee/tomee/trunk/utils/openejb-core-eclipselink/pom.xml
tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml Thu May 8
13:24:04 2014
@@ -179,7 +179,7 @@
</exclusion>
<exclusion>
<artifactId>openjpa</artifactId>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
</exclusion>
<exclusion>
<artifactId>openwebbeans-web</artifactId>
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
(original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml Thu
May 8 13:24:04 2014
@@ -203,7 +203,7 @@
</exclusion>
<exclusion>
<artifactId>openjpa</artifactId>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
</exclusion>
<exclusion>
<artifactId>openwebbeans-web</artifactId>
Modified: tomee/tomee/trunk/container/openejb-core/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/pom.xml Thu May 8 13:24:04
2014
@@ -698,7 +698,7 @@
<artifactId>openwebbeans-web</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</dependency>
<!--
Modified: tomee/tomee/trunk/examples/alternate-descriptors/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/alternate-descriptors/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/alternate-descriptors/pom.xml (original)
+++ tomee/tomee/trunk/examples/alternate-descriptors/pom.xml Thu May 8
13:24:04 2014
@@ -58,9 +58,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.2.1</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -91,7 +91,7 @@
<exclusions>
<exclusion>
<artifactId>openjpa</artifactId>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
</exclusion>
</exclusions>
</dependency>
Modified: tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml (original)
+++ tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml Thu May
8 13:24:04 2014
@@ -130,9 +130,9 @@
otherwise arquillian has some difficulties in embedded mode to find
your classes
-->
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.2.0</version>
<scope>test</scope>
</dependency>
<dependency> <!-- just a facade pom which will bring hibernate for us
-->
Modified: tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml
(original)
+++ tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml Thu
May 8 13:24:04 2014
@@ -89,9 +89,9 @@
<version>6.0-5</version>
</dependency>
<dependency> <!-- because entities was enhanced -->
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.2.0</version>
</dependency>
</dependencies>
</plugin>
Modified: tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml
(original)
+++ tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml Thu
May 8 13:24:04 2014
@@ -39,9 +39,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.2.0</version>
<configuration>
<includes>jug/domain/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -58,9 +58,9 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.2.0</version>
</dependency>
</dependencies>
</plugin>
Modified: tomee/tomee/trunk/examples/rest-example/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-example/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-example/pom.xml (original)
+++ tomee/tomee/trunk/examples/rest-example/pom.xml Thu May 8 13:24:04 2014
@@ -107,9 +107,9 @@
</configuration>
</plugin>
<plugin> <!-- needed otherwise it will not work at runtime -->
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.3.0</version>
<configuration>
<includes>org/superbiz/rest/model/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -126,9 +126,9 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.3.0</version>
</dependency>
</dependencies>
</plugin>
Modified: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml
(original)
+++ tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml Thu May
8 13:24:04 2014
@@ -43,9 +43,9 @@
</configuration>
</plugin>
<plugin> <!-- needed otherwise it will not work at runtime -->
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.2.1</version>
<configuration>
<includes>org/superbiz/osgi/moviefun/Movie.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -62,9 +62,9 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.2.1</version>
</dependency>
</dependencies>
</plugin>
Modified:
tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
---
tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++
tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
Thu May 8 13:24:04 2014
@@ -106,9 +106,9 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.3.0</version>
<configuration>
<includes>**/entities/*.class</includes>
<excludes>**/entities/XML*.class</excludes>
@@ -126,10 +126,10 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<!-- set the version to be the same as the level in
your runtime -->
- <version>2.4.0-nonfinal-1591689</version>
+ <version>2.3.0</version>
</dependency>
</dependencies>
</plugin>
Modified: tomee/tomee/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Thu May 8 13:24:04 2014
@@ -97,7 +97,7 @@
<openejb.version>4.6.1-SNAPSHOT</openejb.version>
<tomee.version>1.6.1-SNAPSHOT</tomee.version>
- <openjpa.version>2.4.0-nonfinal-1591689</openjpa.version>
+ <openjpa.version>2.4.0-SNAPSHOT</openjpa.version>
<org.apache.openwebbeans.version>1.2.4</org.apache.openwebbeans.version>
<!-- Maven module versions -->
@@ -155,7 +155,7 @@
<commons-codec.version>1.9</commons-codec.version>
<commons-fileupload.version>1.3.1</commons-fileupload.version>
<commons-discovery.version>0.5</commons-discovery.version>
- <commons-lang3.version>3.3.2</commons-lang3.version>
+ <commons-lang3.version>3.2.1</commons-lang3.version>
<commons-io.version>2.4</commons-io.version>
<commons-net.version>3.3</commons-net.version>
@@ -1330,7 +1330,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>${openjpa.version}</version>
<exclusions>
@@ -1622,11 +1622,6 @@
<version>${commons-collections.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>1.8</version>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
Modified: tomee/tomee/trunk/tomee/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/pom.xml (original)
+++ tomee/tomee/trunk/tomee/pom.xml Thu May 8 13:24:04 2014
@@ -54,7 +54,7 @@
<module>tomee-jaxrs-webapp</module>
<module>apache-tomee</module>
<module>tomee-util</module>
- <module>tomee-deb</module>
+ <!--module>tomee-deb</module-->
</modules>
<repositories>
@@ -126,7 +126,7 @@
<version>${version.openejb}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</exclusion>
<exclusion>
Modified: tomee/tomee/trunk/tomee/tomee-deb/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-deb/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-deb/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-deb/pom.xml Thu May 8 13:24:04 2014
@@ -23,12 +23,25 @@
<artifactId>tomee-deb</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: TomEE :: Debian Package Builder</name>
-
<properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <commons.compress>1.8</commons.compress>
+ <commons.io>2.4</commons.io>
+ <commons.codec>1.9</commons.codec>
<distribution.workdir>${project.build.directory}/work-dir</distribution.workdir>
</properties>
<repositories>
<repository>
+ <id>apache.snapshots</id>
+ <url>http://repository.apache.org/snapshots/</url>
+ <releases>
+ <updatePolicy>daily</updatePolicy>
+ </releases>
+ <snapshots>
+ <updatePolicy>daily</updatePolicy>
+ </snapshots>
+ </repository>
+ <repository>
<id>atlassian-public</id>
<url>https://m2proxy.atlassian.com/repository/public</url>
<snapshots>
@@ -42,8 +55,8 @@
</releases>
</repository>
</repositories>
-
<dependencies>
+
<!-- Dependencies used by builder logic. -->
<dependency>
<groupId>org.apache.maven</groupId>
@@ -57,18 +70,22 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
+ <version>${commons.compress}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
+ <version>3.3.2</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <version>${commons.io}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
+ <version>${commons.codec}</version>
</dependency>
<!-- We need to be sure the ZIP files are built before the debian
package. -->
Modified: tomee/tomee/trunk/utils/openejb-core-eclipselink/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/utils/openejb-core-eclipselink/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/utils/openejb-core-eclipselink/pom.xml (original)
+++ tomee/tomee/trunk/utils/openejb-core-eclipselink/pom.xml Thu May 8
13:24:04 2014
@@ -35,7 +35,7 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</exclusion>
</exclusions>
Modified: tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml?rev=1593271&r1=1593270&r2=1593271&view=diff
==============================================================================
--- tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml (original)
+++ tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml Thu May 8
13:24:04 2014
@@ -35,7 +35,7 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
</exclusion>
<exclusion>