Commit in hps-java on MAIN
pom.xml+97-1041.37 -> 1.38
move hps-detectors dependency to current snapshot; reformat (please don't mess with the formatting on this file like adding tabs and such)

hps-java
pom.xml 1.37 -> 1.38
diff -u -r1.37 -r1.38
--- pom.xml	10 May 2012 20:44:09 -0000	1.37
+++ pom.xml	10 May 2012 21:03:41 -0000	1.38
@@ -1,109 +1,102 @@
+<?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.2-SNAPSHOT</version>
-	<description>Heavy Photon Search java code that uses lcsim infrastructure.</description>
-	<scm>
-		<connection>scm:cvs:pserver:[log in to unmask]:/cvs/lcd:hps-java</connection>
-		<developerConnection>scm:cvs:pserver:[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>
-			<!-- TODO: Put this long URL into a variable. -->
-			<url>scp://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>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>hps-java</artifactId>
+    <groupId>org.lcsim</groupId>
+    <name>Heavy Photon Search Java Project</name>
+    <version>1.2-SNAPSHOT</version>
+    <description>Heavy Photon Search java code that uses lcsim infrastructure.</description>
+    <scm>
+        <connection>scm:cvs:pserver:[log in to unmask]:/cvs/lcd:hps-java</connection>
+        <developerConnection>scm:cvs:pserver:[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>
             <!-- TODO: Put this long URL into a variable. -->
-			<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>
+            <url>scp://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>
+            <!-- TODO: Put this long URL into a variable. -->
+            <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.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>
+            <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.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>**/*$*</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>
-					</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>
+                    </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>
@@ -131,9 +124,9 @@
                     </execution>
                 </executions>
             </plugin>
-		</plugins>
-	</build>
-	<dependencies>
+        </plugins>
+    </build>
+    <dependencies>
         <dependency>
             <groupId>org.lcsim</groupId>
             <artifactId>lcsim</artifactId>
@@ -147,12 +140,12 @@
         <dependency>
             <groupId>org.lcsim</groupId>
             <artifactId>hps-detectors</artifactId>
-            <version>1.2</version>
+            <version>1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.freehep</groupId>
             <artifactId>freehep-jaida-remote</artifactId>
             <version>3.3.0-12</version>
         </dependency>
-	</dependencies>
+    </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