Print

Print


Commit in java/trunk on MAIN
conditions/pom.xml+4-370 -> 71
detector-data/pom.xml+4-370 -> 71
distribution/pom.xml+4-370 -> 71
et/pom.xml+4-370 -> 71
hps-java/pom.xml+4-370 -> 71
jevio/pom.xml+4-370 -> 71
monitoring-app/pom.xml+4-370 -> 71
parent/pom.xml+238added 71
pom.xml-570 -> 71
users/pom.xml+4-370 -> 71
util/pom.xml+4-370 -> 71
+274-32
1 added + 10 modified, total 11 files
add hps parent pom; no longer using lcsim-parent

java/trunk/conditions
pom.xml 70 -> 71
--- java/trunk/conditions/pom.xml	2013-12-05 20:28:03 UTC (rev 70)
+++ java/trunk/conditions/pom.xml	2013-12-06 00:09:14 UTC (rev 71)
@@ -7,9 +7,10 @@
     <version>1.0-SNAPSHOT</version>
     <description>conditions framework</description>
     <parent>
-        <groupId>org.lcsim</groupId>
-        <artifactId>lcsim-parent</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <groupId>org.hps</groupId>
+        <artifactId>hps-parent</artifactId>
+        <relativePath>../parent/pom.xml</relativePath>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <scm>
         <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/conditions</connection>

java/trunk/detector-data
pom.xml 70 -> 71
--- java/trunk/detector-data/pom.xml	2013-12-05 20:28:03 UTC (rev 70)
+++ java/trunk/detector-data/pom.xml	2013-12-06 00:09:14 UTC (rev 71)
@@ -7,9 +7,10 @@
     <version>3.0-SNAPSHOT</version>
     <description>detector conditions data including compact descriptions and associated text data</description>
     <parent>
-        <groupId>org.lcsim</groupId>
-        <artifactId>lcsim-parent</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <groupId>org.hps</groupId>
+        <artifactId>hps-parent</artifactId>
+        <relativePath>../parent/pom.xml</relativePath>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <scm>
         <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/detector-data</connection>

java/trunk/distribution
pom.xml 70 -> 71
--- java/trunk/distribution/pom.xml	2013-12-05 20:28:03 UTC (rev 70)
+++ java/trunk/distribution/pom.xml	2013-12-06 00:09:14 UTC (rev 71)
@@ -7,9 +7,10 @@
     <version>3.0-SNAPSHOT</version>
     <description>HPS runnable jar distribution and JAS plugin installation</description>
     <parent>
-        <groupId>org.lcsim</groupId>
-        <artifactId>lcsim-parent</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <groupId>org.hps</groupId>
+        <artifactId>hps-parent</artifactId>
+        <relativePath>../parent/pom.xml</relativePath>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <scm>
         <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/distribution</connection>

java/trunk/et
pom.xml 70 -> 71
--- java/trunk/et/pom.xml	2013-12-05 20:28:03 UTC (rev 70)
+++ java/trunk/et/pom.xml	2013-12-06 00:09:14 UTC (rev 71)
@@ -7,9 +7,10 @@
     <version>12.5-SNAPSHOT</version>
     <description>Event Transfer (ET) system implementation copied from JLab's et-12.0 release</description>
     <parent>
-        <groupId>org.lcsim</groupId>
-        <artifactId>lcsim-parent</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <groupId>org.hps</groupId>
+        <artifactId>hps-parent</artifactId>
+        <relativePath>../parent/pom.xml</relativePath>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <scm>
         <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/et</connection>

java/trunk/hps-java
pom.xml 70 -> 71
--- java/trunk/hps-java/pom.xml	2013-12-05 20:28:03 UTC (rev 70)
+++ java/trunk/hps-java/pom.xml	2013-12-06 00:09:14 UTC (rev 71)
@@ -7,9 +7,10 @@
     <version>3.0-SNAPSHOT</version>
     <description>HPS Java code that uses the LCSim infrastructure</description>
     <parent>
-        <groupId>org.lcsim</groupId>
-        <artifactId>lcsim-parent</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <groupId>org.hps</groupId>
+        <artifactId>hps-parent</artifactId>
+        <relativePath>../parent/pom.xml</relativePath>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <scm>
         <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/hps-java</connection>

java/trunk/jevio
pom.xml 70 -> 71
--- java/trunk/jevio/pom.xml	2013-12-05 20:28:03 UTC (rev 70)
+++ java/trunk/jevio/pom.xml	2013-12-06 00:09:14 UTC (rev 71)
@@ -7,9 +7,10 @@
     <version>4.6-SNAPSHOT</version>
     <description>Java version of EVIO event data model; imported from JLAB distribution</description>
     <parent>
-        <groupId>org.lcsim</groupId>
-        <artifactId>lcsim-parent</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <groupId>org.hps</groupId>
+        <artifactId>hps-parent</artifactId>
+        <relativePath>../parent/pom.xml</relativePath>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <scm>
         <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/jevio</connection>

java/trunk/monitoring-app
pom.xml 70 -> 71
--- java/trunk/monitoring-app/pom.xml	2013-12-05 20:28:03 UTC (rev 70)
+++ java/trunk/monitoring-app/pom.xml	2013-12-06 00:09:14 UTC (rev 71)
@@ -7,9 +7,10 @@
     <version>1.0-SNAPSHOT</version>
     <description>HPS online monitoring application</description>
     <parent>
-        <groupId>org.lcsim</groupId>
-        <artifactId>lcsim-parent</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <groupId>org.hps</groupId>
+        <artifactId>hps-parent</artifactId>
+        <relativePath>../parent/pom.xml</relativePath>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <scm>
         <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/monitoring-app</connection>

java/trunk/parent
pom.xml added at 71
--- java/trunk/parent/pom.xml	                        (rev 0)
+++ java/trunk/parent/pom.xml	2013-12-06 00:09:14 UTC (rev 71)
@@ -0,0 +1,238 @@
+<?xml version="1.0"?>
+<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">
+    <prerequisites>
+        <maven>3.0</maven>
+    </prerequisites>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.hps</groupId>
+    <artifactId>hps-parent</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>parent</name>
+    <url>http://www.lcsim.org/</url>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <cacheDir>${user.home}</cacheDir>
+        <deployUrl>scpexe://svn.slac.stanford.edu///nfs/slac/g/lcd/mc/prj/www/lcsim/maven2</deployUrl>
+        <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>
+    </properties>
+    <scm>
+        <url>${hpsUrl}/${project.name}</url>
+        <connection>${scmConnection}/${project.name}</connection>
+        <developerConnection>${scmConnection}/${project.name}</developerConnection>
+    </scm>
+    <distributionManagement>
+        <repository>
+            <id>lcsim-repo</id>
+            <name>org.lcsim Maven Repository</name>
+            <url>${deployUrl}</url>
+        </repository>
+        <snapshotRepository>
+            <id>lcsim-snapshot-repo</id>
+            <name>org.lcsim Maven Snapshot Repository</name>
+            <url>${deployUrl}</url>
+        </snapshotRepository>
+    </distributionManagement>
+    <repositories>
+        <repository>
+            <id>freehep-repo-releases</id>
+            <name>FreeHEP Maven 2 Release Repository</name>
+            <url>${freehepRepo}</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+        <repository>
+            <id>freehep-repo-snapshots</id>
+            <name>FreeHEP Maven 2 Snapshot Repository</name>
+            <url>${freehepRepo}</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+        <repository>
+            <id>lcsim-maven-repo</id>
+            <name>org.lcsim Maven Repository</name>
+            <url>http://lcsim.org/maven2</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+        <repository>
+            <id>maven-central-repo</id>
+            <name>Maven repository</name>
+            <url>http://repo1.maven.org/maven2/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>freehep-maven-plugin-repo</id>
+            <name>Freehep Plugin Repository</name>
+            <url>${freehepRepo}</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </pluginRepository>
+        <pluginRepository>
+            <id>lcsim-maven-repo</id>
+            <name>LCSim Plugin Repository</name>
+            <url>http://lcsim.org/maven2</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.2</version>
+        </dependency>
+    </dependencies>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9</version>
+                <configuration>
+                    <source>1.7</source>
+                    <show>private</show>
+                    <links>
+                        <link>http://docs.oracle.com/javase/7/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>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>2.14.1</version>
+            </plugin>
+        </plugins>
+    </reporting>
+    <build>
+        <defaultGoal>install</defaultGoal>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh-external</artifactId>
+                <version>2.4</version>
+            </extension>
+        </extensions>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-scm-plugin</artifactId>
+                <version>1.8.1</version>
+                <configuration>
+                    <connectionType>connection</connectionType>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <showWarnings>true</showWarnings>
+                    <showDeprecation>true</showDeprecation>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.14.1</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>
+                            <name>org.lcsim.cacheDir</name>
+                            <value>${cacheDir}</value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.4.2</version> 
+                <configuration> 
+                    <tagBase>svn+ssh://svn.slac.stanford.edu/nfs/slac/g/lcd/subversion/ilc_repository/projects/lcsim/tags</tagBase> 
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.2</version>
+                <configuration>
+                    <chmod>false</chmod>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.7</version>
+                <executions>
+                    <execution>
+                        <phase>generate-test-resources</phase>
+                        <configuration>
+                            <tasks>
+                                <!-- Create the directory for test output. -->
+                                <mkdir dir="${project.build.directory}/test-output"/>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.3.3</version>
+            </plugin>
+        </plugins>
+    </build>
+</project>

java/trunk
pom.xml 70 -> 71
--- java/trunk/pom.xml	2013-12-05 20:28:03 UTC (rev 70)
+++ java/trunk/pom.xml	2013-12-06 00:09:14 UTC (rev 71)
@@ -6,11 +6,6 @@
     <packaging>pom</packaging>
     <name>modules</name>
     <description>HPS module build</description>
-    <parent>
-        <groupId>org.lcsim</groupId>
-        <artifactId>lcsim-parent</artifactId>
-        <version>3.0-SNAPSHOT</version>
-    </parent>
     <modules>
         <module>util</module>
         <module>jevio</module>

java/trunk/users
pom.xml 70 -> 71
--- java/trunk/users/pom.xml	2013-12-05 20:28:03 UTC (rev 70)
+++ java/trunk/users/pom.xml	2013-12-06 00:09:14 UTC (rev 71)
@@ -7,9 +7,10 @@
     <version>1.0-SNAPSHOT</version>
     <description>HPS user code packages</description>
     <parent>
-        <groupId>org.lcsim</groupId>
-        <artifactId>lcsim-parent</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <groupId>org.hps</groupId>
+        <artifactId>hps-parent</artifactId>
+        <relativePath>../parent/pom.xml</relativePath>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <scm>
         <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/users</connection>

java/trunk/util
pom.xml 70 -> 71
--- java/trunk/util/pom.xml	2013-12-05 20:28:03 UTC (rev 70)
+++ java/trunk/util/pom.xml	2013-12-06 00:09:14 UTC (rev 71)
@@ -7,9 +7,10 @@
     <version>1.0-SNAPSHOT</version>
     <description>miscellaneous utility classes</description>
     <parent>
-        <groupId>org.lcsim</groupId>
-        <artifactId>lcsim-parent</artifactId>
-        <version>3.0-SNAPSHOT</version>
+        <groupId>org.hps</groupId>
+        <artifactId>hps-parent</artifactId>
+        <relativePath>../parent/pom.xml</relativePath>
+        <version>1.0-SNAPSHOT</version>
     </parent>
     <scm>
         <connection>scm:svn:svn://svn.freehep.org/hps/java/trunk/util</connection>
SVNspam 0.1