Print

Print


Commit in java/trunk on MAIN
conditions/pom.xml-1388 -> 389
distribution/pom.xml+1-9388 -> 389
monitoring-app/pom.xml+7-1388 -> 389
tracking/pom.xml-9388 -> 389
users/pom.xml-4388 -> 389
+8-24
5 modified files
Remove some unneeded inter-module dependencies.  Also make detector-data a full dependency of conditions and not just for tests.  Remove monitoring-app from distribution as it creates its own runnable jar which should be used instead.

java/trunk/conditions
pom.xml 388 -> 389
--- java/trunk/conditions/pom.xml	2014-03-26 08:22:13 UTC (rev 388)
+++ java/trunk/conditions/pom.xml	2014-03-26 23:04:40 UTC (rev 389)
@@ -47,7 +47,6 @@
         <dependency>
             <groupId>org.hps</groupId>
             <artifactId>hps-detector-data</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>

java/trunk/distribution
pom.xml 388 -> 389
--- java/trunk/distribution/pom.xml	2014-03-26 08:22:13 UTC (rev 388)
+++ java/trunk/distribution/pom.xml	2014-03-26 23:04:40 UTC (rev 389)
@@ -65,21 +65,13 @@
     </build>
 
     <dependencies>
-        <!-- This pulls in recon et al transitively. -->
+        <!-- This pulls in analysis et al transitively. -->
         <dependency>
             <groupId>org.hps</groupId>
-            <artifactId>hps-analysis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hps</groupId>
             <artifactId>hps-users</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hps</groupId>
-            <artifactId>hps-monitoring-app</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hps</groupId>
             <artifactId>hps-steering-files</artifactId>
         </dependency>
     </dependencies>

java/trunk/monitoring-app
pom.xml 388 -> 389
--- java/trunk/monitoring-app/pom.xml	2014-03-26 08:22:13 UTC (rev 388)
+++ java/trunk/monitoring-app/pom.xml	2014-03-26 23:04:40 UTC (rev 389)
@@ -90,8 +90,14 @@
         <dependency>
             <groupId>org.hps</groupId>
             <artifactId>hps-monitoring-drivers</artifactId>
-        </dependency>        
+        </dependency>       
+        <!-- Since monitoring app is not packaged with distribution,
+             include all the steering files in the bin jar. --> 
         <dependency>
+            <groupId>org.hps</groupId>
+            <artifactId>hps-steering-files</artifactId>
+        </dependency>
+        <dependency>
             <groupId>jfreechart-aida-experimental</groupId>
             <artifactId>jfreechart-aida-experimental</artifactId>
             <version>1.1</version>

java/trunk/tracking
pom.xml 388 -> 389
--- java/trunk/tracking/pom.xml	2014-03-26 08:22:13 UTC (rev 388)
+++ java/trunk/tracking/pom.xml	2014-03-26 23:04:40 UTC (rev 389)
@@ -45,15 +45,6 @@
         </dependency>
         <dependency>
             <groupId>org.hps</groupId>
-            <artifactId>hps-detector-data</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hps</groupId>
-            <artifactId>hps-util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hps</groupId>
             <artifactId>hps-ecal-readout-sim</artifactId>
         </dependency>
         <dependency>

java/trunk/users
pom.xml 388 -> 389
--- java/trunk/users/pom.xml	2014-03-26 08:22:13 UTC (rev 388)
+++ java/trunk/users/pom.xml	2014-03-26 23:04:40 UTC (rev 389)
@@ -23,10 +23,6 @@
             <groupId>org.hps</groupId>
             <artifactId>hps-analysis</artifactId>
         </dependency> 
-        <dependency>
-            <groupId>org.hps</groupId>
-            <artifactId>hps-detector-data</artifactId>
-        </dependency>
     </dependencies>
     
     <build>
SVNspam 0.1