Commit in lcsim-contrib on MAIN
pom.xml+6-791.46 -> 1.47
use lcsim-parent as parent pom; remove duplicate configuration; update lcsim dependency version

lcsim-contrib
pom.xml 1.46 -> 1.47
diff -u -r1.46 -r1.47
--- pom.xml	12 Mar 2013 23:31:19 -0000	1.46
+++ pom.xml	16 Apr 2013 19:45:08 -0000	1.47
@@ -5,13 +5,11 @@
     <name>LCSim Contrib Packages</name>
     <version>2.0-SNAPSHOT</version>
     <description>User contributions and examples for the org.lcsim project.</description>
-<!--
-    <scm>
-        <connection>scm:cvs:pserver:[log in to unmask]:/cvs/lcd:lcsim-contrib</connection>
-        <developerConnection>scm:cvs:pserver:[log in to unmask]:/cvs/lcd:lcsim-contrib</developerConnection>
-        <url>http://source.freehep.org/jcvsweb/ilc/LCSIM/list/lcsim-contrib</url>
-    </scm>            
--->
+    <parent>
+        <groupId>org.lcsim</groupId>
+        <artifactId>lcsim-parent</artifactId>
+        <version>2.8-SNAPSHOT</version>
+    </parent> 
     <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>
@@ -23,66 +21,11 @@
             <name>lcsim-contrib</name>
             <url>scp://svn.slac.stanford.edu///nfs/slac/g/lcd/mc/prj/www/lcsim/software/lcsim-contrib/${project.version}</url>
         </site>
-        <repository>
-            <id>lcsim-maven-slac-linux</id>
-            <name>org.lcsim Maven Repository</name>
-            <url>scpexe://svn.slac.stanford.edu///nfs/slac/g/lcd/mc/prj/www/lcsim/maven2/</url>
-        </repository>
     </distributionManagement>
-    <repositories>
-        <repository>
-            <id>lcsim-maven</id>
-            <name>org.lcsim Maven Repository</name>
-            <url>http://lcsim.org/maven2</url>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>always</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>freehep-maven</id>
-            <name>FreeHEP Maven 2 Repository</name>
-            <url>http://java.freehep.org/maven2</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>freehep-maven</id>
-            <name>Freehep Plugin Repository</name>
-            <url>http://java.freehep.org/maven2</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </pluginRepository>
-    </pluginRepositories>
     <build>        
         <defaultGoal>install</defaultGoal>
         <plugins>            
             <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <argLine>-Xmx1024m</argLine>
-                    <forkMode>pertest</forkMode>
-                    <excludes>
-                        <!-- Fix for http://jira.codehaus.org/browse/SUREFIRE-288 -->
-                        <exclude>**/*$*</exclude>
-                    </excludes>	 
-                </configuration>
-            </plugin>
-            <!-- For this to work, the lcsim jar must be installed first to get all the dependencies. -->
-            <plugin>
                 <groupId>org.freehep</groupId>
                 <artifactId>freehep-jas-plugin</artifactId>
                 <version>2.0.1</version>
@@ -102,27 +45,11 @@
             </plugin>
         </plugins>
     </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.5</version>
-                <configuration>
-                    <source>1.5</source>
-                    <links>
-                        <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-                        <link>http://java.freehep.org/freehep-physics/apidocs/</link>
-                    </links>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
     <dependencies>
         <dependency>
             <groupId>org.lcsim</groupId>
             <artifactId>lcsim</artifactId>
-            <version>2.6-SNAPSHOT</version>
+            <version>2.8-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
CVSspam 0.2.12


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