change groupId to org.janelia.render for all maven pom files and set …

…version to 2.0.0-SNAPSHOT
djkapner · Jun 13, 2017 · 7317b3b · 7317b3b
1 parent ce40772
commit 7317b3b
Show file tree

Hide file tree

Showing 7 changed files with 128 additions and 41 deletions.
diff --git a/docs/pom.xml b/docs/pom.xml
@@ -2,16 +2,37 @@
 <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/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <artifactId>render</artifactId>
-        <groupId>org.janelia</groupId>
-        <version>0.4.0-SNAPSHOT</version>
+        <artifactId>modules-root</artifactId>
+        <groupId>org.janelia.render</groupId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <name>Render Documents</name>
     <artifactId>docs</artifactId>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
     <dependencies>
 
         <dependency>

diff --git a/pom.xml b/pom.xml
@@ -1,11 +1,12 @@
 <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>
 
-  <name>Janelia Rendering Utilities</name>
-  <groupId>org.janelia</groupId>
-  <artifactId>render</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
+    <modelVersion>4.0.0</modelVersion>
+
+    <name>Janelia Rendering Utilities</name>
+    <groupId>org.janelia.render</groupId>
+    <artifactId>modules-root</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 
@@ -29,11 +30,11 @@
     <dependencyManagement>
         <dependencies>
 
-        <dependency>
-            <groupId>org.janelia</groupId>
-            <artifactId>render-app</artifactId>
-            <version>0.4.0-SNAPSHOT</version>
-        </dependency>
+            <dependency>
+                <groupId>org.janelia</groupId>
+                <artifactId>render-app</artifactId>
+                <version>0.4.0-SNAPSHOT</version>
+            </dependency>
 
             <dependency>
                 <groupId>net.imagej</groupId>
@@ -66,9 +67,9 @@
             </dependency>
 
             <dependency>
-            	<groupId>sc.fiji</groupId>
-            	<artifactId>mpicbg-trakem2</artifactId>
-            	<version>1.2.2</version>
+                <groupId>sc.fiji</groupId>
+                <artifactId>mpicbg-trakem2</artifactId>
+                <version>1.2.2</version>
             </dependency>
         </dependencies>
 
@@ -94,6 +95,7 @@
     <properties>
         <jackson-version>2.4.4</jackson-version>
         <logback-version>1.1.2</logback-version>
+        <render-version>2.0.0-SNAPSHOT</render-version>
         <swagger-version>1.5.12</swagger-version>
     </properties>
 

diff --git a/render-app/pom.xml b/render-app/pom.xml
@@ -1,11 +1,12 @@
 <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/xsd/maven-4.0.0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.janelia</groupId>
-        <artifactId>render</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
+        <groupId>org.janelia.render</groupId>
+        <artifactId>modules-root</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <name>Render Application</name>
@@ -39,6 +40,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>

diff --git a/render-ws-java-client/pom.xml b/render-ws-java-client/pom.xml
@@ -1,11 +1,12 @@
 <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/xsd/maven-4.0.0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.janelia</groupId>
-        <artifactId>render</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
+        <artifactId>modules-root</artifactId>
+        <groupId>org.janelia.render</groupId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <name>Render Web Service Java Client</name>
@@ -86,16 +87,28 @@
                 </executions>
 
             </plugin>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
     <dependencies>
 
         <dependency>
-            <groupId>org.janelia</groupId>
+            <groupId>org.janelia.render</groupId>
             <artifactId>render-app</artifactId>
-            <version>0.4.0-SNAPSHOT</version>
+            <version>${render-version}</version>
         </dependency>
 
         <dependency>

diff --git a/render-ws-spark-client/pom.xml b/render-ws-spark-client/pom.xml
@@ -2,12 +2,14 @@
 <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/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <artifactId>render</artifactId>
-        <groupId>org.janelia</groupId>
-        <version>0.4.0-SNAPSHOT</version>
+        <artifactId>modules-root</artifactId>
+        <groupId>org.janelia.render</groupId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <name>Render Web Service Spark Client</name>
     <artifactId>render-ws-spark-client</artifactId>
@@ -66,16 +68,28 @@
                 </executions>
 
             </plugin>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
     <dependencies>
 
         <dependency>
-            <groupId>org.janelia</groupId>
+            <groupId>org.janelia.render</groupId>
             <artifactId>render-ws-java-client</artifactId>
-            <version>0.4.0-SNAPSHOT</version>
+            <version>${render-version}</version>
         </dependency>
 
         <dependency>

diff --git a/render-ws/pom.xml b/render-ws/pom.xml
@@ -1,11 +1,12 @@
 <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/xsd/maven-4.0.0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.janelia</groupId>
-        <artifactId>render</artifactId>
-        <version>0.4.0-SNAPSHOT</version>
+        <artifactId>modules-root</artifactId>
+        <groupId>org.janelia.render</groupId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <name>Render Web Service</name>
@@ -19,17 +20,32 @@
                 <version>2.6</version>
                 <configuration>
                     <packagingExcludes>WEB-INF/lib/log4j*.jar</packagingExcludes>
+                    <attachClasses>true</attachClasses>
+                    <classesClassifier>classes</classesClassifier>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
     <dependencies>
 
         <dependency>
-            <groupId>org.janelia</groupId>
+            <groupId>org.janelia.render</groupId>
             <artifactId>render-app</artifactId>
-            <version>0.4.0-SNAPSHOT</version>
+            <version>${render-version}</version>
         </dependency>
 
         <dependency>

diff --git a/trakem2-scripts/pom.xml b/trakem2-scripts/pom.xml
@@ -5,14 +5,33 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <artifactId>render</artifactId>
-        <groupId>org.janelia</groupId>
-        <version>0.4.0-SNAPSHOT</version>
+        <artifactId>modules-root</artifactId>
+        <groupId>org.janelia.render</groupId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <name>TrakEM2 Scripts</name>
     <artifactId>trakem2-scripts</artifactId>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
     <dependencies>
 
         <dependency>