Commit in lcsim on MAIN | |||
pom.xml | +314 | -294 | 1.220 -> 1.221 |
starting to push dependencies from lcsim-parent back into lcsim; work in progress
diff -u -r1.220 -r1.221 --- pom.xml 16 Mar 2013 02:00:44 -0000 1.220 +++ pom.xml 15 Apr 2013 21:38:05 -0000 1.221 @@ -1,196 +1,196 @@
<?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</artifactId> - <name>org.lcsim</name> - <version>2.8-SNAPSHOT</version> - <description>A Java reconstruction and analysis framework for LCD studies.</description> -<!--
+ <modelVersion>4.0.0</modelVersion> + <artifactId>lcsim</artifactId> + <name>org.lcsim</name> + <version>2.8-SNAPSHOT</version> + <description>A Java reconstruction and analysis framework for LCD studies.</description> + <!--
<scm> <connection>scm:cvs:pserver:${lcd.cvs.username}:[log in to unmask]:/cvs/lcd:lcsim</connection> <developerConnection>scm:cvs:pserver:${lcd.cvs.username}:[log in to unmask]:/cvs/lcd:lcsim</developerConnection> <url>http://source.freehep.org/jcvsweb/ilc/LCSIM/list/lcsim</url> </scm> -->
- <scm> - <connection>scm:cvs:pserver:${lcd.cvs.username}:[log in to unmask]:/cvs/lcd:${project.artifactId}</connection> - <developerConnection>scm:cvs:pserver:${lcd.cvs.username}:[log in to unmask]:/cvs/lcd:${project.artifactId}</developerConnection> - <url>lcsimCvsRepo</url> - </scm> - <repositories> - <repository> - <id>lcsim-maven</id> - <name>org.lcsim Maven Repository</name> - <url>http://lcsim.org/maven2</url> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>lcsim-maven-plugin</id> - <name>org.lcsim Maven Plugin Repository</name> - <url>http://lcsim.org/maven2</url> - </pluginRepository> - </pluginRepositories> - <parent> - <groupId>org.lcsim</groupId> - <artifactId>lcsim-parent</artifactId> - <version>2.8-SNAPSHOT</version> - </parent> - <distributionManagement> - <snapshotRepository> - <id>lcsim-maven</id> - <name>org.lcsim Maven Repository</name> - <url>scpexe://svn.slac.stanford.edu///nfs/slac/g/lcd/mc/prj/www/lcsim/maven2/</url> - <uniqueVersion>false</uniqueVersion> - </snapshotRepository> - <site> - <id>org.lcsim</id> - <name>org.lcsim</name> - <url>scpexe://svn.slac.stanford.edu///nfs/slac/g/lcd/mc/prj/www/lcsim/software/${project.artifactId}/${project.version}</url> - </site> - </distributionManagement> - <properties> - <!-- Timestamp file for getting build time into output jar. --> - <lcsim.filterfile>${project.build.directory}/filter.properties</lcsim.filterfile> - </properties> - <issueManagement> - <system>Jira</system> - <url>https://jira.slac.stanford.edu/browse/LCSIM</url> - </issueManagement> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.9</version> - <configuration> - <source>1.6</source> - <show>private</show> - <links> - <link>http://java.sun.com/j2se/1.6.0/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> - </links> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.6</version> - <configuration> - <anonymousConnection>scm:cvs:pserver:[log in to unmask]:/cvs/lcd:lcsim</anonymousConnection> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.13</version> - </plugin> - </plugins> - </reporting> - <build> - <defaultGoal>install</defaultGoal> - <filters> - <filter>${lcsim.filterfile}</filter> - </filters> - <resources> - <resource> - <directory>resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.sh</include> - <include>**/*.csh</include> - <include>**/*.bat</include> - </includes> - </resource> - <resource> - <directory>resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.properties</exclude> - <exclude>**/*.sh</exclude> - <exclude>**/*.csh</exclude> - <exclude>**/*.bat</exclude> - </excludes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.freehep</groupId> - <artifactId>freehep-jas-plugin</artifactId> - <version>2.0.1</version> - <executions> - <execution> - <goals> - <goal>install</goal> - </goals> - </execution> - </executions> - <configuration> - <jarName>lcsim</jarName> - <includes> - <include>org.freehep:freehep-physics</include> - <include>org.freehep:freehep-sio</include> - <include>org.freehep:freehep-xdr</include> - <include>org.freehep:freehep-stdhep</include> - <include>org.freehep:freehep-mcfio</include> - <include>org.lcsim:GeomConverter</include> - <include>org.lcsim:lcsim-conditions</include> - <include>org.lcsim:lcsim-math</include> - <include>org.lcsim:spacegeom</include> - <include>org.lcsim:trf</include> - <include>xerces:xercesImpl</include> - <include>commons-math:commons-math</include> - <include>org.freehep:freehep-jaida</include> - <include>org.freehep:freehep-jaida-root</include> - <include>org.freehep:freehep-rootio-output</include> - </includes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <exclude>org/lcsim/NonTrivialPFASingleEventTest.java</exclude> - <exclude>**/TestCircle.java</exclude> - <exclude>**/TestSquare.java</exclude> - <exclude>org/lcsim/ReadoutTest.java</exclude> - <exclude>org/lcsim/recon/cluster/directedtree/DirectedTreeProdTest.java</exclude> - <exclude>org/lcsim/LCIOHeaderTest.java</exclude> - <exclude>org/lcsim/PFATest.java</exclude> - <exclude>org/lcsim/recon/cluster/directedtree/DirectedTreeCompareTest.java</exclude> - <exclude>org/lcsim/recon/cluster/nn/NearestNeighborClustererTest.java</exclude> - <exclude>org/lcsim/LCIOReadTest.java</exclude> - <exclude>org/lcsim/LCIOReconReadTest.java</exclude> - <exclude>org/lcsim/SidloiCalorimeterHitTest.java</exclude> - <exclude>org/lcsim/mc/fast/tracking/fix/FastMCTrackFactoryTest.java</exclude> - <exclude>org/lcsim/mc/fast/tracking/fix/HelixSwimmerTrackConsistencyTest.java</exclude> - <exclude>org/lcsim/DummyTrackStateRelationTest.java</exclude> - <exclude>org/lcsim/recon/tracking/digitization/sisim/config/DigiTest.java</exclude> - <exclude>org/lcsim/recon/tracking/seedtracker/SeedTrackerDigiTest.java</exclude> - <exclude>org/lcsim/event/base/CalorimeterHitImplTest.java</exclude> - <exclude>org/lcsim/util/lcio/CalorimeterHitIOTest.java</exclude> - <exclude>org/lcsim/recon/tracking/seedtracker/StandaloneDriverTest.java</exclude> - <exclude>org/lcsim/TrackingDetectorElementTest.java</exclude> - <!-- <exclude>org/lcsim/Sidloi3SimplePfaTest.java</exclude> --> - <exclude>org/lcsim/Sid02PfaTest.java</exclude> - <exclude>org/lcsim/recon/tracking/seedtracker/SeedTrackerVSTest.java</exclude> - <exclude>org/lcsim/CalHitStepPosTest.java</exclude> - <exclude>org/lcsim/TestFastMC.java</exclude> - <exclude>org/lcsim/TestFastMCGenerator.java</exclude> - </excludes> - </configuration> - </plugin> - <!--
+ <scm> + <connection>scm:cvs:pserver:${lcd.cvs.username}:[log in to unmask]:/cvs/lcd:${project.artifactId}</connection> + <developerConnection>scm:cvs:pserver:${lcd.cvs.username}:[log in to unmask]:/cvs/lcd:${project.artifactId}</developerConnection> + <url>lcsimCvsRepo</url> + </scm> + <repositories> + <repository> + <id>lcsim-maven</id> + <name>org.lcsim Maven Repository</name> + <url>http://lcsim.org/maven2</url> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>lcsim-maven-plugin</id> + <name>org.lcsim Maven Plugin Repository</name> + <url>http://lcsim.org/maven2</url> + </pluginRepository> + </pluginRepositories> + <parent> + <groupId>org.lcsim</groupId> + <artifactId>lcsim-parent</artifactId> + <version>2.8-SNAPSHOT</version> + </parent> + <distributionManagement> + <snapshotRepository> + <id>lcsim-maven</id> + <name>org.lcsim Maven Repository</name> + <url>scpexe://svn.slac.stanford.edu///nfs/slac/g/lcd/mc/prj/www/lcsim/maven2/</url> + <uniqueVersion>false</uniqueVersion> + </snapshotRepository> + <site> + <id>org.lcsim</id> + <name>org.lcsim</name> + <url>scpexe://svn.slac.stanford.edu///nfs/slac/g/lcd/mc/prj/www/lcsim/software/${project.artifactId}/${project.version}</url> + </site> + </distributionManagement> + <properties> + <!-- Timestamp file for getting build time into output jar. --> + <lcsim.filterfile>${project.build.directory}/filter.properties</lcsim.filterfile> + </properties> + <issueManagement> + <system>Jira</system> + <url>https://jira.slac.stanford.edu/browse/LCSIM</url> + </issueManagement> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.9</version> + <configuration> + <source>1.6</source> + <show>private</show> + <links> + <link>http://java.sun.com/j2se/1.6.0/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> + </links> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.6</version> + <configuration> + <anonymousConnection>scm:cvs:pserver:[log in to unmask]:/cvs/lcd:lcsim</anonymousConnection> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.13</version> + </plugin> + </plugins> + </reporting> + <build> + <defaultGoal>install</defaultGoal> + <filters> + <filter>${lcsim.filterfile}</filter> + </filters> + <resources> + <resource> + <directory>resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.sh</include> + <include>**/*.csh</include> + <include>**/*.bat</include> + </includes> + </resource> + <resource> + <directory>resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.properties</exclude> + <exclude>**/*.sh</exclude> + <exclude>**/*.csh</exclude> + <exclude>**/*.bat</exclude> + </excludes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.freehep</groupId> + <artifactId>freehep-jas-plugin</artifactId> + <version>2.0.1</version> + <executions> + <execution> + <goals> + <goal>install</goal> + </goals> + </execution> + </executions> + <configuration> + <jarName>lcsim</jarName> + <includes> + <include>org.freehep:freehep-physics</include> + <include>org.freehep:freehep-sio</include> + <include>org.freehep:freehep-xdr</include> + <include>org.freehep:freehep-stdhep</include> + <include>org.freehep:freehep-mcfio</include> + <include>org.lcsim:GeomConverter</include> + <include>org.lcsim:lcsim-conditions</include> + <include>org.lcsim:lcsim-math</include> + <include>org.lcsim:spacegeom</include> + <include>org.lcsim:trf</include> + <include>xerces:xercesImpl</include> + <include>commons-math:commons-math</include> + <include>org.freehep:freehep-jaida</include> + <include>org.freehep:freehep-jaida-root</include> + <include>org.freehep:freehep-rootio-output</include> + </includes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/lcsim/NonTrivialPFASingleEventTest.java</exclude> + <exclude>**/TestCircle.java</exclude> + <exclude>**/TestSquare.java</exclude> + <exclude>org/lcsim/ReadoutTest.java</exclude> + <exclude>org/lcsim/recon/cluster/directedtree/DirectedTreeProdTest.java</exclude> + <exclude>org/lcsim/LCIOHeaderTest.java</exclude> + <exclude>org/lcsim/PFATest.java</exclude> + <exclude>org/lcsim/recon/cluster/directedtree/DirectedTreeCompareTest.java</exclude> + <exclude>org/lcsim/recon/cluster/nn/NearestNeighborClustererTest.java</exclude> + <exclude>org/lcsim/LCIOReadTest.java</exclude> + <exclude>org/lcsim/LCIOReconReadTest.java</exclude> + <exclude>org/lcsim/SidloiCalorimeterHitTest.java</exclude> + <exclude>org/lcsim/mc/fast/tracking/fix/FastMCTrackFactoryTest.java</exclude> + <exclude>org/lcsim/mc/fast/tracking/fix/HelixSwimmerTrackConsistencyTest.java</exclude> + <exclude>org/lcsim/DummyTrackStateRelationTest.java</exclude> + <exclude>org/lcsim/recon/tracking/digitization/sisim/config/DigiTest.java</exclude> + <exclude>org/lcsim/recon/tracking/seedtracker/SeedTrackerDigiTest.java</exclude> + <exclude>org/lcsim/event/base/CalorimeterHitImplTest.java</exclude> + <exclude>org/lcsim/util/lcio/CalorimeterHitIOTest.java</exclude> + <exclude>org/lcsim/recon/tracking/seedtracker/StandaloneDriverTest.java</exclude> + <exclude>org/lcsim/TrackingDetectorElementTest.java</exclude> + <!-- <exclude>org/lcsim/Sidloi3SimplePfaTest.java</exclude> --> + <exclude>org/lcsim/Sid02PfaTest.java</exclude> + <exclude>org/lcsim/recon/tracking/seedtracker/SeedTrackerVSTest.java</exclude> + <exclude>org/lcsim/CalHitStepPosTest.java</exclude> + <exclude>org/lcsim/TestFastMC.java</exclude> + <exclude>org/lcsim/TestFastMCGenerator.java</exclude> + </excludes> + </configuration> + </plugin> + <!--
Old assembly target for reference. <plugin> <artifactId>maven-assembly-plugin</artifactId>
@@ -214,113 +214,133 @@
</executions> </plugin> -->
- <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>make-timestamp-filter</id> - <phase>generate-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <mkdir dir="${project.build.directory}"/> - <tstamp> - <format property="last.updated" pattern="yyyy-MM-dd kk:mm:ss z"/> - </tstamp> - <echo file="${lcsim.filterfile}" message="build.date=${last.updated}"/> - </tasks> - </configuration> - </execution> - <execution> - <id>make-test-output-dir</id> - <phase>test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <mkdir dir="${project.build.directory}/test-output"/> - </tasks> - </configuration> - </execution> - <execution> - <id>copy-scripts</id> - <phase>install</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <mkdir dir="${project.build.directory}/scripts"/> - <copy todir="${project.build.directory}/scripts"> - <fileset dir="${project.build.directory}/classes/scripts"> - <include name="**/*.csh"/> - <include name="**/*.sh"/> - <include name="**/*.bat"/> - </fileset> - </copy> - <chmod perm="755"> - <fileset dir="${project.build.directory}/scripts"> - <include name="**/*.csh"/> - <include name="**/*.sh"/> - <include name="**/*.bat"/> - </fileset> - </chmod> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - <!-- Use maven shade plugin to build standalone, runnable jar containing all dependencies. --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>1.3.3</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - <configuration> - <shadedArtifactAttached>true</shadedArtifactAttached> - <shadedClassifierName>bin</shadedClassifierName> - <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> - <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> - <mainClass>org.lcsim.job.JobControlManager</mainClass> - </transformer> - </transformers> - <artifactSet> - <excludes> - <exclude>hep.testdata.aida:*</exclude> - </excludes> - </artifactSet> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>GeomConverter</artifactId> - <version>2.6-SNAPSHOT</version> - </dependency> - <!-- FIXME: This dep is not actually used in lcsim. --> - <dependency> - <groupId>org.lcsim</groupId> - <artifactId>trf</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-jaida-root</artifactId> - <version>3.4.4-SNAPSHOT</version> - </dependency> - </dependencies>
+ <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>make-timestamp-filter</id> + <phase>generate-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <mkdir dir="${project.build.directory}"/> + <tstamp> + <format property="last.updated" pattern="yyyy-MM-dd kk:mm:ss z"/> + </tstamp> + <echo file="${lcsim.filterfile}" message="build.date=${last.updated}"/> + </tasks> + </configuration> + </execution> + <execution> + <id>make-test-output-dir</id> + <phase>test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <mkdir dir="${project.build.directory}/test-output"/> + </tasks> + </configuration> + </execution> + <execution> + <id>copy-scripts</id> + <phase>install</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <mkdir dir="${project.build.directory}/scripts"/> + <copy todir="${project.build.directory}/scripts"> + <fileset dir="${project.build.directory}/classes/scripts"> + <include name="**/*.csh"/> + <include name="**/*.sh"/> + <include name="**/*.bat"/> + </fileset> + </copy> + <chmod perm="755"> + <fileset dir="${project.build.directory}/scripts"> + <include name="**/*.csh"/> + <include name="**/*.sh"/> + <include name="**/*.bat"/> + </fileset> + </chmod> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <!-- Use maven shade plugin to build standalone, runnable jar containing all dependencies. --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>1.3.3</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <shadedArtifactAttached>true</shadedArtifactAttached> + <shadedClassifierName>bin</shadedClassifierName> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <mainClass>org.lcsim.job.JobControlManager</mainClass> + </transformer> + </transformers> + <artifactSet> + <excludes> + <exclude>hep.testdata.aida:*</exclude> + </excludes> + </artifactSet> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.freehep</groupId> + <artifactId>freehep-sio</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>org.freehep</groupId> + <artifactId>jas-core</artifactId> + <version>0.9.9</version> + </dependency> + <dependency> + <groupId>org.freehep</groupId> + <artifactId>freehep-record</artifactId> + <version>3.0.7</version> + </dependency> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>GeomConverter</artifactId> + <version>2.6-SNAPSHOT</version> + </dependency> + <!-- FIXME: This dep is not actually used in lcsim. --> + <dependency> + <groupId>org.lcsim</groupId> + <artifactId>trf</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>org.freehep</groupId> + <artifactId>freehep-jaida-root</artifactId> + <version>3.4.4-SNAPSHOT</version> + </dependency> + </dependencies>
</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