Print

Print


Commit in hps-java on MAIN
pom.xml+217-2121.70 -> 1.71
reformat to 4 space indents

hps-java
pom.xml 1.70 -> 1.71
diff -u -r1.70 -r1.71
--- pom.xml	21 Feb 2013 21:55:36 -0000	1.70
+++ pom.xml	16 Apr 2013 18:05:50 -0000	1.71
@@ -1,215 +1,220 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>hps-java</artifactId>
-  <groupId>org.lcsim</groupId>
-  <name>Heavy Photon Search Java Project</name>
-  <version>1.6-SNAPSHOT</version>
-  <description>Heavy Photon Search Java code that uses the LCSim infrastructure.</description>
-  <scm>
-    <connection>scm:cvs:pserver:jeremy:[log in to unmask]:/cvs/lcd:hps-java</connection>
-    <developerConnection>scm:cvs:pserver:jeremy:[log in to unmask]:/cvs/lcd:hps-java</developerConnection>
-    <!--<url>http://source.freehep.org/jcvsweb/ilc/LCSIM/list/hps-java</url>-->
-  </scm>
-  <distributionManagement>
-    <site>
-      <id>hps-java</id>
-      <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>
-      <email>[log in to unmask]</email>
-      <url>http://www.slac.stanford.edu/~jeremym</url>
-      <organization>SLAC National Accelerator Laboratory</organization>
-      <organizationUrl>http://www.slac.stanford.edu/</organizationUrl>
-      <roles>
-        <role>developer</role>
-      </roles>
-      <timezone>-8</timezone>
-      <properties>
-        <aim>jeremyslac</aim>
-      </properties>
-    </contributor>
-  </contributors>
-  <issueManagement>
-    <system>Jira</system>
-    <url>https://jira.slac.stanford.edu/browse/HPSJAVA/</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: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>
-            <exclude>org/lcsim/hps/evio/DoEvioTest.java</exclude>
-            <exclude>org/lcsim/hps/et/BasicET12SystemTest.java</exclude>
-            <exclude>org/lcsim/hps/evio/RawTrackerHitToEvio4Converter_Test.java</exclude>
-            <exclude>org/lcsim/hps/recon/tracking/TestRunTrackReconTest.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <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>hps-java</jarName>
-          <includes>
-            <include>org.lcsim:hps-java</include>
-            <include>org.lcsim:hps-detectors</include>
-            <include>org.lcsim:jevio-base</include>
-            <include>org.lcsim:hps-et-java</include>
-          </includes>
-        </configuration>
-      </plugin>
-      <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>lcsim</artifactId>
-      <version>2.8-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.lcsim</groupId>
-      <artifactId>hps-et-java</artifactId>
-      <version>12.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.lcsim</groupId>
-      <artifactId>hps-detectors</artifactId>
-      <version>1.4-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.freehep</groupId>
-      <artifactId>freehep-jaida-remote</artifactId>
-      <version>3.3.0-12</version>
-    </dependency>
-  </dependencies>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>hps-java</artifactId>
+    <groupId>org.lcsim</groupId>
+    <name>Heavy Photon Search Java Project</name>
+    <version>1.6-SNAPSHOT</version>
+    <description>Heavy Photon Search Java code that uses the LCSim infrastructure.</description>
+    <parent>
+        <groupId>org.lcsim</groupId>
+        <artifactId>lcsim-parent</artifactId>
+        <version>2.8-SNAPSHOT</version>
+    </parent>
+    <scm>
+        <connection>scm:cvs:pserver:jeremy:[log in to unmask]:/cvs/lcd:hps-java</connection>
+        <developerConnection>scm:cvs:pserver:jeremy:[log in to unmask]:/cvs/lcd:hps-java</developerConnection>
+        <!--<url>http://source.freehep.org/jcvsweb/ilc/LCSIM/list/hps-java</url>-->
+    </scm>
+    <distributionManagement>
+        <site>
+            <id>hps-java</id>
+            <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>
+            <email>[log in to unmask]</email>
+            <url>http://www.slac.stanford.edu/~jeremym</url>
+            <organization>SLAC National Accelerator Laboratory</organization>
+            <organizationUrl>http://www.slac.stanford.edu/</organizationUrl>
+            <roles>
+                <role>developer</role>
+            </roles>
+            <timezone>-8</timezone>
+            <properties>
+                <aim>jeremyslac</aim>
+            </properties>
+        </contributor>
+    </contributors>
+    <issueManagement>
+        <system>Jira</system>
+        <url>https://jira.slac.stanford.edu/browse/HPSJAVA/</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: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>
+                        <exclude>org/lcsim/hps/evio/DoEvioTest.java</exclude>
+                        <exclude>org/lcsim/hps/et/BasicET12SystemTest.java</exclude>
+                        <exclude>org/lcsim/hps/evio/RawTrackerHitToEvio4Converter_Test.java</exclude>
+                        <exclude>org/lcsim/hps/recon/tracking/TestRunTrackReconTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <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>hps-java</jarName>
+                    <includes>
+                        <include>org.lcsim:hps-java</include>
+                        <include>org.lcsim:hps-detectors</include>
+                        <include>org.lcsim:jevio-base</include>
+                        <include>org.lcsim:hps-et-java</include>
+                    </includes>
+                </configuration>
+            </plugin>
+            <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>lcsim</artifactId>
+            <version>2.8-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.lcsim</groupId>
+            <artifactId>hps-et-java</artifactId>
+            <version>12.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.lcsim</groupId>
+            <artifactId>hps-detectors</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.freehep</groupId>
+            <artifactId>freehep-jaida-remote</artifactId>
+            <version>3.3.0-12</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