Author: andygumbrecht
Date: Tue May 13 09:19:28 2014
New Revision: 1594168
URL: http://svn.apache.org/r1594168
Log:
Use staging repo for now on org.apache.openejb.patch 2.4.0-nonfinal-1591689
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/polling-parent/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/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=1594168&r1=1594167&r2=1594168&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml Tue May 13
09:19:28 2014
@@ -179,7 +179,7 @@
</exclusion>
<exclusion>
<artifactId>openjpa</artifactId>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</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=1594168&r1=1594167&r2=1594168&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
(original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml Tue May
13 09:19:28 2014
@@ -203,7 +203,7 @@
</exclusion>
<exclusion>
<artifactId>openjpa</artifactId>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</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=1594168&r1=1594167&r2=1594168&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/pom.xml Tue May 13 09:19:28 2014
@@ -700,7 +700,7 @@
<artifactId>openwebbeans-web</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</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=1594168&r1=1594167&r2=1594168&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/alternate-descriptors/pom.xml (original)
+++ tomee/tomee/trunk/examples/alternate-descriptors/pom.xml Tue May 13
09:19:28 2014
@@ -21,14 +21,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
+
<groupId>org.superbiz</groupId>
<artifactId>alternate-descriptors</artifactId>
<packaging>jar</packaging>
<version>1.1.0-SNAPSHOT</version>
<name>OpenEJB :: Examples :: Alternate Descriptors</name>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+
<build>
<defaultGoal>install</defaultGoal>
<plugins>
@@ -43,13 +46,22 @@
</plugin>
</plugins>
</build>
+
<repositories>
<repository>
<id>apache-m2-snapshot</id>
<name>Apache Snapshot Repository</name>
<url>http://repository.apache.org/snapshots</url>
</repository>
+ <repository>
+ <id>patch-openjpa</id>
+
<url>https://repository.apache.org/content/repositories/orgapachetomee-1022/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
</repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
@@ -58,9 +70,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
- <version>2.2.1</version>
+ <version>2.4.0-nonfinal-1591689</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -91,7 +103,7 @@
<exclusions>
<exclusion>
<artifactId>openjpa</artifactId>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</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=1594168&r1=1594167&r2=1594168&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml (original)
+++ tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml Tue May 13
09:19:28 2014
@@ -90,6 +90,13 @@
<name>Apache Snapshot Repository</name>
<url>http://repository.apache.org/snapshots</url>
</repository>
+ <repository>
+ <id>patch-openjpa</id>
+
<url>https://repository.apache.org/content/repositories/orgapachetomee-1022/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
</repositories>
<dependencies>
@@ -130,9 +137,9 @@
otherwise arquillian has some difficulties in embedded mode to find your
classes
-->
<dependency>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
- <version>2.2.0</version>
+ <version>2.4.0-nonfinal-1591689</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=1594168&r1=1594167&r2=1594168&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml (original)
+++ tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml Tue May 13
09:19:28 2014
@@ -89,12 +89,13 @@
<version>6.0-5</version>
</dependency>
<dependency> <!-- because entities was enhanced -->
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
- <version>2.2.0</version>
+ <version>2.4.0-nonfinal-1591689</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
+
</project>
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=1594168&r1=1594167&r2=1594168&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml (original)
+++ tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml Tue May 13
09:19:28 2014
@@ -39,9 +39,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.2.0</version>
+ <version>2.4.0-nonfinal-1591689</version>
<configuration>
<includes>jug/domain/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -58,12 +58,13 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
- <version>2.2.0</version>
+ <version>2.4.0-nonfinal-1591689</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
+
</project>
Modified: tomee/tomee/trunk/examples/polling-parent/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/polling-parent/pom.xml?rev=1594168&r1=1594167&r2=1594168&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/polling-parent/pom.xml (original)
+++ tomee/tomee/trunk/examples/polling-parent/pom.xml Tue May 13 09:19:28 2014
@@ -51,13 +51,28 @@
</build>
<repositories>
+ <repository>
+ <id>patch-openjpa</id>
+
<url>https://repository.apache.org/content/repositories/orgapachetomee-1022/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
<repository>
<id>apache-m2-snapshot</id>
<name>Apache Snapshot Repository</name>
<url>http://repository.apache.org/snapshots</url>
- </repository>
+ </repository>
</repositories>
+
<pluginRepositories>
+ <pluginRepository>
+ <id>patch-openjpa-plugin</id>
+
<url>https://repository.apache.org/content/repositories/orgapachetomee-1022/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
<pluginRepository>
<id>apache-m2-plugin-snapshot</id>
<name>Apache Snapshot Plugin Repository</name>
Modified: tomee/tomee/trunk/examples/rest-example/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-example/pom.xml?rev=1594168&r1=1594167&r2=1594168&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-example/pom.xml (original)
+++ tomee/tomee/trunk/examples/rest-example/pom.xml Tue May 13 09:19:28 2014
@@ -23,11 +23,14 @@
<packaging>war</packaging>
<version>1.1.0-SNAPSHOT</version>
<name>OpenEJB :: Web Examples :: REST Example</name>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<openejb.version>4.6.1-SNAPSHOT</openejb.version>
<tomee.version>1.6.1-SNAPSHOT</tomee.version>
+ <version.openjpa>2.4.0-nonfinal-1591689</version.openjpa>
</properties>
+
<repositories>
<repository>
<id>apache-m2-snapshot</id>
@@ -39,14 +42,30 @@
<name>Tomcat Dev Repository</name>
<url>http://tomcat.apache.org/dev/dist/m2-repository/</url>
</repository>
+ <repository>
+ <id>patch-openjpa</id>
+
<url>https://repository.apache.org/content/repositories/orgapachetomee-1022/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
</repositories>
+
<pluginRepositories>
<pluginRepository>
<id>apache-m2-snapshot</id>
<name>Apache Snapshot Repository</name>
<url>http://repository.apache.org/snapshots</url>
</pluginRepository>
+ <pluginRepository>
+ <id>patch-openjpa-plugin</id>
+
<url>https://repository.apache.org/content/repositories/orgapachetomee-1022/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
</pluginRepositories>
+
<build>
<finalName>${project.artifactId}</finalName>
<defaultGoal>package</defaultGoal>
@@ -70,7 +89,7 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>1.6.1-SNAPSHOT</version>
+ <version>${tomee.version}</version>
<configuration>
<tomeeVersion>${tomee.version}</tomeeVersion>
<tomeeClassifier>plus</tomeeClassifier>
@@ -79,12 +98,12 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-embedded-maven-plugin</artifactId>
- <version>1.6.1-SNAPSHOT</version>
+ <version>${tomee.version}</version>
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-jaxrs</artifactId>
- <version>1.6.1-SNAPSHOT</version>
+ <version>${tomee.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -95,7 +114,7 @@
<configuration>
<tomcatHttpPort>1234</tomcatHttpPort>
<tomcatShutdownPort>13245</tomcatShutdownPort>
- <tomcatVersion>7.0.27</tomcatVersion>
+ <tomcatVersion>7.0.53</tomcatVersion>
<webapps>
<webappArtifact>
<groupId>org.apache.openejb</groupId>
@@ -107,9 +126,9 @@
</configuration>
</plugin>
<plugin> <!-- needed otherwise it will not work at runtime -->
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.3.0</version>
+ <version>${version.openjpa}</version>
<configuration>
<includes>org/superbiz/rest/model/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -126,14 +145,15 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
- <version>2.3.0</version>
+ <version>${version.openjpa}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
+
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
@@ -168,7 +188,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ziplock</artifactId>
- <version>1.6.1-SNAPSHOT</version>
+ <version>${tomee.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
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=1594168&r1=1594167&r2=1594168&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 Tue May 13
09:19:28 2014
@@ -43,9 +43,9 @@
</configuration>
</plugin>
<plugin> <!-- needed otherwise it will not work at runtime -->
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.2.1</version>
+ <version>2.4.0-nonfinal-1591689</version>
<configuration>
<includes>org/superbiz/osgi/moviefun/Movie.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -62,14 +62,34 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
- <version>2.2.1</version>
+ <version>2.4.0-nonfinal-1591689</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
+
+ <repositories>
+ <repository>
+ <id>patch-openjpa</id>
+
<url>https://repository.apache.org/content/repositories/orgapachetomee-1022/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>patch-openjpa-plugin</id>
+
<url>https://repository.apache.org/content/repositories/orgapachetomee-1022/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
<dependencies>
<dependency>
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=1594168&r1=1594167&r2=1594168&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
Tue May 13 09:19:28 2014
@@ -106,9 +106,9 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>2.3.0</version>
+ <version>2.4.0-nonfinal-1591689</version>
<configuration>
<includes>**/entities/*.class</includes>
<excludes>**/entities/XML*.class</excludes>
@@ -126,10 +126,10 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
<!-- set the version to be the same as the level in your
runtime -->
- <version>2.3.0</version>
+ <version>2.4.0-nonfinal-1591689</version>
</dependency>
</dependencies>
</plugin>
@@ -142,6 +142,13 @@
<name>Apache Snapshot Repository</name>
<url>https://repository.apache.org/content/groups/snapshots/</url>
</repository>
+ <repository>
+ <id>patch-openjpa</id>
+
<url>https://repository.apache.org/content/repositories/orgapachetomee-1022/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
</repositories>
<properties>
Modified: tomee/tomee/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1594168&r1=1594167&r2=1594168&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Tue May 13 09:19:28 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-SNAPSHOT</openjpa.version>
+ <openjpa.version>2.4.0-nonfinal-1591689</openjpa.version>
<org.apache.openwebbeans.version>1.2.4</org.apache.openwebbeans.version>
<!-- Maven module versions -->
@@ -568,8 +568,8 @@
<!--</repository>-->
<!-- Apache snapshots -->
<repository>
- <id>temp-owb</id>
-
<url>https://repository.apache.org/content/repositories/orgapacheopenwebbeans-1003/</url>
+ <id>patch-openjpa</id>
+
<url>https://repository.apache.org/content/repositories/orgapachetomee-1022/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -1330,7 +1330,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
<version>${openjpa.version}</version>
<exclusions>
Modified: tomee/tomee/trunk/tomee/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/pom.xml?rev=1594168&r1=1594167&r2=1594168&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/pom.xml (original)
+++ tomee/tomee/trunk/tomee/pom.xml Tue May 13 09:19:28 2014
@@ -126,7 +126,7 @@
<version>${version.openejb}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
</exclusion>
<exclusion>
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=1594168&r1=1594167&r2=1594168&view=diff
==============================================================================
--- tomee/tomee/trunk/utils/openejb-core-eclipselink/pom.xml (original)
+++ tomee/tomee/trunk/utils/openejb-core-eclipselink/pom.xml Tue May 13
09:19:28 2014
@@ -35,7 +35,7 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</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=1594168&r1=1594167&r2=1594168&view=diff
==============================================================================
--- tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml (original)
+++ tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml Tue May 13 09:19:28
2014
@@ -35,7 +35,7 @@
<version>${project.version}</version>
<exclusions>
<exclusion>
- <groupId>org.apache.openjpa</groupId>
+ <groupId>org.apache.openejb.patch</groupId>
<artifactId>openjpa</artifactId>
</exclusion>
<exclusion>
