 |
 |
| Commit in lcsim on MAIN | |||
| pom.xml | +46 | -29 | 1.243 -> 1.244 |
| resources/PLUGIN-inf/plugins.xml | +10 | -12 | 1.6 -> 1.7 |
| +56 | -41 | ||
Update for use with Jas 3.0.0 with local install.
diff -u -r1.243 -r1.244 --- pom.xml 21 May 2013 22:52:35 -0000 1.243 +++ pom.xml 30 May 2013 01:38:05 -0000 1.244 @@ -99,6 +99,7 @@
<filtering>true</filtering>
<includes>
<include>**/*.properties</include>
+ <include>**/plugins.xml</include>
</includes>
</resource>
<resource>
@@ -116,35 +117,51 @@
<plugin>
<groupId>org.freehep</groupId>
<artifactId>freehep-jas-plugin</artifactId>
- <version>2.0.1</version> -<!-- <version>3.0.4-SNAPSHOT</version> -->
+<!-- <version>2.0.1</version>--> + <version>3.1.4</version> + <configuration> + <excludes> + <exclude>org.freehep:jas-core</exclude> + <exclude>junit:junit</exclude> + <exclude>org.freehep:freehep-application</exclude> + <exclude>org.netbeans:openide-lookup</exclude> + <exclude>jdom:jdom</exclude> + <exclude>javax.help:javahelp</exclude> + </excludes> + </configuration>
<executions>
<execution>
<goals>
<goal>install</goal>
</goals>
+<!-- <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>--> + </execution> + <execution> + <id>process-descriptor</id> + <goals> + <goal>process-descriptor</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>
@@ -274,7 +291,7 @@
<dependency>
<groupId>org.freehep</groupId>
<artifactId>jas-core</artifactId>
- <version>0.9.9</version>
+ <version>3.0.2</version>
<exclusions>
<exclusion>
<groupId>javax.help</groupId>
@@ -285,12 +302,12 @@
<dependency>
<groupId>org.freehep</groupId>
<artifactId>freehep-record</artifactId>
- <version>3.0.7</version>
+ <version>3.0.8</version>
</dependency>
<dependency>
<groupId>org.freehep</groupId>
<artifactId>freehep-jaida</artifactId>
- <version>3.4.5</version>
+ <version>3.4.6</version>
<exclusions>
<exclusion>
<groupId>javax.help</groupId>
@@ -305,7 +322,7 @@
<dependency>
<groupId>org.freehep</groupId>
<artifactId>freehep-jaida-jminuit</artifactId>
- <version>3.3.0-12</version>
+ <version>3.4.6</version>
</dependency>
<dependency>
<groupId>net.java.dev</groupId>
@@ -315,13 +332,13 @@
<dependency>
<groupId>org.freehep</groupId>
<artifactId>jas-plotter</artifactId>
- <version>2.2.7</version> - <exclusions>
+ <version>2.2.9</version> +<!-- <exclusions>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</exclusion>
- </exclusions>
+ </exclusions>-->
</dependency>
<dependency>
<groupId>org.freehep</groupId>
diff -u -r1.6 -r1.7 --- plugins.xml 28 Mar 2011 22:36:30 -0000 1.6 +++ plugins.xml 30 May 2013 01:38:05 -0000 1.7 @@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugins SYSTEM "http://java.freehep.org/schemas/plugin/1.0/plugin.dtd">
+<!DOCTYPE plugins SYSTEM "http://java.freehep.org/schemas/plugin/1.1/plugin.dtd">
<plugins>
<plugin>
@@ -8,23 +8,21 @@
<name>org.lcsim</name>
<category>hep.linearcollider</category>
<author>LCSim Team</author>
- <version>1.5</version>
+ <version>${project.version}</version>
<description kind="short">org.lcsim plugin for JAS3</description>
<description>org.lcsim plugin for JAS3</description>
<load-at-start/>
</information>
<resources>
<j2se minVersion="1.5"/>
- <file href="http://jas.freehep.org/jas3/plugins/lcsim/1.5/lcsim.jar" location="lcsim.jar"/> - <file href="http://jas.freehep.org/jas3/plugins/lcsim/1.5/GeomConverter.jar" location="GeomConverter.jar"/> - <file href="http://jas.freehep.org/jas3/plugins/lcsim/1.5/lcsim-conditions.jar" location="lcsim-conditions.jar"/> - <file href="http://jas.freehep.org/jas3/plugins/lcsim/1.5/lcsim-math.jar" location="lcsim-math.jar"/> - <file href="http://jas.freehep.org/jas3/plugins/lcsim/1.5/spacegeom.jar" location="spacegeom.jar"/> - <file href="http://jas.freehep.org/jas3/plugins/lcsim/1.5/trf.jar" location="trf.jar"/> - <file href="http://jas.freehep.org/jas3/plugins/lcsim/1.5/freehep-physics.jar" location="freehep-physics.jar"/> - <file href="http://jas.freehep.org/jas3/plugins/lcsim/1.5/freehep-sio.jar" location="freehep-sio.jar"/> - <file href="http://jas.freehep.org/jas3/plugins/lcsim/1.5/commons-math.jar" location="commons-math.jar"/> - <file href="http://jas.freehep.org/jas3/plugins/lcsim/1.5/xercesImpl.jar" location="xercesImpl.jar"/>
+ <application minVersion="3.0.0"/> + <depends plugin="JAS 3 AIDA Plugin" minVersion="3.3.5" /> + <depends plugin="JAS 3 Compiler plugin" minVersion="1.2.4" /> + <depends plugin="JAS 3 Graphics IO" minVersion="1.2.3" /> + <depends plugin="JAS 3 JMinuit Fitter" minVersion="1.0.3" /> + <depends plugin="JAS 3 Record Loop" minVersion="2.1.1" /> + <depends plugin="JAS 3 Root Plugin" minVersion="4.6.3" /> + <depends plugin="JAS 3 Simple Editor" minVersion="1.2.4" />
</resources>
<plugin-desc class="org.lcsim.plugin.LCSimPlugin"/>
</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