Print

Print


Commit in hps-java on MAIN
pom.xml+2-741.71 -> 1.72
use lcsim-parent as parent pom; remove duplicate configuration

hps-java
pom.xml 1.71 -> 1.72
diff -u -r1.71 -r1.72
--- pom.xml	16 Apr 2013 18:05:50 -0000	1.71
+++ pom.xml	16 Apr 2013 18:24:10 -0000	1.72
@@ -22,42 +22,7 @@
             <name>hps-java</name>
             <url>scpexe://svn.slac.stanford.edu///nfs/slac/g/lcd/mc/prj/www/lcsim/software/hps-java/${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>
     <contributors>
         <contributor>
             <name>Jeremy</name>
@@ -82,58 +47,19 @@
         <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:hps-java</anonymousConnection>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.13</version>
-            </plugin>
         </plugins>
     </reporting>
     <build>
-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ssh-external</artifactId>
-                <version>2.2</version>
-            </extension>
-        </extensions>
-        <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <showDeprecation>false</showDeprecation>
-                </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>
@@ -165,6 +91,7 @@
                     </includes>
                 </configuration>
             </plugin>
+<!--            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -193,6 +120,7 @@
                     </execution>
                 </executions>
             </plugin>
+-->            
         </plugins>
     </build>
     <dependencies>
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