Author: olamy
Date: Thu Mar 1 17:08:31 2012
New Revision: 1295676
URL: http://svn.apache.org/viewvc?rev=1295676&view=rev
Log:
cleanup profiles move declaration to top pom: I can use vi pom.xml to see
configured profiles :-)
Modified:
archiva/trunk/archiva-modules/archiva-web/pom.xml
archiva/trunk/archiva-modules/pom.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-web/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/pom.xml?rev=1295676&r1=1295675&r2=1295676&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/pom.xml Thu Mar 1 17:08:31 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/pom.xml?rev=1295676&r1=1295675&r2=1295676&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/pom.xml (original)
+++ archiva/trunk/archiva-modules/pom.xml Thu Mar 1 17:08:31 2012
@@ -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>
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1295676&r1=1295675&r2=1295676&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Thu Mar 1 17:08:31 2012
@@ -1813,6 +1813,29 @@
</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>
<modules>