Do not use a property to define the modules and parent version.

CampagneLaboratory · Sep 30, 2016 · 62d3bc4 · 62d3bc4
1 parent 29c6d06
commit 62d3bc4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 19 deletions.
diff --git a/model-training/model-training.iml b/model-training/model-training.iml
@@ -38,8 +38,6 @@
     <orderEntry type="library" name="Maven: org.nd4j:nd4j-api:0.5.0" level="project" />
     <orderEntry type="library" name="Maven: org.nd4j:nd4j-buffer:0.5.0" level="project" />
     <orderEntry type="library" name="Maven: org.nd4j:nd4j-common:0.5.0" level="project" />
-    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.10" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.nd4j:nd4j-context:0.5.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.3.1" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.5.1" level="project" />
@@ -172,7 +170,6 @@
     <orderEntry type="library" name="Maven: org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b09" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish.hk2.external:javax.inject:2.4.0-b09" level="project" />
     <orderEntry type="library" name="Maven: org.glassfish.hk2:hk2-locator:2.4.0-b09" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.18.1-GA" level="project" />
     <orderEntry type="library" name="Maven: io.dropwizard.metrics:metrics-httpclient:3.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.3.2" level="project" />
@@ -199,5 +196,25 @@
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:20040616" level="project" />
     <orderEntry type="library" name="Maven: com.beust:jcommander:1.48" level="project" />
+    <orderEntry type="library" name="Maven: org.campagnelab.goby:goby-io:3.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.campagnelab.icb:icb-utils:2.0.0" level="project" />
+    <orderEntry type="library" name="Maven: com.ibm.icu:icu4j:3.4.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.3" level="project" />
+    <orderEntry type="library" name="Maven: colt:colt:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: concurrent:concurrent:1.3.4" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
+    <orderEntry type="library" name="Maven: com.github.samtools:htsjdk:2.2.4" level="project" />
+    <orderEntry type="library" name="Maven: gov.nih.nlm.ncbi:ngs-java:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-jexl:2.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.0.3-rc3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.ant:ant:1.8.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.8.2" level="project" />
+    <orderEntry type="library" name="Maven: org.testng:testng:6.8.8" level="project" />
+    <orderEntry type="library" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-math:2.2" level="project" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.10" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.19.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.lucarosellini.rJava:JRI:0.9-7" level="project" />
   </component>
 </module>
diff --git a/model-training/pom.xml b/model-training/pom.xml
@@ -4,10 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-
         <groupId>org.campagnelab.dl</groupId>
         <artifactId>variation-analysis</artifactId>
-        <version>${varanalysis.version}</version>
+        <version>1.0.2</version>
     </parent>
 
     <artifactId>model-training</artifactId>
@@ -209,7 +208,7 @@
         <dependency>
             <groupId>org.campagnelab.dl</groupId>
             <artifactId>model-utils</artifactId>
-            <version>${varanalysis.version}</version>
+            <version>1.0.2</version>
         </dependency>
         <dependency>
             <groupId>it.unimi.dsi</groupId>

diff --git a/model-utils/pom.xml b/model-utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.campagnelab.dl</groupId>
         <artifactId>variation-analysis</artifactId>
-        <version>${varanalysis.version}</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -3,23 +3,17 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <!--parent>
-        <groupId>org.campagnelab.build-utils</groupId>
-        <artifactId>maven-parent</artifactId>
-        <version>1.0.6</version>
-    </parent-->
     <groupId>org.campagnelab.dl</groupId>
     <artifactId>variation-analysis</artifactId>
+    <version>1.0.2</version>
     <packaging>pom</packaging>
-    <version>${varanalysis.version}</version>
     <modules>
         <module>model-utils</module>
         <module>model-training</module>
     </modules>
     <name>Variation Analysis</name>
     <description>A project to train neural networks to recognize mutations in RNA-seq data.</description>
     <properties>
-        <varanalysis.version>1.0.2</varanalysis.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <!-- DL4J properties: -->
 
@@ -148,10 +142,7 @@
             <url>http://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
     </distributionManagement>
-    <dependencyManagement>
-        <dependencies>
-        </dependencies>
-    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.campagnelab.goby</groupId>
@@ -160,5 +151,4 @@
         </dependency>
     </dependencies>
 
-
 </project>