Prep for M1
diff --git a/pom.xml b/pom.xml
index da6bacc..c6fc112 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,12 +16,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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">
+<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">
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>14</version>
+ <version>16</version>
</parent>
<groupId>org.apache.tomee</groupId>
@@ -29,7 +30,7 @@
<artifactId>javaee-api</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: JavaEE Full API (zip and jar files)</name>
- <version>7.0-SNAPSHOT</version>
+ <version>7.0-M1-SNAPSHOT</version>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/tomee/javaee-api/trunk</connection>
@@ -51,7 +52,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
@@ -60,7 +61,7 @@
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6.1</version>
<executions>
<execution>
<id>clean-shade</id>
@@ -88,7 +89,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5.3</version>
<executions>
<execution>
<id>javaee-api-libs</id>
@@ -246,7 +247,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.9</version>
+ <version>1.9.1</version>
<executions>
<execution>
<id>attach-artifacts</id>
@@ -499,19 +500,22 @@
<version>${geronimo-jms_2.0_spec.version}</version>
<optional>true</optional>
</dependency>
+
+ <!--Use TomEE patch version org.apache.openejb.patch:geronimo-jpa_2.1_spec:1.0-M1 for M1 release only-->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
+ <groupId>org.apache.tomee.patch</groupId>
<artifactId>geronimo-jpa_2.1_spec</artifactId>
<version>${geronimo-jpa_2.1_spec.version}</version>
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
+ <groupId>org.apache.tomee.patch</groupId>
<artifactId>geronimo-jpa_2.1_spec</artifactId>
<version>${geronimo-jpa_2.1_spec.version}</version>
<optional>true</optional>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.2_spec</artifactId>
@@ -691,7 +695,7 @@
<properties>
<geronimo-interceptor_1.2_spec.version>1.0</geronimo-interceptor_1.2_spec.version>
<geronimo-jms_2.0_spec.version>1.0-alpha-1</geronimo-jms_2.0_spec.version>
- <geronimo-jpa_2.1_spec.version>1.0-SNAPSHOT</geronimo-jpa_2.1_spec.version>
+ <geronimo-jpa_2.1_spec.version>1.0-M1</geronimo-jpa_2.1_spec.version>
<geronimo-jta_1.2_spec.version>1.0-alpha-1</geronimo-jta_1.2_spec.version>
<geronimo-jacc_1.4_spec.version>1.0</geronimo-jacc_1.4_spec.version>
<geronimo-jaxr_1.0_spec.version>2.1</geronimo-jaxr_1.0_spec.version>
