Print

Print
Commit in java/trunk on MAIN
conditions/pom.xml+5-675 -> 76
detector-data/pom.xml+4-575 -> 76
distribution/pom.xml+7-1375 -> 76
et/pom.xml+4-475 -> 76
hps-java/pom.xml+7-775 -> 76
jevio/pom.xml+4-475 -> 76
monitoring-app/pom.xml+5-675 -> 76
parent/pom.xml+13-1575 -> 76
pom.xml+2-275 -> 76
users/pom.xml+5-675 -> 76
util/pom.xml+4-475 -> 76
+60-72
11 modified files
cleanup pom files to use variables defined in parent; update maven plugin versions to latest; remove project versions for some modules and use parent's version; define lcsimVersion variable for referencing lcsim releases
java/trunk/conditions
pom.xml 75 -> 76
--- java/trunk/conditions/pom.xml	2013-12-06 20:04:36 UTC (rev 75)
+++ java/trunk/conditions/pom.xml	2013-12-07 00:01:11 UTC (rev 76)
@@ -4,24 +4,23 @@

     <artifactId>hps-conditions</artifactId>
     <groupId>org.hps</groupId>
     <name>conditions</name>

-    <version>1.0-SNAPSHOT</version>

     <description>conditions framework</description>
     <parent>
         <groupId>org.hps</groupId>
         <artifactId>hps-parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>

-        <version>1.0-SNAPSHOT</version>

+        <version>3.0-SNAPSHOT</version>

     </parent>
     <scm>

-        <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/conditions</connection>
-        <developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/conditions</developerConnection>
-        <url>http://java.freehep.org/svn/repos/hps/list/java/trunk/conditions/</url>

+        <connection>${scmConnection}/${project.name}</connection>
+        <developerConnection>${scmConnection}/${project.name}</developerConnection>
+        <url>${hpsUrl}/conditions/</url>

     </scm>
     <dependencies>
         <dependency>
             <groupId>org.lcsim</groupId>
             <artifactId>lcsim-event-processing</artifactId>

-            <version>3.0-SNAPSHOT</version>

+            <version>${lcsimVersion}</version>

         </dependency>
         <dependency>
             <groupId>org.hps</groupId>
java/trunk/detector-data
pom.xml 75 -> 76
--- java/trunk/detector-data/pom.xml	2013-12-06 20:04:36 UTC (rev 75)
+++ java/trunk/detector-data/pom.xml	2013-12-07 00:01:11 UTC (rev 76)
@@ -4,18 +4,17 @@

     <groupId>org.hps</groupId>
     <artifactId>hps-detector-data</artifactId>
     <name>detector-data</name>

-    <version>3.0-SNAPSHOT</version>

     <description>detector conditions data including compact descriptions and associated text data</description>
     <parent>
         <groupId>org.hps</groupId>
         <artifactId>hps-parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>

-        <version>1.0-SNAPSHOT</version>

+        <version>3.0-SNAPSHOT</version>

     </parent>
     <scm>

-        <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/detector-data</connection>
-        <developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/detector-data</developerConnection>
-        <url>http://java.freehep.org/svn/repos/hps/list/java/trunk/detector-data</url>

+        <connection>${scmConnection}/${project.name}</connection>
+        <developerConnection>${scmConnection}/${project.name}</developerConnection>
+        <url>${hpsUrl}/${project.name}</url>

     </scm>
     <build>
         <resources>
java/trunk/distribution
pom.xml 75 -> 76
--- java/trunk/distribution/pom.xml	2013-12-06 20:04:36 UTC (rev 75)
+++ java/trunk/distribution/pom.xml	2013-12-07 00:01:11 UTC (rev 76)
@@ -4,7 +4,7 @@

     <groupId>org.hps</groupId>
     <artifactId>hps-distribution</artifactId>
     <name>distribution</name>

-    <version>3.0-SNAPSHOT</version>

+    <version>${hpsVersion}</version>

     <description>HPS runnable jar distribution and JAS plugin installation</description>
     <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>

@@ -13,12 +13,12 @@

         <groupId>org.hps</groupId>
         <artifactId>hps-parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>

-        <version>1.0-SNAPSHOT</version>

+        <version>3.0-SNAPSHOT</version>

     </parent>
     <scm>

-        <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/distribution</connection>
-        <developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/distribution</developerConnection>
-        <url>http://java.freehep.org/svn/repos/hps/list/java/trunk/distribution/</url>

+        <connection>${scmConnection}/${project.name}</connection>
+        <developerConnection>${scmConnection}/${project.name}</developerConnection>
+        <url>${hpsUrl}/${project.name}</url>

     </scm>
     <build>
         <plugins>

@@ -59,7 +59,6 @@

             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

-                <version>1.3.3</version>

                 <executions>
                     <execution>
                         <phase>package</phase>

@@ -100,18 +99,13 @@

         <dependency>
             <groupId>org.hps</groupId>
             <artifactId>hps-java</artifactId>

-            <version>3.0-SNAPSHOT</version>

+            <version>${hpsVersion}</version>

         </dependency>
         <dependency>
             <groupId>org.hps</groupId>
             <artifactId>hps-users</artifactId>

-            <version>1.0-SNAPSHOT</version> 

+            <version>${hpsVersion}</version> 

         </dependency>

-        <dependency>
-            <groupId>org.lcsim</groupId>
-            <artifactId>lcsim-distribution</artifactId>
-            <version>3.0-SNAPSHOT</version>
-        </dependency>

     </dependencies>
     <profiles>
         <profile>
java/trunk/et
pom.xml 75 -> 76
--- java/trunk/et/pom.xml	2013-12-06 20:04:36 UTC (rev 75)
+++ java/trunk/et/pom.xml	2013-12-07 00:01:11 UTC (rev 76)
@@ -10,12 +10,12 @@

         <groupId>org.hps</groupId>
         <artifactId>hps-parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>

-        <version>1.0-SNAPSHOT</version>

+        <version>3.0-SNAPSHOT</version>

     </parent>
     <scm>

-        <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/et</connection>
-        <developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/et</developerConnection>
-        <url>http://java.freehep.org/svn/repos/hps/list/java/trunk/et/</url>

+        <connection>${scmConnection}/${project.name}</connection>
+        <developerConnection>${scmConnection}/${project.name}</developerConnection>
+        <url>${hpsUrl}/${project.name}</url>

     </scm>
     <build>
         <plugins>
java/trunk/hps-java
pom.xml 75 -> 76
--- java/trunk/hps-java/pom.xml	2013-12-06 20:04:36 UTC (rev 75)
+++ java/trunk/hps-java/pom.xml	2013-12-07 00:01:11 UTC (rev 76)
@@ -10,12 +10,12 @@

         <groupId>org.hps</groupId>
         <artifactId>hps-parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>

-        <version>1.0-SNAPSHOT</version>

+        <version>3.0-SNAPSHOT</version>

     </parent>
     <scm>

-        <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/hps-java</connection>
-        <developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/hps-java</developerConnection>
-        <url>http://java.freehep.org/svn/repos/hps/list/java/trunk/hps-java/</url>

+        <connection>${scmConnection}/${project.name}</connection>
+        <developerConnection>${scmConnection}/${project.name}</developerConnection>
+        <url>${hpsUrl}/${project.name}</url>

     </scm>
     <distributionManagement>
         <site>

@@ -247,17 +247,17 @@

         <dependency>
             <groupId>org.lcsim</groupId>
             <artifactId>lcsim-distribution</artifactId>

-            <version>3.0-SNAPSHOT</version>

+            <version>${lcsimVersion}</version>

         </dependency>
         <dependency>
             <groupId>org.hps</groupId>
             <artifactId>hps-conditions</artifactId>

-            <version>1.0-SNAPSHOT</version>

+            <version>${hpsVersion}</version>

         </dependency>
         <dependency>
             <groupId>org.hps</groupId>
             <artifactId>hps-detector-data</artifactId>

-            <version>3.0-SNAPSHOT</version>

+            <version>${hpsVersion}</version>

         </dependency>
         <dependency>
             <groupId>org.hps</groupId>
java/trunk/jevio
pom.xml 75 -> 76
--- java/trunk/jevio/pom.xml	2013-12-06 20:04:36 UTC (rev 75)
+++ java/trunk/jevio/pom.xml	2013-12-07 00:01:11 UTC (rev 76)
@@ -10,12 +10,12 @@

         <groupId>org.hps</groupId>
         <artifactId>hps-parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>

-        <version>1.0-SNAPSHOT</version>

+        <version>3.0-SNAPSHOT</version>

     </parent>
     <scm>

-        <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/jevio</connection>
-        <developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/jevio</developerConnection>
-        <url>http://java.freehep.org/svn/repos/hps/list/java/trunk/jevio/</url>

+        <connection>${scmConnection}/${project.name}</connection>
+        <developerConnection>${scmConnection}/${project.name}</developerConnection>
+        <url>${hpsUrl}/${project.name}</url>

     </scm>
     <build>
         <plugins>
java/trunk/monitoring-app
pom.xml 75 -> 76
--- java/trunk/monitoring-app/pom.xml	2013-12-06 20:04:36 UTC (rev 75)
+++ java/trunk/monitoring-app/pom.xml	2013-12-07 00:01:11 UTC (rev 76)
@@ -10,19 +10,18 @@

         <groupId>org.hps</groupId>
         <artifactId>hps-parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>

-        <version>1.0-SNAPSHOT</version>

+        <version>3.0-SNAPSHOT</version>

     </parent>
     <scm>

-        <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/monitoring-app</connection>
-        <developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/monitoring-app</developerConnection>
-        <url>http://java.freehep.org/svn/repos/hps/list/java/trunk/monitoring-app/</url>

+        <connection>${scmConnection}/${project.name}</connection>
+        <developerConnection>${scmConnection}/${project.name}</developerConnection>
+        <url>${hpsUrl}/${project.name}</url>

     </scm>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

-                <version>1.3.3</version>

                 <executions>
                     <execution>
                         <phase>package</phase>

@@ -86,7 +85,7 @@

         <dependency>
             <groupId>org.hps</groupId>
             <artifactId>hps-java</artifactId>

-            <version>3.0-SNAPSHOT</version>

+            <version>${hpsVersion}</version>

         </dependency>
         <dependency>
             <groupId>jfreechart-aida-experimental</groupId>
java/trunk/parent
pom.xml 75 -> 76
--- java/trunk/parent/pom.xml	2013-12-06 20:04:36 UTC (rev 75)
+++ java/trunk/parent/pom.xml	2013-12-07 00:01:11 UTC (rev 76)
@@ -7,9 +7,8 @@

     <groupId>org.hps</groupId>
     <artifactId>hps-parent</artifactId>
     <packaging>pom</packaging>

-    <version>1.0-SNAPSHOT</version>

+    <version>3.0-SNAPSHOT</version>

     <name>parent</name>

-    <url>http://www.lcsim.org/</url>

     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <org.lcsim.cacheDir>${user.home}</org.lcsim.cacheDir>

@@ -17,6 +16,9 @@

         <scmConnection>scm:svn:svn://svn.freehep.org/lcdet/projects/lcsim/trunk</scmConnection>
         <freehepRepo>http://srs.slac.stanford.edu/nexus/content/groups/freehep-maven2-public/</freehepRepo>
         <hpsUrl>http://java.freehep.org/svn/repos/hps/list/java/trunk/</hpsUrl>

+        <lcsimVersion>3.0-SNAPSHOT</lcsimVersion>
+        <hpsVersion>3.0-SNAPSHOT</hpsVersion>
+        <lcsimRepo>http://www.lcsim.org/maven2</lcsimRepo>

     </properties>
     <scm>
         <url>${hpsUrl}/${project.name}</url>

@@ -63,7 +65,7 @@

         <repository>
             <id>lcsim-maven-repo</id>
             <name>org.lcsim Maven Repository</name>

-            <url>http://lcsim.org/maven2</url>

+            <url>${lcsimRepo}</url>

             <snapshots>
                 <enabled>true</enabled>
                 <updatePolicy>always</updatePolicy>

@@ -100,7 +102,7 @@

         <pluginRepository>
             <id>lcsim-maven-repo</id>
             <name>LCSim Plugin Repository</name>

-            <url>http://lcsim.org/maven2</url>

+            <url>${lcsimRepo}</url>

             <layout>default</layout>
             <snapshots>
                 <enabled>true</enabled>

@@ -122,7 +124,7 @@

             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>

-                <version>2.9</version>

+                <version>2.9.1</version>

                 <configuration>
                     <source>1.7</source>
                     <show>private</show>

@@ -137,12 +139,12 @@

             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>

-                <version>2.6</version>

+                <version>2.7</version>

             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>

-                <version>2.14.1</version>

+                <version>2.16</version>

             </plugin>
         </plugins>
     </reporting>

@@ -152,7 +154,7 @@

             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-ssh-external</artifactId>

-                <version>2.4</version>

+                <version>2.5</version>

             </extension>
         </extensions>
         <plugins>

@@ -177,14 +179,10 @@

             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>

-                <version>2.14.1</version>

+                <version>2.16</version>

                 <configuration>
                     <argLine>-Xmx1024m</argLine>
                     <forkMode>pertest</forkMode>

-                    <excludes>
-                        <!-- Fix for http://jira.codehaus.org/browse/SUREFIRE-288 to ignore inner classes. -->
-                        <exclude>**/*$*</exclude>
-                    </excludes>

                     <!-- This allows the cacheDir to be overridden by settings.xml, e.g. for Hudson builds. -->
                     <systemProperties>
                         <property>

@@ -205,7 +203,7 @@

             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>

-                <version>3.2</version>

+                <version>3.3</version>

                 <configuration>
                     <chmod>false</chmod>
                 </configuration>

@@ -231,7 +229,7 @@

             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

-                <version>1.3.3</version>

+                <version>2.2</version>

             </plugin>
         </plugins>
     </build>
java/trunk
pom.xml 75 -> 76
--- java/trunk/pom.xml	2013-12-06 20:04:36 UTC (rev 75)
+++ java/trunk/pom.xml	2013-12-07 00:01:11 UTC (rev 76)
@@ -10,8 +10,8 @@

         <groupId>org.hps</groupId>
         <artifactId>hps-parent</artifactId>
         <relativePath>parent/pom.xml</relativePath>

-        <version>1.0-SNAPSHOT</version>
-    </parent>

+        <version>3.0-SNAPSHOT</version>
+    </parent>   

     <modules>
         <module>parent</module>
         <module>util</module>
java/trunk/users
pom.xml 75 -> 76
--- java/trunk/users/pom.xml	2013-12-06 20:04:36 UTC (rev 75)
+++ java/trunk/users/pom.xml	2013-12-07 00:01:11 UTC (rev 76)
@@ -4,24 +4,23 @@

     <artifactId>hps-users</artifactId>
     <groupId>org.hps</groupId>
     <name>users</name>

-    <version>1.0-SNAPSHOT</version>

     <description>HPS user code packages</description>
     <parent>
         <groupId>org.hps</groupId>
         <artifactId>hps-parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>

-        <version>1.0-SNAPSHOT</version>

+        <version>3.0-SNAPSHOT</version>

     </parent>
     <scm>

-        <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/users</connection>
-        <developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/users</developerConnection>
-        <url>http://java.freehep.org/svn/repos/hps/list/java/trunk/users/</url>

+        <connection>${scmConnection}/${project.name}</connection>
+        <developerConnection>${scmConnection}/${project.name}</developerConnection>
+        <url>${hpsUrl}/${project.name}</url>

     </scm>
     <dependencies>
         <dependency>
             <groupId>org.hps</groupId>
             <artifactId>hps-java</artifactId>

-            <version>3.0-SNAPSHOT</version>

+            <version>${hpsVersion}</version>

         </dependency>
     </dependencies>
 </project>
java/trunk/util
pom.xml 75 -> 76
--- java/trunk/util/pom.xml	2013-12-06 20:04:36 UTC (rev 75)
+++ java/trunk/util/pom.xml	2013-12-07 00:01:11 UTC (rev 76)
@@ -10,11 +10,11 @@

         <groupId>org.hps</groupId>
         <artifactId>hps-parent</artifactId>
         <relativePath>../parent/pom.xml</relativePath>

-        <version>1.0-SNAPSHOT</version>

+        <version>3.0-SNAPSHOT</version>

     </parent>
     <scm>

-        <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/util</connection>
-        <developerConnection>scm:svn:svn://svn.freehep.org/hps/java/trunk/util</developerConnection>
-        <url>http://java.freehep.org/svn/repos/hps/list/java/trunk/util/</url>

+        <connection>${scmConnection}/${project.name}</connection>
+        <developerConnection>${scmConnection}/${project.name}</developerConnection>
+        <url>${hpsUrl}/${project.name}</url>

     </scm>
 </project>
SVNspam 0.1