Author: janstey
Date: Thu Nov 20 11:04:51 2008
New Revision: 719325
URL: http://svn.apache.org/viewvc?rev=719325&view=rev
Log:
Merged revisions 719322-719323 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r719322 | janstey | 2008-11-20 15:19:27 -0330 (Thu, 20 Nov 2008) | 1 line
Move checkstyle/cobertura into profile so they can be disabled by the
nochecks profile
........
r719323 | janstey | 2008-11-20 15:25:59 -0330 (Thu, 20 Nov 2008) | 1 line
Change to released version of buildtools. For some reason Maven would not use
the locally built 2.0-SNAPSHOT version - it needed a deployed version...
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/pom.xml
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/pom.xml?rev=719325&r1=719324&r2=719325&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/pom.xml Thu Nov 20 11:04:51 2008
@@ -1059,7 +1059,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-buildtools</artifactId>
- <version>${project.version}</version>
+ <version>1.5.0</version>
</dependency>
</dependencies>
<executions>
@@ -1149,26 +1149,10 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
</plugin>
-->
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <formats>
- <format>html</format>
- </formats>
- </configuration>
- </plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
@@ -1351,30 +1335,47 @@
<profile>
<id>nochecks</id>
</profile>
-
<profile>
- <id>sourcecheck</id>
- <!-- TODO enable this profile when the first buildtools jar is published
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation-->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin-->
- </plugins>
- </build>
+ <id>sourcecheck</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <!--plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin-->
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <formats>
+ <format>html</format>
+ </formats>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</profile>
+
<profile>
<id>rat</id>
<build>
