 |
 |
| Commit in projects/lcsim/trunk on MAIN | |||
| aida/pom.xml | +1 | -8 | 2848 -> 2849 |
| analysis/pom.xml | +2 | -1 | 2848 -> 2849 |
| cal-calib/pom.xml | +2 | -1 | 2848 -> 2849 |
| cal-recon/pom.xml | +1 | 2848 -> 2849 | |
| conditions/pom.xml | -7 | 2848 -> 2849 | |
| detector-data/pom.xml | +1 | -1 | 2848 -> 2849 |
| detector-framework/pom.xml | +1 | -9 | 2848 -> 2849 |
| distribution/pom.xml | +6 | -8 | 2848 -> 2849 |
| event-heprep/pom.xml | -7 | 2848 -> 2849 | |
| event-model/pom.xml | +1 | -8 | 2848 -> 2849 |
| event-processing/pom.xml | +1 | -8 | 2848 -> 2849 |
| job-manager/pom.xml | +1 | -8 | 2848 -> 2849 |
| math/pom.xml | +1 | -8 | 2848 -> 2849 |
| parent/pom.xml | +174 | -94 | 2848 -> 2849 |
| plugin/pom.xml | +1 | -8 | 2848 -> 2849 |
| pom.xml | +90 | -4 | 2848 -> 2849 |
| recon-drivers/pom.xml | +1 | -8 | 2848 -> 2849 |
| site/pom.xml | +12 | -7 | 2848 -> 2849 |
| tracking/pom.xml | +1 | -8 | 2848 -> 2849 |
| trf/pom.xml | +1 | -8 | 2848 -> 2849 |
| util/pom.xml | -6 | 2848 -> 2849 | |
| vertexing/pom.xml | +1 | -8 | 2848 -> 2849 |
| +299 | -225 | ||
add project website config; changes to module descriptions; update maven plugin versions; other misc cleanup
--- projects/lcsim/trunk/aida/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/aida/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>lcsim-aida</artifactId>
<name>aida</name>
- <description>lcsim AIDA utilities</description>
+ <description>AIDA utilities</description>
<parent>
<groupId>org.lcsim</groupId>
<artifactId>lcsim-parent</artifactId>
@@ -15,13 +15,6 @@
<developerConnection>${org.lcsim.scm.connection}/${project.name}</developerConnection>
<url>${org.lcsim.url}/${project.name}</url>
</scm>
- <distributionManagement>
- <site>
- <id>${project.artifactId}</id>
- <name>${project.artifactId}</name>
- <url>${org.lcsim.site}/${project.artifactId}/${project.version}</url>
- </site>
- </distributionManagement>
<dependencies>
<dependency>
<groupId>org.freehep</groupId>
--- projects/lcsim/trunk/analysis/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/analysis/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<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>
<artifactId>lcsim-analysis</artifactId>
@@ -3,5 +4,5 @@
<groupId>org.lcsim</groupId>
<name>analysis</name>
- <description>analysis code based on lcsim; not included in lcsim-distribution</description>
+ <description>analysis code</description>
<parent>
<groupId>org.lcsim</groupId>
--- projects/lcsim/trunk/cal-calib/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/cal-calib/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<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>
<artifactId>lcsim-cal-calib</artifactId>
@@ -4,7 +5,7 @@
<groupId>org.lcsim</groupId>
<packaging>jar</packaging>
<name>cal-calib</name>
- <description>An org.lcsim based calorimeter calibration package.</description>
+ <description>calorimeter calibration algorithms</description>
<scm>
<connection>${org.lcsim.scm.connection}/${project.name}</connection>
<developerConnection>${org.lcsim.scm.connection}/${project.name}</developerConnection>
--- projects/lcsim/trunk/cal-recon/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/cal-recon/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<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>
<artifactId>lcsim-cal-recon</artifactId>
--- projects/lcsim/trunk/conditions/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/conditions/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -15,13 +15,6 @@
<developerConnection>${org.lcsim.scm.connection}/${project.name}</developerConnection>
<url>${org.lcsim.url}/${project.name}</url>
</scm>
- <distributionManagement>
- <site>
- <id>${project.artifactId}</id>
- <name>${project.artifactId}</name>
- <url>${org.lcsim.site}/${project.artifactId}/${project.version}</url>
- </site>
- </distributionManagement>
<dependencies>
<dependency>
<groupId>org.lcsim</groupId>
--- projects/lcsim/trunk/detector-data/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/detector-data/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -26,6 +26,6 @@
<exclude>*.jar</exclude>
</excludes>
</resource>
- </resources>
+ </resources>
</build> </project>
--- projects/lcsim/trunk/detector-framework/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/detector-framework/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>lcsim-detector-framework</artifactId>
<name>detector-framework</name>
- <description>lcsim geometry and detector description framework (formerly GeomConverter)</description>
+ <description>geometry and detector description framework (formerly GeomConverter)</description>
<parent>
<groupId>org.lcsim</groupId>
<artifactId>lcsim-parent</artifactId>
@@ -15,13 +15,6 @@
<developerConnection>${org.lcsim.scm.connection}/${project.name}</developerConnection>
<url>${org.lcsim.url}/${project.name}</url>
</scm>
- <distributionManagement>
- <site>
- <id>${project.artifactId}</id>
- <name>${project.artifactId}</name>
- <url>${org.lcsim.site}/${project.artifactId}/${project.version}</url>
- </site>
- </distributionManagement>
<build>
<plugins>
<plugin>
@@ -38,7 +31,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.3.3</version>
<executions>
<execution>
<phase>package</phase>
--- projects/lcsim/trunk/distribution/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/distribution/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>lcsim-distribution</artifactId>
<name>distribution</name>
- <description>lcsim distribution package for generating the runnable bin jar and packaging the JAS plugin</description>
+ <description>distribution package for generating the runnable bin jar and packaging the JAS plugin</description>
<parent>
<groupId>org.lcsim</groupId>
<artifactId>lcsim-parent</artifactId>
@@ -15,13 +15,6 @@
<developerConnection>${org.lcsim.scm.connection}/${project.name}</developerConnection>
<url>${org.lcsim.url}/${project.name}</url>
</scm>
- <distributionManagement>
- <site>
- <id>${project.artifactId}</id>
- <name>${project.artifactId}</name>
- <url>${org.lcsim.site}/${project.artifactId}/${project.version}</url>
- </site>
- </distributionManagement>
<build>
<resources>
<resource>
@@ -179,6 +172,11 @@
<artifactId>lcsim-detector-data</artifactId>
<version>${org.lcsim.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.lcsim</groupId>
+ <artifactId>lcsim-analysis</artifactId>
+ <version>${org.lcsim.version}</version>
+ </dependency>
</dependencies>
<profiles>
<profile>
--- projects/lcsim/trunk/event-heprep/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/event-heprep/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -15,13 +15,6 @@
<developerConnection>${org.lcsim.scm.connection}/${project.name}</developerConnection>
<url>${org.lcsim.url}/${project.name}</url>
</scm>
- <distributionManagement>
- <site>
- <id>${project.artifactId}</id>
- <name>${project.artifactId}</name>
- <url>${org.lcsim.site}/${project.artifactId}/${project.version}</url>
- </site>
- </distributionManagement>
<dependencies>
<dependency>
<groupId>org.lcsim</groupId>
--- projects/lcsim/trunk/event-model/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/event-model/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>lcsim-event-model</artifactId>
<name>event-model</name>
- <description>lcsim event packages including interfaces, base classes and LCIO implementation</description>
+ <description>physics event packages including interfaces, base classes and LCIO implementation</description>
<parent>
<groupId>org.lcsim</groupId>
<artifactId>lcsim-parent</artifactId>
@@ -15,13 +15,6 @@
<developerConnection>${org.lcsim.scm.connection}/${project.name}</developerConnection>
<url>${org.lcsim.url}/${project.name}</url>
</scm>
- <distributionManagement>
- <site>
- <id>${project.artifactId}</id>
- <name>${project.artifactId}</name>
- <url>${org.lcsim.site}/${project.artifactId}/${project.version}</url>
- </site>
- </distributionManagement>
<dependencies>
<dependency>
<groupId>org.freehep</groupId>
--- projects/lcsim/trunk/event-processing/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/event-processing/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>lcsim-event-processing</artifactId>
<name>event-processing</name>
- <description>lcsim event processing including Driver implementation and adapters to Freehep record framework</description>
+ <description>physics event processing including Driver implementation and adapters to Freehep record framework</description>
<parent>
<groupId>org.lcsim</groupId>
<artifactId>lcsim-parent</artifactId>
@@ -15,13 +15,6 @@
<developerConnection>${org.lcsim.scm.connection}/${project.name}</developerConnection>
<url>${org.lcsim.url}/${project.name}</url>
</scm>
- <distributionManagement>
- <site>
- <id>${project.artifactId}</id>
- <name>${project.artifactId}</name>
- <url>${org.lcsim.site}/${project.artifactId}/${project.version}</url>
- </site>
- </distributionManagement>
<dependencies>
<dependency>
<groupId>org.lcsim</groupId>
--- projects/lcsim/trunk/job-manager/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/job-manager/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>lcsim-job-manager</artifactId>
<name>job-manager</name>
- <description>lcsim event processing utilities</description>
+ <description>job manager allowing XML steering using a command line utility</description>
<parent>
<groupId>org.lcsim</groupId>
<artifactId>lcsim-parent</artifactId>
@@ -15,13 +15,6 @@
<developerConnection>${org.lcsim.scm.connection}/${project.name}</developerConnection>
<url>${org.lcsim.url}/${project.name}</url>
</scm>
- <distributionManagement>
- <site>
- <id>${project.artifactId}</id>
- <name>${project.artifactId}</name>
- <url>${org.lcsim.site}/${project.artifactId}/${project.version}</url>
- </site>
- </distributionManagement>
<dependencies>
<dependency>
<groupId>org.lcsim</groupId>
--- projects/lcsim/trunk/math/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/math/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>lcsim-math</artifactId>
<name>math</name>
- <description>lcsim math utilities</description>
+ <description>math utilities</description>
<parent>
<groupId>org.lcsim</groupId>
<artifactId>lcsim-parent</artifactId>
@@ -15,13 +15,6 @@
<developerConnection>${org.lcsim.scm.connection}/${project.name}</developerConnection>
<url>${org.lcsim.url}/${project.name}</url>
</scm>
- <distributionManagement>
- <site>
- <id>${project.artifactId}</id>
- <name>${project.artifactId}</name>
- <url>${org.lcsim.site}/${project.artifactId}/${project.version}</url>
- </site>
- </distributionManagement>
<dependencies>
<dependency>
<groupId>org.freehep</groupId>
--- projects/lcsim/trunk/parent/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/parent/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -9,11 +9,12 @@
<packaging>pom</packaging>
<version>3.0-SNAPSHOT</version>
<name>parent</name>
- <url>http://www.lcsim.org/</url>
+ <url>http://www.lcsim.org/sites/lcsim</url>
+ <description>parent POM file</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<org.lcsim.cacheDir>${user.home}</org.lcsim.cacheDir>
- <org.lcsim.site>dav:http://srs.slac.stanford.edu/nexus/content/sites/lcsim-site/</org.lcsim.site>
+ <org.lcsim.site>dav:http://srs.slac.stanford.edu/nexus/content/sites/lcsim-site/lcsim</org.lcsim.site>
<org.lcsim.scm.connection>scm:svn:svn://svn.freehep.org/lcdet/projects/lcsim/trunk</org.lcsim.scm.connection>
<org.lcsim.version>3.0-SNAPSHOT</org.lcsim.version>
<org.lcsim.url>http://java.freehep.org/svn/repos/lcdet/list/projects/lcsim/trunk</org.lcsim.url>
@@ -31,7 +32,7 @@
</repository>
<repository>
<id>lcsim-repo-public</id>
- <name>LCSIM Public Maven Repository</name>
+ <name>LCSIM Public Maven Repository</name>
<url>http://srs.slac.stanford.edu/nexus/content/groups/lcsim-maven2-public/</url>
</repository>
<repository>
@@ -67,27 +68,29 @@
<site>
<id>lcsim-site</id>
<name>LCSIM Maven2 central site repository</name>
- <url>dav:http://srs.slac.stanford.edu/nexus/content/sites/lcsim-site/${project.artifactId}/${project.version}</url>
+ <url>${org.lcsim.site}</url>
</site>
</distributionManagement>
<developers>
<developer>
- <name>jeremym</name>
+ <name>Jeremy McCormick</name>
<email>[log in to unmask]</email>
- <organization>SLAC National Accelerator Laboratory</organization>
+ <organization>SLAC</organization>
<organizationUrl>http://www.slac.stanford.edu/</organizationUrl>
<roles>
<role>developer</role>
+ <role>release manager</role>
</roles>
<timezone>-8</timezone>
<properties>
<aim>jeremyslac</aim>
+ <gtalk>[log in to unmask]</gtalk>
</properties>
</developer>
<developer>
- <name>tonyj</name>
+ <name>Tony Johnson</name>
<email>[log in to unmask]</email>
- <organization>SLAC National Accelerator Laboratory</organization>
+ <organization>SLAC</organization>
<organizationUrl>http://www.slac.stanford.edu/</organizationUrl>
<roles>
<role>developer</role>
@@ -95,9 +98,9 @@
<timezone>-8</timezone>
</developer>
<developer>
- <name>ngraf</name>
+ <name>Norman Graf</name>
<email>[log in to unmask]</email>
- <organization>SLAC National Accelerator Laboratory</organization>
+ <organization>SLAC</organization>
<organizationUrl>http://www.slac.stanford.edu/</organizationUrl>
<roles>
<role>developer</role>
@@ -105,6 +108,79 @@
<timezone>-8</timezone>
</developer>
</developers>
+ <contributors> + <contributor> + <name>Rich Partridge</name> + <email>[log in to unmask]</email> + <organization>SLAC</organization> + <organizationUrl>http://www.slac.stanford.edu</organizationUrl> + <roles> + <role>developer</role> + </roles> + <timezone>-8</timezone> + </contributor> + <contributor> + <name>Tim Nelson</name> + <email>[log in to unmask]</email> + <organization>SLAC</organization> + <organizationUrl>http://www.slac.stanford.edu</organizationUrl> + <roles> + <role>developer</role> + </roles> + <timezone>-8</timezone> + </contributor> + <contributor> + <name>Pelle Hansson</name> + <email>[log in to unmask]</email> + <organization>SLAC</organization> + <organizationUrl>http://www.slac.stanford.edu</organizationUrl> + <roles> + <role>developer</role> + </roles> + <timezone>-8</timezone> + </contributor> + <contributor> + <name>Jan Strube</name> + <email>[log in to unmask]</email> + <organization>CERN</organization> + <organizationUrl>http://cern.ch</organizationUrl> + <roles> + <role>developer</role> + </roles> + <timezone>1</timezone> + </contributor> + <contributor> + <name>Christian Grefe</name> + <email>[log in to unmask]</email> + <organization>CERN</organization> + <organizationUrl>http://cern.ch</organizationUrl> + <roles> + <role>developer</role> + </roles> + <timezone>1</timezone> + </contributor> + </contributors> + <organization> + <name>Linear Collider Detector (LCD)</name> + <url>http://www.lcsim.org</url> + </organization> + <ciManagement> + <system>Jenkins</system> + <url>http://srs.slac.stanford.edu/hudson/view/lcsim/</url> + </ciManagement> + <issueManagement> + <system>JIRA</system> + <url>https://jira.slac.stanford.edu/browse/LCSIM</url> + </issueManagement> + <mailingLists> + <mailingList> + <name>lcd-dev</name> + <subscribe>Email [log in to unmask] with message: subscribe lcd-dev</subscribe> + <unsubscribe>Email [log in to unmask] with message: unsubscribe lcd-dev</unsubscribe> + <post>[log in to unmask]</post> + <archive>https://listserv.slac.stanford.edu/cgi-bin/wa?A0=LCD-DEV</archive> + </mailingList> + </mailingLists>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -116,32 +192,56 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.7</version> + <reportSets> + <reportSet> + <id>non-aggregate</id> + <reports> + <report>dependencies</report> + <report>index</report> + <report>scm</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9</version>
+ <version>2.9.1</version>
<configuration>
<source>1.7</source>
<show>private</show>
+ <detectJavaApiLink>true</detectJavaApiLink>
<links>
- <link>http://docs.oracle.com/javase/7/docs/api/</link>
+ <link>http://aida.freehep.org/doc/v3.3.0/api/index.htm</link>
<link>http://java.freehep.org/freehep-physics/apidocs/</link>
+ <link>http://java.freehep.org/freehep-application/apidocs/index.html</link> + <link>http://java.freehep.org/freehep-sio/apidocs/index.html</link> + <link>http://java.freehep.org/freehep-stdhep/</link>
<link>http://java.freehep.org/heprep/apidocs/</link>
<link>http://www.jdom.org/docs/apidocs/</link>
+ <link>http://www.gnu.org/software/jel/api/</link> + <link>http://commons.apache.org/proper/commons-cli/apidocs/index.html</link> + <link>http://commons.apache.org/proper/commons-math/javadocs/api-2.2/index.html</link>
</links>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.6</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.14.1</version>
+ <version>2.16</version>
</plugin>
</plugins>
</reporting>
<build>
+ <defaultGoal>install</defaultGoal>
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
@@ -149,60 +249,15 @@
<version>2.2</version>
</extension>
</extensions>
- <defaultGoal>install</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-scm-plugin</artifactId>
- <version>1.8.1</version>
- <configuration>
- <connectionType>connection</connectionType>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- <showWarnings>true</showWarnings>
- <showDeprecation>true</showDeprecation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.14.1</version>
- <configuration>
- <argLine>-Xmx1024m</argLine>
- <forkMode>pertest</forkMode>
- <excludes>
- <!-- Fix for http://jira.codehaus.org/browse/SUREFIRE-288 to ignore inner classes. -->
- <exclude>**/*$*</exclude>
- </excludes>
- <!-- This allows the cacheDir to be overridden by settings.xml, e.g. for Hudson builds. -->
- <systemProperties>
- <property>
- <name>org.lcsim.cacheDir</name>
- <value>${org.lcsim.cacheDir}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.4.2</version>
- <configuration>
- <tagBase>svn://svn.freehep.org/lcdet/projects/lcsim/tags</tagBase>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.2</version>
+ <inherited>false</inherited>
<configuration>
- <chmod>false</chmod>
+ <generateReports>false</generateReports> + <skip>true</skip> + <skipDeploy>true</skipDeploy>
</configuration>
</plugin>
<plugin>
@@ -210,10 +265,10 @@
<version>1.7</version>
<executions>
<execution>
+ <id>create-test-output-dir</id>
<phase>generate-test-resources</phase>
<configuration>
<tasks>
- <!-- Create the directory for test output. -->
<mkdir dir="${project.build.directory}/test-output"/>
</tasks>
</configuration>
@@ -223,39 +278,64 @@
</execution>
</executions>
</plugin>
- <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>1.3.3</version> - </plugin>
</plugins>
<pluginManagement>
<plugins>
- <!-- This fixes the 'plugin not covered by lifecycle execution' warning. -->
<plugin>
- <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version>
+ <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-plugin</artifactId> + <version>1.8.1</version>
<configuration>
- <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <versionRange>[1.7,)</versionRange> - <goals> - <goal>run</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore/> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata>
+ <connectionType>connection</connectionType>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ <showWarnings>true</showWarnings>
+ <showDeprecation>true</showDeprecation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.16</version>
+ <configuration>
+ <argLine>-Xmx1024m</argLine>
+ <forkMode>pertest</forkMode>
+ <!-- This allows the cacheDir to be overridden by settings.xml, e.g. for Hudson builds. -->
+ <systemProperties>
+ <property>
+ <name>org.lcsim.cacheDir</name>
+ <value>${org.lcsim.cacheDir}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.4.2</version>
+ <configuration>
+ <tagBase>svn://svn.freehep.org/lcdet/projects/lcsim/tags</tagBase>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.3</version>
+ <configuration>
+ <chmod>false</chmod>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
--- projects/lcsim/trunk/plugin/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/plugin/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>lcsim-plugin</artifactId>
<name>plugin</name>
- <description>lcsim JAS plugin</description>
+ <description>JAS plugin</description>
<parent>
<groupId>org.lcsim</groupId>
<artifactId>lcsim-parent</artifactId>
@@ -15,13 +15,6 @@
<developerConnection>${org.lcsim.scm.connection}/${project.name}</developerConnection>
<url>${org.lcsim.url}/${project.name}</url>
</scm>
- <distributionManagement>
- <site>
- <id>${project.artifactId}</id>
- <name>${project.artifactId}</name>
- <url>${org.lcsim.site}/${project.artifactId}/${project.version}</url>
- </site>
- </distributionManagement>
<dependencies>
<dependency>
<groupId>org.lcsim</groupId>
--- projects/lcsim/trunk/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -1,11 +1,12 @@
+<?xml version="1.0"?>
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.lcsim</groupId>
- <artifactId>lcsim-modules</artifactId>
+ <artifactId>lcsim</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>modules</name> - <description>lcsim module build</description>
+ <name>lcsim</name> + <description>lcsim project</description>
<parent>
<groupId>org.lcsim</groupId>
<artifactId>lcsim-parent</artifactId>
@@ -23,7 +24,7 @@
<module>event-processing</module>
<module>job-manager</module>
<module>tracking</module>
- <module>vertexing</module>
+ <module>vertexing</module>
<module>event-heprep</module>
<module>plugin</module>
<module>recon-drivers</module>
@@ -34,4 +35,89 @@
<module>distribution</module>
<module>analysis</module>
</modules>
+ <distributionManagement>
+ <site>
+ <id>lcsim-site</id>
+ <url>${org.lcsim.site}</url>
+ </site>
+ </distributionManagement>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <generateReports>true</generateReports>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.7</version>
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <reports>
+ <report>cim</report>
+ <report>dependency-convergence</report>
+ <report>index</report>
+ <report>issue-tracking</report>
+ <report>mailing-list</report>
+ <report>modules</report>
+ <report>plugin-management</report>
+ <report>plugins</report>
+ <report>project-team</report>
+ <report>scm</report>
+ <report>summary</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <columnNames>Type,Key,Summary,Assignee,Status,Resolution,Fix Version,Created</columnNames>
+ <sortColumnNames>Type,Key DESC</sortColumnNames>
+ <statusIds>Resolved, Closed</statusIds>
+ <maxEntries>9999</maxEntries>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>jira-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9.1</version>
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <reports>
+ <report>aggregate</report>
+ <report>test-aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ <linkJavadoc>true</linkJavadoc>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
--- projects/lcsim/trunk/recon-drivers/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/recon-drivers/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>lcsim-recon-drivers</artifactId>
<name>recon-drivers</name>
- <description>miscellaneous recon drivers used in example steering files</description>
+ <description>recon drivers used in production steering files for SiD and CLiC</description>
<parent>
<groupId>org.lcsim</groupId>
<artifactId>lcsim-parent</artifactId>
@@ -15,13 +15,6 @@
<developerConnection>${org.lcsim.scm.connection}/${project.name}</developerConnection>
<url>${org.lcsim.url}/${project.name}</url>
</scm>
- <distributionManagement>
- <site>
- <id>${project.artifactId}</id>
- <name>${project.artifactId}</name>
- <url>${org.lcsim.site}/${project.artifactId}/${project.version}</url>
- </site>
- </distributionManagement>
<dependencies>
<dependency>
<groupId>org.lcsim</groupId>
--- projects/lcsim/trunk/site/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/site/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>lcsim-site</artifactId>
<name>site</name>
- <description>lcsim project website</description>
+ <description>project website</description>
<parent>
<groupId>org.lcsim</groupId>
<artifactId>lcsim-parent</artifactId>
@@ -15,10 +15,15 @@
<developerConnection>${org.lcsim.scm.connection}/${project.name}</developerConnection>
<url>${org.lcsim.url}/${project.name}</url>
</scm>
- <distributionManagement>
- <site>
- <id>lcsim-site</id>
- <url>${org.lcsim.site}/${project.artifactId}/${project.version}</url>
- </site>
- </distributionManagement>
+ <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <generateReports>false</generateReports> + </configuration> + </plugin> + </plugins> + </build>
</project>
--- projects/lcsim/trunk/tracking/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/tracking/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>lcsim-tracking</artifactId>
<name>tracking</name>
- <description>lcsim tracking including sisim and seedtracker</description>
+ <description>tracking including digitization package sisim and track finding with seedtracker</description>
<parent>
<groupId>org.lcsim</groupId>
<artifactId>lcsim-parent</artifactId>
@@ -15,13 +15,6 @@
<developerConnection>${org.lcsim.scm.connection}/${project.name}</developerConnection>
<url>${org.lcsim.url}/${project.name}</url>
</scm>
- <distributionManagement>
- <site>
- <id>${project.artifactId}</id>
- <name>${project.artifactId}</name>
- <url>${org.lcsim.site}/${project.artifactId}/${project.version}</url>
- </site>
- </distributionManagement>
<dependencies>
<dependency>
<groupId>org.lcsim</groupId>
--- projects/lcsim/trunk/trf/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/trf/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -14,15 +14,8 @@
<scm>
<connection>${org.lcsim.scm.connection}/${project.name}</connection>
<developerConnection>${org.lcsim.scm.connection}/${project.name}</developerConnection>
- <url>${org.lcsim.deploy}/${project.name}</url>
+ <url>${org.lcsim.url}/${project.name}</url>
</scm>
- <distributionManagement>
- <site>
- <id>${project.artifactId}</id>
- <name>${project.artifactId}</name>
- <url>${org.lcsim.site}/${project.artifactId}/${project.version}</url>
- </site>
- </distributionManagement>
<dependencies>
<dependency>
<groupId>org.lcsim</groupId>
--- projects/lcsim/trunk/util/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/util/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -16,12 +16,6 @@
<developerConnection>${org.lcsim.scm.connection}/${project.name}</developerConnection>
<url>${org.lcsim.url}/${project.name}</url>
</scm>
- <distributionManagement>
- <site>
- <id>lcsim-site</id>
- <url>${org.lcsim.site}/${project.artifactId}/${project.version}</url>
- </site>
- </distributionManagement>
<dependencies>
<dependency>
<groupId>org.jdom</groupId>
--- projects/lcsim/trunk/vertexing/pom.xml 2013-12-11 21:02:14 UTC (rev 2848) +++ projects/lcsim/trunk/vertexing/pom.xml 2013-12-12 04:56:06 UTC (rev 2849) @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>lcsim-vertexing</artifactId>
<name>vertexing</name>
- <description>lcsim vertex reconstruction</description>
+ <description>vertex reconstruction</description>
<parent>
<groupId>org.lcsim</groupId>
<artifactId>lcsim-parent</artifactId>
@@ -15,13 +15,6 @@
<developerConnection>${org.lcsim.scm.connection}/${project.name}</developerConnection>
<url>${org.lcsim.url}/${project.name}</url>
</scm>
- <distributionManagement>
- <site>
- <id>${project.artifactId}</id>
- <name>${project.artifactId}</name>
- <url>${org.lcsim.site}/${project.artifactId}/${project.version}</url>
- </site>
- </distributionManagement>
<dependencies>
<dependency>
<groupId>org.lcsim</groupId>
Use REPLY-ALL to reply to list
To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1