 |
 |
| Commit in lcsim-parent on MAIN | |||
| pom.xml | +25 | -173 | 1.153 -> 1.154 |
use more recent maven-release-plugin version; minor cleanup
diff -u -r1.153 -r1.154 --- pom.xml 15 Apr 2013 21:50:07 -0000 1.153 +++ pom.xml 16 Apr 2013 19:31:32 -0000 1.154 @@ -20,19 +20,25 @@
</scm>
<distributionManagement>
<repository>
- <id>lcsim-maven-slac-linux</id>
+ <id>lcsim-maven-slac-linux-repo</id>
<name>org.lcsim Maven Repository</name>
<url>${org.lcsim.deploy}</url>
</repository>
+ <snapshotRepository> + <id>lcsim-maven-slac-linux-snapshot-repo</id> + <name>org.lcsim Maven Repository</name> + <url>scp://svn.slac.stanford.edu///nfs/slac/g/lcd/mc/prj/www/lcsim/maven2/</url> + <uniqueVersion>false</uniqueVersion> + </snapshotRepository>
</distributionManagement>
<repositories>
<repository>
- <id>freehep-maven</id>
+ <id>freehep-maven-repo</id>
<name>FreeHEP Maven 2 Repository</name>
<url>http://java.freehep.org/maven2</url>
</repository>
<repository>
- <id>lcsim-maven</id>
+ <id>lcsim-maven-repo</id>
<name>org.lcsim Maven Repository</name>
<url>http://lcsim.org/maven2</url>
<snapshots>
@@ -45,14 +51,14 @@
</releases>
</repository>
<repository>
- <id>MavenCentral</id>
+ <id>maven-central-repo</id>
<name>Maven repository</name>
<url>http://repo1.maven.org/maven2/</url>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
- <id>freehep-maven</id>
+ <id>freehep-maven-plugin-repo</id>
<name>Freehep Plugin Repository</name>
<url>http://java.freehep.org/maven2</url>
<snapshots>
@@ -63,7 +69,7 @@
</releases>
</pluginRepository>
<pluginRepository>
- <id>lcsim-maven</id>
+ <id>lcsim-maven-repo</id>
<name>LCSim Plugin Repository</name>
<url>http://lcsim.org/maven2</url>
<layout>default</layout>
@@ -81,162 +87,18 @@
<artifactId>junit</artifactId>
<version>3.8.2</version>
</dependency>
- <!-- - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-conditions</artifactId> - <version>1.9</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-math</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.7.1</version> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-physics</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.1</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.0</version> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-record</artifactId> - <version>3.0.7</version> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-sio</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-stdhep</artifactId> - <version>2.0.1</version> - </dependency> - <dependency> - <groupId>net.java.dev</groupId> - <artifactId>truezip</artifactId> - <version>6.6</version> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-heprep</artifactId> - <version>2.0.3</version> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-jheprep</artifactId> - <version>2.0.5</version> - </dependency> - <dependency> - <groupId>org.gnu</groupId> - <artifactId>jel</artifactId> - <version>2.0.1</version> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-jaida</artifactId> - <version>3.4.4-SNAPSHOT</version> - <exclusions> - <exclusion> - <artifactId>javahelp</artifactId> - <groupId>javax.help</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>hep.aida</groupId> - <artifactId>aida</artifactId> - <version>3.3.1</version> - </dependency> - <dependency> - <groupId>hep.aida</groupId> - <artifactId>aida-dev</artifactId> - <version>3.3</version> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>jas-core</artifactId> - <version>0.9.9</version> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>jas-plotter</artifactId> - <version>2.2.7</version> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-jaida-jminuit</artifactId> - <version>3.3.0-12</version> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-jminuit</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-graphicsio</artifactId> - <version>2.2.1</version> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-graphicsio-pdf</artifactId> - <version>2.2.1</version> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-graphicsio-ps</artifactId> - <version>2.2.1</version> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-graphicsio-svg</artifactId> - <version>2.2.1</version> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-graphicsio-swf</artifactId> - <version>2.2.1</version> - </dependency> - -->
</dependencies>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
+ <version>2.9</version>
<configuration>
- <source>1.6</source>
+ <source>1.7</source>
+ <show>private</show>
<links>
- <link>http://java.sun.com/j2se/1.6.0/docs/api/</link>
+ <link>http://docs.oracle.com/javase/7/docs/api/</link>
<link>http://java.freehep.org/freehep-physics/apidocs/</link>
<link>http://java.freehep.org/heprep/apidocs/</link>
<link>http://www.jdom.org/docs/apidocs/</link>
@@ -246,7 +108,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -256,18 +118,6 @@
</plugins>
</reporting>
<build>
- <sourceDirectory>src</sourceDirectory> - <resources> - <resource> - <directory>resources</directory> - </resource> - </resources> - <testSourceDirectory>test</testSourceDirectory> - <testResources> - <testResource> - <directory>testResources</directory> - </testResource> - </testResources>
<defaultGoal>install</defaultGoal>
<extensions>
<extension>
@@ -287,10 +137,10 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
- <source>1.6</source> - <target>1.6</target>
+ <source>1.7</source> + <target>1.7</target>
<showWarnings>true</showWarnings>
<showDeprecation>true</showDeprecation>
</configuration>
@@ -318,7 +168,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.3.2</version>
+ <!-- <version>2.3.2</version> --> + <version>2.4.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -351,9 +202,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
<configuration>
- <source>1.6</source> - <target>1.6</target>
+ <source>1.7</source> + <target>1.7</target>
</configuration>
</plugin>
<plugin>
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