Commit in lcsim-parent on MAIN | |||
pom.xml | +101 | -32 | 1.73 -> 1.74 |
update Maven plugins
diff -u -r1.73 -r1.74 --- pom.xml 20 Jan 2012 21:37:40 -0000 1.73 +++ pom.xml 20 Jan 2012 23:13:08 -0000 1.74 @@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<modelVersion>4.0.0</modelVersion> <groupId>org.lcsim</groupId> <artifactId>lcsim-parent</artifactId>
@@ -6,32 +7,36 @@
<version>1.12-SNAPSHOT</version> <name>org DOT lcsim parent</name> <url>http://lcsim.org/</url>
+
<properties> <org.lcsim.cacheDir>${user.home}</org.lcsim.cacheDir> <org.lcsim.host>scp://svn.slac.stanford.edu/</org.lcsim.host> <org.lcsim.siteDir>/nfs/slac/g/lcd/mc/prj/www/lcsim/software/</org.lcsim.siteDir> <org.lcsim.cvs.connection>scm:cvs:pserver:@cvs.freehep.org:/cvs/lcd</org.lcsim.cvs.connection> </properties>
+
<scm> <connection>scm:cvs:pserver:cvs.freehep.org:/cvs/lcd:lcsim-parent</connection> <developerConnection>scm:cvs:pserver:cvs.freehep.org:/cvs/lcd:lcsim-parent</developerConnection> <url>http://www.lcsim.org</url> </scm>
- <profiles> - <profile> - <id>lcsim-deploy</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <distributionManagement> - <repository> - <id>lcsim-maven-slac-linux</id> - <name>org.lcsim Maven Repository</name> - <url>scpexe://svn.slac.stanford.edu///nfs/slac/g/lcd/mc/prj/www/lcsim/maven2/</url> - </repository> - </distributionManagement>
+ + <profiles> + <profile> + <id>lcsim-deploy</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <distributionManagement> + <repository> + <id>lcsim-maven-slac-linux</id> + <name>org.lcsim Maven Repository</name> + <url>scpexe://svn.slac.stanford.edu///nfs/slac/g/lcd/mc/prj/www/lcsim/maven2/</url> + </repository> + </distributionManagement>
</profile> </profiles>
+
<repositories> <repository> <id>freehep-maven</id>
@@ -57,6 +62,7 @@
<url>http://repo1.maven.org/maven2/</url> </repository> </repositories>
+
<pluginRepositories> <pluginRepository> <id>freehep-maven</id>
@@ -82,6 +88,7 @@
</releases> </pluginRepository> </pluginRepositories>
+
<dependencies> <dependency> <groupId>org.lcsim</groupId>
@@ -239,11 +246,14 @@
<version>2.0</version> </dependency> </dependencies>
+
<reporting> <plugins>
+
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
-<!-- <version>2.8</version>-->
+ <version>2.8</version>
<configuration> <source>1.6</source> <links>
@@ -253,9 +263,22 @@
<link>http://www.jdom.org/docs/apidocs/</link> </links> </configuration>
- </plugin>
+ </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.1.1</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> +
</plugins> </reporting>
+
<build> <sourceDirectory>src</sourceDirectory> <resources>
@@ -270,39 +293,36 @@
</testResource> </testResources> <defaultGoal>install</defaultGoal>
- <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>2.3</version> - </plugin> - </plugins> - </pluginManagement>
+ + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh</artifactId> + <version>2.2</version> + </extension> + </extensions> +
<plugins>
+
<plugin> <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
<configuration> <source>1.6</source> <target>1.6</target> </configuration> </plugin>
+
<plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId>
-<!-- <version>2.11</version>-->
<configuration> <argLine>-Xmx1024m</argLine> <forkMode>pertest</forkMode> <excludes>
- <!-- - Fix for http://jira.codehaus.org/browse/SUREFIRE-288 - Ignore inner classes when scanning for tests. - -->
+ <!-- Fix for http://jira.codehaus.org/browse/SUREFIRE-288 to ignore inner classes. -->
<exclude>**/*$*</exclude> </excludes>
- <!-- This allows the cacheDir to be overiden in settings.xml (used by hudson) -->
+ <!-- This allows the cacheDir to be overridden by settings.xml, e.g. for Hudson builds. -->
<systemProperties> <property> <name>org.lcsim.cacheDir</name>
@@ -311,7 +331,23 @@
</systemProperties> </configuration> </plugin>
- <!-- Create the directory for test output. -->
+ + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.2.2</version> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>2.3</version> + <configuration> + <chmod>false</chmod> + </configuration> + </plugin> + + <!-- Run ant plugin to create the directory for test output. -->
<plugin> <artifactId>maven-antrun-plugin</artifactId> <executions>
@@ -328,6 +364,39 @@
</execution> </executions> </plugin>
+ + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-plugin</artifactId> + <version>1.6</version> + </plugin> +
</plugins>
+ + <pluginManagement> + <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + </plugin> + + </plugins> + </pluginManagement> +
</build> </project>
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1