cleanup profiles move declaration to top pom: I can use vi pom.xml to see configured...

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1295676 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml
index 4b2cbeb7ad2c64abf142d9eeb2244e839347d568..a9b6f9706d4d1e0564816c6ab55505f1d5a5967d 100644 (file)
--- a/archiva-modules/archiva-web/pom.xml
+++ b/archiva-modules/archiva-web/pom.xml
@@ -112,26 +112,5 @@
     </pluginManagement>
   </build>
 
-  <profiles>
-    <profile>
-      <id>it</id>
-      <modules>
-        <module>archiva-webapp-test</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>js</id>
-      <modules>
-        <module>archiva-webapp-js</module>
-      </modules>
-    </profile>
-    <profile>
-      <id>it-js</id>
-      <modules>
-        <module>archiva-webapp-js</module>
-        <module>archiva-webapp-test-js</module>
-      </modules>
-    </profile>
-  </profiles>
 
 </project>

diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml
index 06423e95431327f5a51d3ad1075712ab78c57a21..201e2c846f06bc9313c576f6fafe7e0cd8651e71 100644 (file)
--- a/archiva-modules/pom.xml
+++ b/archiva-modules/pom.xml
@@ -163,73 +163,7 @@
       -->
     </plugins>
   </reporting>
-  <profiles>
-    <profile>
-      <id>ci</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-pmd-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <!-- TODO: after rules are set
-                              <goal>check</goal>
-                           -->
-                  <goal>cpd-check</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-checkstyle-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <!-- TODO: reformat first, and correct the checks (some are not consistent with the Maven style)
-                              <goal>check</goal>
-                           -->
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>cobertura-maven-plugin</artifactId>
-            <version>2.2</version>
-            <configuration>
-              <check>
-                <!-- TODO: raise to 85/100 -->
-                <totalLineRate>77</totalLineRate>
-                <totalBranchRate>95</totalBranchRate>
-              </check>
-              <instrumentation>
-                <excludes>
-                  <exclude>**/*$*</exclude>
-                </excludes>
-              </instrumentation>
-            </configuration>
-            <executions>
-              <execution>
-                <id>clean</id>
-                <goals>
-                  <goal>clean</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>check</id>
-                <goals>
-                  <goal>check</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+
   <distributionManagement>
     <site>
       <id>apache.website</id>

diff --git a/pom.xml b/pom.xml
index 0b3708bb4d2a2dfcb8a754832117ae14480a16e0..6b02ef84800c51dc8121415b8201c354a9eab261 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1812,6 +1812,29 @@
       </pluginRepositories>
     </profile>
 
+    <profile>
+      <!-- profile to run struts webapp it test -->
+      <id>it</id>
+      <modules>
+        <module>archiva-modules/archiva-web/archiva-webapp-test</module>
+      </modules>
+    </profile>
+    <profile>
+      <!-- profile to run javascript webapp -->
+      <id>js</id>
+      <modules>
+        <module>archiva-modules/archiva-web/archiva-webapp-js</module>
+      </modules>
+    </profile>
+    <profile>
+      <!-- profile to run javascript webapp and it tests -->
+      <id>it-js</id>
+      <modules>
+        <module>archiva-modules/archiva-web/archiva-webapp-js</module>
+        <module>archiva-modules/archiva-web/archiva-webapp-test-js</module>
+      </modules>
+    </profile>
+
     <profile>
       <!-- olamy profile to test tomcat plugin dev -->
       <id>tdev</id>