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/06/02 14:30:33 UTC
svn commit: r1599187 - in /tomee/tomee/trunk: ./ examples/
examples/alternate-descriptors/ examples/multi-jpa-provider-testing/
examples/polling-parent/ examples/polling-parent/polling-client/
examples/polling-parent/polling-domain/ examples/rest-examp...
Author: andygumbrecht
Date: Mon Jun 2 12:30:33 2014
New Revision: 1599187
URL: http://svn.apache.org/r1599187
Log:
Version 2.4.0-nonfinal-1598334 staging
Modified:
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/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
Modified: tomee/tomee/trunk/examples/alternate-descriptors/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/alternate-descriptors/pom.xml?rev=1599187&r1=1599186&r2=1599187&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/alternate-descriptors/pom.xml (original)
+++ tomee/tomee/trunk/examples/alternate-descriptors/pom.xml Mon Jun 2 12:30:33 2014
@@ -53,13 +53,6 @@
<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-1024/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
</repositories>
<dependencies>
@@ -70,9 +63,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-1598334</version>
+ <version>2.3.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
@@ -103,7 +96,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=1599187&r1=1599186&r2=1599187&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml (original)
+++ tomee/tomee/trunk/examples/multi-jpa-provider-testing/pom.xml Mon Jun 2 12:30:33 2014
@@ -90,13 +90,6 @@
<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-1024/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
</repositories>
<dependencies>
@@ -137,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-1598334</version>
+ <version>2.3.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=1599187&r1=1599186&r2=1599187&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml (original)
+++ tomee/tomee/trunk/examples/polling-parent/polling-client/pom.xml Mon Jun 2 12:30:33 2014
@@ -89,9 +89,9 @@
<version>6.0-6-SNAPSHOT</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-1598334</version>
+ <version>2.3.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=1599187&r1=1599186&r2=1599187&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml (original)
+++ tomee/tomee/trunk/examples/polling-parent/polling-domain/pom.xml Mon Jun 2 12:30:33 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-1598334</version>
+ <version>2.3.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-1598334</version>
+ <version>2.3.0</version>
</dependency>
</dependencies>
</plugin>
Modified: tomee/tomee/trunk/examples/polling-parent/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/polling-parent/pom.xml?rev=1599187&r1=1599186&r2=1599187&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/polling-parent/pom.xml (original)
+++ tomee/tomee/trunk/examples/polling-parent/pom.xml Mon Jun 2 12:30:33 2014
@@ -52,13 +52,6 @@
<repositories>
<repository>
- <id>patch-openjpa</id>
- <url>https://repository.apache.org/content/repositories/orgapachetomee-1024/</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>
@@ -67,13 +60,6 @@
<pluginRepositories>
<pluginRepository>
- <id>patch-openjpa-plugin</id>
- <url>https://repository.apache.org/content/repositories/orgapachetomee-1024/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
<id>apache-m2-plugin-snapshot</id>
<name>Apache Snapshot Plugin Repository</name>
<url>http://repository.apache.org/snapshots</url>
Modified: tomee/tomee/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/pom.xml?rev=1599187&r1=1599186&r2=1599187&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/pom.xml (original)
+++ tomee/tomee/trunk/examples/pom.xml Mon Jun 2 12:30:33 2014
@@ -159,9 +159,9 @@
<dependencies>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>${openjpa.version}</version>
+ <version>2.3.0</version>
</dependency>
</dependencies>
Modified: tomee/tomee/trunk/examples/rest-example/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/rest-example/pom.xml?rev=1599187&r1=1599186&r2=1599187&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/rest-example/pom.xml (original)
+++ tomee/tomee/trunk/examples/rest-example/pom.xml Mon Jun 2 12:30:33 2014
@@ -28,7 +28,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<openejb.version>4.7.0-SNAPSHOT</openejb.version>
<tomee.version>1.7.0-SNAPSHOT</tomee.version>
- <version.openjpa>2.4.0-nonfinal-1598334</version.openjpa>
+ <version.openjpa>2.3.0</version.openjpa>
</properties>
<repositories>
@@ -42,13 +42,6 @@
<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-1024/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
</repositories>
<pluginRepositories>
@@ -57,13 +50,6 @@
<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-1024/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
</pluginRepositories>
<build>
@@ -127,7 +113,7 @@
</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>${version.openjpa}</version>
<configuration>
@@ -146,7 +132,7 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>${version.openjpa}</version>
</dependency>
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=1599187&r1=1599186&r2=1599187&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 Mon Jun 2 12:30:33 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-1598334</version>
+ <version>2.3.0</version>
<configuration>
<includes>org/superbiz/osgi/moviefun/Movie.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
@@ -62,35 +62,15 @@
</executions>
<dependencies>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.0-nonfinal-1598334</version>
+ <version>2.3.0</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
- <repositories>
- <repository>
- <id>patch-openjpa</id>
- <url>https://repository.apache.org/content/repositories/orgapachetomee-1024/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>patch-openjpa-plugin</id>
- <url>https://repository.apache.org/content/repositories/orgapachetomee-1024/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
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=1599187&r1=1599186&r2=1599187&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 Mon Jun 2 12:30:33 2014
@@ -26,6 +26,10 @@
<name>${artifactId} TomEE Webapp</name>
<url>http://tomee.apache.org</url>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
@@ -38,7 +42,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>${version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -100,39 +104,39 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>${version}</version>
<configuration>
<context>ROOT</context>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.openejb.patch</groupId>
- <artifactId>openjpa-maven-plugin</artifactId>
- <version>2.4.0-nonfinal-1598334</version>
- <configuration>
- <includes>**/entities/*.class</includes>
- <excludes>**/entities/XML*.class</excludes>
- <addDefaultConstructor>true</addDefaultConstructor>
- <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
- </configuration>
- <executions>
- <execution>
- <id>enhancer</id>
- <phase>process-classes</phase>
- <goals>
- <goal>enhance</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.openejb.patch</groupId>
- <artifactId>openjpa</artifactId>
- <!-- set the version to be the same as the level in your runtime -->
- <version>2.4.0-nonfinal-1598334</version>
- </dependency>
- </dependencies>
- </plugin>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
+ <version>2.3.0</version>
+ <configuration>
+ <includes>**/entities/*.class</includes>
+ <excludes>**/entities/XML*.class</excludes>
+ <addDefaultConstructor>true</addDefaultConstructor>
+ <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>enhancer</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <!-- set the version to be the same as the level in your runtime -->
+ <version>2.3.0</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
@@ -142,16 +146,6 @@
<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-1024/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
</repositories>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
</project>
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1599187&r1=1599186&r2=1599187&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Mon Jun 2 12:30:33 2014
@@ -203,6 +203,11 @@
<version>2.3</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
<version>1.0-alpha-3</version>
@@ -559,7 +564,7 @@
<repositories>
<repository>
<id>patch-openjpa</id>
- <url>https://repository.apache.org/content/repositories/orgapachetomee-1024/</url>
+ <url>https://repository.apache.org/content/repositories/orgapachetomee-1025/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -575,7 +580,7 @@
<pluginRepositories>
<pluginRepository>
<id>patch-openjpa</id>
- <url>https://repository.apache.org/content/repositories/orgapachetomee-1024/</url>
+ <url>https://repository.apache.org/content/repositories/orgapachetomee-1025/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -676,7 +681,7 @@
<!-- Apache snapshots -->
<repository>
<id>patch-openjpa</id>
- <url>https://repository.apache.org/content/repositories/orgapachetomee-1024/</url>
+ <url>https://repository.apache.org/content/repositories/orgapachetomee-1025/</url>
<releases>
<enabled>true</enabled>
</releases>
@@ -750,7 +755,7 @@
<pluginRepositories>
<pluginRepository>
<id>patch-openjpa-plugin</id>
- <url>https://repository.apache.org/content/repositories/orgapachetomee-1024/</url>
+ <url>https://repository.apache.org/content/repositories/orgapachetomee-1025/</url>
<releases>
<enabled>true</enabled>
</releases>