 |
 |
| Commit in projects/lcsim/trunk on MAIN | |||
| parent/pom.xml | +330 | -129 | 2965 -> 2966 |
| pom.xml | -1 | 2965 -> 2966 | |
| site/pom.xml | +3 | -4 | 2965 -> 2966 |
| +333 | -134 | ||
remove site-parent and merge config into parent pom
--- projects/lcsim/trunk/parent/pom.xml 2014-02-10 21:48:59 UTC (rev 2965) +++ projects/lcsim/trunk/parent/pom.xml 2014-02-10 22:55:39 UTC (rev 2966) @@ -9,21 +9,20 @@
<packaging>pom</packaging>
<name>parent</name>
<description>parent POM file for lcsim modules</description>
+ <version>3.0.3-SNAPSHOT</version>
<url>http://www.lcsim.org/sites/lcsim/</url>
- - <parent> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-site-parent</artifactId> - <version>3.0.3-SNAPSHOT</version> - <relativePath>../site-parent/pom.xml</relativePath> - </parent> -
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <org.lcsim.cacheDir>${user.home}</org.lcsim.cacheDir>
+ </properties>
+
<scm>
<url>http://java.freehep.org/svn/repos/lcdet/list/projects/lcsim/trunk/parent/</url>
<connection>scm:svn:svn://svn.freehep.org/lcdet/projects/lcsim/trunk/parent/</connection>
<developerConnection>scm:svn:svn://svn.freehep.org/lcdet/projects/lcsim/trunk/parent/</developerConnection>
</scm>
-
+
<repositories>
<repository>
<id>freehep-repo-public</id>
@@ -47,7 +46,7 @@
</releases>
</repository>
</repositories>
-
+
<pluginRepositories>
<pluginRepository>
<id>freehep-maven-plugin-repo</id>
@@ -55,7 +54,7 @@
<url>http://srs.slac.stanford.edu/nexus/content/groups/freehep-maven2-public/</url>
</pluginRepository>
</pluginRepositories>
-
+
<distributionManagement>
<repository>
<id>lcsim-repo-releases</id>
@@ -73,102 +72,107 @@
</site>
</distributionManagement>
- <!-- DO NOT EDIT THE VERSIONS OF org.lcsim DEPENDENCIES. IT IS DONE AUTOMATICALLY WHEN RELEASING. -->
<dependencyManagement>
- <dependencies> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-vertexing</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-event-heprep</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-recon-drivers</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-event-processing</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-trf</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-event-model</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-aida</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-util</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-tracking</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-cal-recon</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-cal-calib</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-detector-framework</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-detector-data</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-conditions</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-analysis</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-math</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-job-manager</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-plugin</artifactId> - <version>3.0.3-SNAPSHOT</version> - </dependency> - </dependencies>
+ <dependencies> + <!-- Do not edit org.lcsim dependencies manually. They are updated when releases are performed. --> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-vertexing</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-event-heprep</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-recon-drivers</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-event-processing</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-trf</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-event-model</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-aida</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-util</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-tracking</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-cal-recon</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-cal-calib</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-detector-framework</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-detector-data</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-conditions</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-analysis</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-math</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-job-manager</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-plugin</artifactId> + <version>3.0.3-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.freehep</groupId> + <artifactId>freehep-record</artifactId> + <version>3.0.8</version> + </dependency> + </dependencies>
</dependencyManagement>
-
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -181,29 +185,16 @@
<version>1.1</version>
</dependency>
</dependencies>
-
+
<build>
<defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>create-test-output-dir</id>
- <phase>generate-test-resources</phase>
- <configuration>
- <tasks>
- <mkdir dir="${project.build.directory}/test-output" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav-jackrabbit</artifactId> + <version>2.2</version> + </extension> + </extensions>
<pluginManagement>
<plugins>
<plugin>
@@ -232,7 +223,8 @@
<configuration>
<argLine>-Xmx1024m</argLine>
<forkMode>pertest</forkMode>
- <!-- This allows the cacheDir to be overridden by settings.xml, e.g. for Hudson builds. -->
+ <!-- This allows the cacheDir to be overridden by + settings.xml, e.g. for Hudson builds. -->
<systemProperties>
<property>
<name>org.lcsim.cacheDir</name>
@@ -255,10 +247,106 @@
<artifactId>maven-shade-plugin</artifactId>
<version>2.2</version>
</plugin>
+ <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.3</version> + <configuration> + <chmod>false</chmod> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.7</version> + </plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-test-output-dir</id>
+ <phase>generate-test-resources</phase>
+ <configuration>
+ <tasks>
+ <mkdir
+ dir="${project.build.directory}/test-output" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>false</inherited>
+ <configuration>
+ <generateReports>false</generateReports>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
-
+ + <reporting> + <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.1</version> + <inherited>true</inherited> + <configuration> + <source>1.7</source> + <show>private</show> + <detectJavaApiLink>true</detectJavaApiLink> + <links> + <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-surefire-report-plugin</artifactId> + <version>2.16</version> + </plugin> + </plugins> + </reporting> +
<profiles>
<profile>
<id>skipTests</id>
@@ -275,5 +363,118 @@
</build>
</profile>
</profiles>
-
+ + <developers> + <developer> + <name>Jeremy McCormick</name> + <email>[log in to unmask]</email> + <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>Tony Johnson</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> + </developer> + <developer> + <name>Norman Graf</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> + </developer> + <developer> + <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> + </developer> + <developer> + <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> + </developer> + <developer> + <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> + </developer> + <developer> + <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> + </developer> + <developer> + <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> + </developer> + </developers> + + <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> +
</project>
--- projects/lcsim/trunk/pom.xml 2014-02-10 21:48:59 UTC (rev 2965) +++ projects/lcsim/trunk/pom.xml 2014-02-10 22:55:39 UTC (rev 2966) @@ -18,7 +18,6 @@
<developerConnection>scm:svn:svn://svn.freehep.org/lcdet/projects/lcsim/trunk/</developerConnection>
</scm>
<modules>
- <module>site-parent</module>
<module>parent</module>
<module>util</module>
<module>math</module>
--- projects/lcsim/trunk/site/pom.xml 2014-02-10 21:48:59 UTC (rev 2965) +++ projects/lcsim/trunk/site/pom.xml 2014-02-10 22:55:39 UTC (rev 2966) @@ -17,9 +17,9 @@
<parent>
<groupId>org.lcsim</groupId>
- <artifactId>lcsim-site-parent</artifactId>
+ <artifactId>lcsim-parent</artifactId>
<version>3.0.3-SNAPSHOT</version>
- <relativePath>../site-parent/pom.xml</relativePath>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<properties>
@@ -27,8 +27,7 @@
</properties>
<modules>
- <!-- Selection of modules for the website. The modules detector-data, - distribution, and parent are not included. -->
+ <!-- Selection of modules for the website. The modules detector-data, distribution, and parent are not included. -->
<module>../aida</module>
<module>../analysis</module>
<module>../cal-calib</module>
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