Clean up versions for release

dickschoeller · Aug 10, 2017 · df1ddc6 · df1ddc6
1 parent 7f18b07
commit df1ddc6
Show file tree

Hide file tree

Showing 23 changed files with 27 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -104,7 +104,7 @@ to reset the database from the files.
   directory
 * Clone this repository and cd into it
 * From the top 'mvn clean install'
-* java -jar gedbrowser/target/gedbrowser-1.2.2-SNAPSHOT.jar or run from your IDE
+* java -jar gedbrowser/target/gedbrowser-1.2.2.jar or run from your IDE
 
 The location of gedbrowser.home defaults to /var/lib/gedbrowser. However that
 can be adjusted in the file application.yml. When running in Docker the data

diff --git a/gedbrowser-analytics/pom.xml b/gedbrowser-analytics/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/gedbrowser-dao/pom.xml b/gedbrowser-dao/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/gedbrowser-datamodel/pom.xml b/gedbrowser-datamodel/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/GedObject.java b/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/GedObject.java
@@ -15,7 +15,7 @@ public abstract class GedObject extends AbstractFinderObject {
     /** */
     protected static final String DEFAULT_IDX_NAME = "";
     /** */
-    public static final String VERSION = "1.2.2-SNAPSHOT";
+    public static final String VERSION = "1.2.2";
     /** */
     protected static final String DEFAULT_SURNAME = "";
     /** */

diff --git a/gedbrowser-geographics/pom.xml b/gedbrowser-geographics/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/gedbrowser-mongo-dao/pom.xml b/gedbrowser-mongo-dao/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/gedbrowser-reader/pom.xml b/gedbrowser-reader/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/gedbrowser-renderer/pom.xml b/gedbrowser-renderer/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/gedbrowser/pom.xml b/gedbrowser/pom.xml
@@ -5,7 +5,7 @@
 
   <parent>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <relativePath>..</relativePath>
   </parent>
@@ -352,7 +352,7 @@
             </goals>
             <configuration>
               <imageTags>
-                <imageTag>snapshot</imageTag>
+                <imageTag>latest</imageTag>
               </imageTags>
               <imageName>${docker.image.prefix}/${project.artifactId}:${docker.image.tag}</imageName>
               <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>

diff --git a/gedbrowser/src/main/docker/Dockerfile b/gedbrowser/src/main/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM java:8
 VOLUME /tmp
-ADD gedbrowser-1.2.2-SNAPSHOT.jar gedbrowser.jar
+ADD gedbrowser-1.2.2.jar gedbrowser.jar
 EXPOSE 8080
 EXPOSE 8081
 ENV spring.data.mongodb.host=mongo

diff --git a/gedbrowser/src/main/resources/banner.txt b/gedbrowser/src/main/resources/banner.txt
@@ -5,4 +5,4 @@
  | (_| |  __/ (_| | |_) | | | (_) \ V  V /\__ \  __/ |
   \__, |\___|\__,_|_.__/|_|  \___/ \_/\_/ |___/\___|_|
    __/ |
-  |___/    gedbrowser-1.2.2-SNAPSHOT
+  |___/    gedbrowser-1.2.2
diff --git a/gedbrowser/src/test/java/org/schoellerfamily/gedbrowser/test/ApplicationInfoTest.java b/gedbrowser/src/test/java/org/schoellerfamily/gedbrowser/test/ApplicationInfoTest.java
@@ -73,7 +73,7 @@ public void testApplicationInfoName() {
     @Test
     public void testApplicationInfoVersion() {
         assertEquals("Version mismatch",
-                "1.2.2-SNAPSHOT", appInfo.getVersion());
+                "1.2.2", appInfo.getVersion());
     }
 
     /** */

diff --git a/geoservice-client/pom.xml b/geoservice-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/geoservice-common/pom.xml b/geoservice-common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/geoservice-persistence-mongo/pom.xml b/geoservice-persistence-mongo/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/geoservice-persistence/pom.xml b/geoservice-persistence/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/geoservice/pom.xml b/geoservice/pom.xml
@@ -5,7 +5,7 @@
 
   <parent>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.2</version>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <relativePath>..</relativePath>
   </parent>
@@ -154,7 +154,7 @@
             </goals>
             <configuration>
               <imageTags>
-                <imageTag>snapshot</imageTag>
+                <imageTag>latest</imageTag>
               </imageTags>
               <imageName>${docker.image.prefix}/${project.artifactId}:${docker.image.tag}</imageName>
               <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>

diff --git a/geoservice/src/main/docker/Dockerfile b/geoservice/src/main/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM java:8
 VOLUME /tmp
-ADD geoservice-1.2.2-SNAPSHOT.jar geoservice.jar
+ADD geoservice-1.2.2.jar geoservice.jar
 EXPOSE 8080
 EXPOSE 8081
 ENV spring.data.mongodb.host=mongo

diff --git a/geoservice/src/main/java/org/schoellerfamily/geoservice/controller/ApplicationInfo.java b/geoservice/src/main/java/org/schoellerfamily/geoservice/controller/ApplicationInfo.java
@@ -10,7 +10,7 @@ public final class ApplicationInfo {
     /** */
     private static final String NAME = "gedbrowser-geoservice";
     /** */
-    private static final String VERSION = "1.2.2-SNAPSHOT";
+    private static final String VERSION = "1.2.2";
     /** */
     private static final String APPLICATION_URL =
             "https://github.com/dickschoeller/gedbrowser";

diff --git a/geoservice/src/main/resources/banner.txt b/geoservice/src/main/resources/banner.txt
@@ -10,4 +10,4 @@
  | (_| |  __/ (_) \__ \  __/ |   \ V /| | (_|  __/
   \__, |\___|\___/|___/\___|_|    \_/ |_|\___\___|
    __/ |
-  |___/    gedbrowser-geoservice-1.2.2-SNAPSHOT
+  |___/    gedbrowser-geoservice-1.2.2
diff --git a/geoservice/src/test/java/org/schoellerfamily/geoservice/test/ApplicationInfoTest.java b/geoservice/src/test/java/org/schoellerfamily/geoservice/test/ApplicationInfoTest.java
@@ -72,6 +72,6 @@ public void testApplicationInfoName() {
     @Test
     public void testApplicationInfoVersion() {
         assertEquals("Version mismatch",
-                "1.2.2-SNAPSHOT", appInfo.getVersion());
+                "1.2.2", appInfo.getVersion());
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>org.schoellerfamily.gedbrowser</groupId>
   <artifactId>gedbrowser-top</artifactId>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.2</version>
   <packaging>pom</packaging>
   <url>http://www.schoellerfamily.org</url>
 
@@ -50,7 +50,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <gedbrowser.version>1.2.2-SNAPSHOT</gedbrowser.version>
+    <gedbrowser.version>1.2.2</gedbrowser.version>
 
     <spring-boot.version>1.5.6.RELEASE</spring-boot.version>
     <spring-boot-maven.version>1.5.6.RELEASE</spring-boot-maven.version>
@@ -96,7 +96,7 @@
 
     <docker-plugin.version>1.0.0</docker-plugin.version>
     <docker.image.prefix>dickschoeller</docker.image.prefix>
-    <docker.image.tag>snapshot</docker.image.tag>
+    <docker.image.tag>1.2.2</docker.image.tag>
 
     <config-dir>${project.basedir}/config</config-dir>
     <server.port>8080</server.port>