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/07/23 13:28:50 UTC

svn commit: r1612811 - in /tomee/tomee/branches/tomee-1.7.x/maven/tomee-webapp-archetype: pom.xml src/main/resources/archetype-resources/pom.xml

Author: andygumbrecht
Date: Wed Jul 23 11:28:50 2014
New Revision: 1612811

URL: http://svn.apache.org/r1612811
Log:
Fix archetype-resources/pom.xml

Modified:
    tomee/tomee/branches/tomee-1.7.x/maven/tomee-webapp-archetype/pom.xml
    tomee/tomee/branches/tomee-1.7.x/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml

Modified: tomee/tomee/branches/tomee-1.7.x/maven/tomee-webapp-archetype/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/maven/tomee-webapp-archetype/pom.xml?rev=1612811&r1=1612810&r2=1612811&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/maven/tomee-webapp-archetype/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.7.x/maven/tomee-webapp-archetype/pom.xml Wed Jul 23 11:28:50 2014
@@ -27,4 +27,28 @@ Licensed to the Apache Software Foundati
 
   <artifactId>tomee-webapp-archetype</artifactId>
   <name>OpenEJB :: Maven Plugins :: TomEE Webapp Archetype</name>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>remove-apps</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <replace file="${project.build.directory}/classes/archetype-resources/pom.xml" token="[VERSION]" value="${project.version}"/>
+                </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>

Modified: tomee/tomee/branches/tomee-1.7.x/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml?rev=1612811&r1=1612810&r2=1612811&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.7.x/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml Wed Jul 23 11:28:50 2014
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>arquillian-tomee-remote</artifactId>
-      <version>${version}</version>
+      <version>1.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -104,13 +104,13 @@
       <plugin>
         <groupId>org.apache.openejb.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>${version}</version>
+        <version>[VERSION]</version>
         <configuration>
           <context>ROOT</context>
         </configuration>
       </plugin>
       <plugin>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-maven-plugin</artifactId>
         <version>2.3.0</version>
         <configuration>