Author: simonetripodi
Date: Sun Jan 15 16:10:03 2012
New Revision: 1231697

URL: http://svn.apache.org/viewvc?rev=1231697&view=rev
Log:
generate the 2 required wars without passing through profiles

Modified:
    incubator/any23/trunk/service/pom.xml

Modified: incubator/any23/trunk/service/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/any23/trunk/service/pom.xml?rev=1231697&r1=1231696&r2=1231697&view=diff
==============================================================================
--- incubator/any23/trunk/service/pom.xml (original)
+++ incubator/any23/trunk/service/pom.xml Sun Jan 15 16:10:03 2012
@@ -32,7 +32,6 @@
   <name>Apache Any23 :: Service</name>
 
   <properties>
-    <maven.war.plugin.version>2.1.1</maven.war.plugin.version>
     <jetty.version>8.0.0.M2</jetty.version>
   </properties>
 
@@ -82,6 +81,47 @@
           </webAppConfig>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.1.1</version>
+        <configuration>
+          <webResources>
+            <resource>
+              <directory>${basedir}/src/main/webapp/resources</directory>
+              <targetPath>/resources</targetPath>
+              <filtering>true</filtering>
+            </resource>
+          </webResources>
+        </configuration>
+        <executions>
+          <execution>
+            <id>self-contained-war</id>
+            <phase>package</phase>
+            <goals>
+              <goal>war</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>war-without-deps</id>
+            <phase>package</phase>
+            <goals>
+              <goal>war</goal>
+            </goals>
+            <configuration>
+              <classifier>without-deps</classifier>
+              <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
+              <archive>
+                <manifest>
+                  <addClasspath>true</addClasspath>
+                  <classpathPrefix>lib/</classpathPrefix>
+                </manifest>
+              </archive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
@@ -114,63 +154,6 @@
         </plugins>
       </build>
     </profile>
-
-    <profile>
-      <id>self-contained-war</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-war-plugin</artifactId>
-            <version>${maven.war.plugin.version}</version>
-            <configuration>
-              <webResources>
-                <resource>
-                  <directory>${basedir}/src/main/webapp/resources</directory>
-                  <targetPath>/resources</targetPath>
-                  <filtering>true</filtering>
-                </resource>
-              </webResources>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>war-without-deps</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-war-plugin</artifactId>
-            <version>${maven.war.plugin.version}</version>
-            <configuration>
-              <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
-              <webResources>
-                <resource>
-                  <directory>${basedir}/src/main/webapp/resources</directory>
-                  <targetPath>/resources</targetPath>
-                  <filtering>true</filtering>
-                </resource>
-              </webResources>
-              <archive>
-                <manifest>
-                  <addClasspath>true</addClasspath>
-                  <classpathPrefix>lib/</classpathPrefix>
-                </manifest>
-              </archive>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 
 </project>


Reply via email to