TOMEE-2313 - Fixed surefire and openjpa versions on webapp archetype resource pom
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6e5d0b45 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6e5d0b45 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6e5d0b45 Branch: refs/heads/master Commit: 6e5d0b45b267dad1905a1b0e7da1a5235a1d1359 Parents: 95c8263 Author: Daniel Cunha (soro) <[email protected]> Authored: Tue Dec 4 15:11:44 2018 -0300 Committer: Daniel Cunha (soro) <[email protected]> Committed: Tue Dec 4 15:11:44 2018 -0300 ---------------------------------------------------------------------- maven/tomee-webapp-archetype/pom.xml | 4 +++- .../src/main/resources/archetype-resources/pom.xml | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/6e5d0b45/maven/tomee-webapp-archetype/pom.xml ---------------------------------------------------------------------- diff --git a/maven/tomee-webapp-archetype/pom.xml b/maven/tomee-webapp-archetype/pom.xml index 3301f92..9620ef4 100644 --- a/maven/tomee-webapp-archetype/pom.xml +++ b/maven/tomee-webapp-archetype/pom.xml @@ -43,7 +43,9 @@ Licensed to the Apache Software Foundation (ASF) under one or more <configuration> <target> <replace file="${project.build.directory}/classes/archetype-resources/pom.xml" token="[TOMEE]" value="${project.version}"/> - <replace file="${project.build.directory}/classes/archetype-resources/pom.xml" token="[OPENEJB]" value="{project.version}"/> + <replace file="${project.build.directory}/classes/archetype-resources/pom.xml" token="[OPENEJB]" value="${project.version}"/> + <replace file="${project.build.directory}/classes/archetype-resources/pom.xml" token="[OPENJPA]" value="${openjpa.version}"/> + <replace file="${project.build.directory}/classes/archetype-resources/pom.xml" token="[JAVAEE]" value="${version.javaee-api}"/> </target> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/tomee/blob/6e5d0b45/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml index e8332f8..bc9a944 100644 --- a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml +++ b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml @@ -34,7 +34,7 @@ <dependency> <groupId>org.apache.tomee</groupId> <artifactId>javaee-api</artifactId> - <version>8.0</version> + <version>[JAVAEE]</version> <scope>provided</scope> </dependency> @@ -112,7 +112,7 @@ <plugin> <groupId>org.apache.openjpa</groupId> <artifactId>openjpa-maven-plugin</artifactId> - <version>3.0.0</version> + <version>[OPENJPA]</version> <configuration> <includes>**/entities/*.class</includes> <excludes>**/entities/XML*.class</excludes> @@ -133,7 +133,7 @@ <groupId>org.apache.openjpa</groupId> <artifactId>openjpa</artifactId> <!-- set the version to be the same as the level in your runtime --> - <version>3.0.0</version> + <version>[OPENJPA]</version> </dependency> </dependencies> </plugin>
