Start work on 1.3.0-RC2

dickschoeller · May 16, 2020 · 357c6a6 · 357c6a6
1 parent d9bbaa8
commit 357c6a6
Show file tree

Hide file tree

Showing 30 changed files with 35 additions and 35 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.3.0-RC1.jar or run from your IDE
+* java -jar gedbrowser/target/gedbrowser-1.3.0-RC2-SNAPSHOT.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/config/before-deploy.sh b/config/before-deploy.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 echo TRAVIS_BRANCH=$TRAVIS_BRANCH
 echo TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST
-if [[ $TRAVIS_PULL_REQUEST == 'false' && ( $TRAVIS_BRANCH == '1.3.0-RC1' || $TRAVIS_BRANCH == 'development' ) ]]; then
+if [[ $TRAVIS_PULL_REQUEST == 'false' && ( $TRAVIS_BRANCH == 'XXXXXX' || $TRAVIS_BRANCH == 'development' ) ]]; then
     openssl aes-256-cbc -K $encrypted_0b79b78d9b0a_key -iv $encrypted_0b79b78d9b0a_iv -in config/codesigning.asc.enc -out config/codesigning.asc -d
     gpg --fast-import config/codesigning.asc
 else

diff --git a/config/deploy.sh b/config/deploy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-if [[ $TRAVIS_PULL_REQUEST == 'false' && ( $TRAVIS_BRANCH == '1.3.0-RC1' || $TRAVIS_BRANCH == 'development' ) ]]; then
+if [[ $TRAVIS_PULL_REQUEST == 'false' && ( $TRAVIS_BRANCH == 'XXXXXX' || $TRAVIS_BRANCH == 'development' ) ]]; then
     mvn --batch-mode --settings=config/settings.xml -Psign,deploy -DpushImage deploy
 else
     echo "Only deploy on push to development or label"

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

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

diff --git a/gedbrowser-datamodel/pom.xml b/gedbrowser-datamodel/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.3.0-RC1</version>
+    <version>1.3.0-RC2-SNAPSHOT</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
@@ -16,7 +16,7 @@ public abstract class GedObject extends AbstractFinderObject
     /** */
     protected static final String DEFAULT_IDX_NAME = "";
     /** */
-    public static final String VERSION = "1.3.0-RC1";
+    public static final String VERSION = "1.3.0-RC2-SNAPSHOT";
     /** */
     protected static final String DEFAULT_SURNAME = "";
     /** */

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

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

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

diff --git a/gedbrowser-security/pom.xml b/gedbrowser-security/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.3.0-RC1</version>
+    <version>1.3.0-RC2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/gedbrowser-writer/pom.xml b/gedbrowser-writer/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.3.0-RC1</version>
+    <version>1.3.0-RC2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

diff --git a/gedbrowser/pom.xml b/gedbrowser/pom.xml
@@ -6,7 +6,7 @@
 
   <parent>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.3.0-RC1</version>
+    <version>1.3.0-RC2-SNAPSHOT</version>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <relativePath>..</relativePath>
   </parent>
@@ -363,7 +363,7 @@
             </goals>
             <configuration>
               <imageTags>
-                <imageTag>latest</imageTag>
+                <imageTag>snapshot</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 openjdk:8
 VOLUME /tmp
-ADD gedbrowser-1.3.0-RC1.jar gedbrowser.jar
+ADD gedbrowser-1.3.0-RC2-SNAPSHOT.jar gedbrowser.jar
 ADD config/letsencrypt.cer letsencrypt.cer
 EXPOSE 8080
 EXPOSE 8081

diff --git a/gedbrowser/src/main/resources/banner.txt b/gedbrowser/src/main/resources/banner.txt
@@ -5,4 +5,4 @@
  | (_| |  __/ (_| | |_) | | | (_) \ V  V /\__ \  __/ |
   \__, |\___|\__,_|_.__/|_|  \___/ \_/\_/ |___/\___|_|
    __/ |
-  |___/    gedbrowser-1.3.0-RC1
+  |___/    gedbrowser-1.3.0-RC2-SNAPSHOT
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.3.0-RC1", appInfo.getVersion());
+                "1.3.0-RC2-SNAPSHOT", appInfo.getVersion());
     }
 
     /** */

diff --git a/gedbrowserng-frontend/pom.xml b/gedbrowserng-frontend/pom.xml
@@ -6,7 +6,7 @@
 
   <parent>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.3.0-RC1</version>
+    <version>1.3.0-RC2-SNAPSHOT</version>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <relativePath>..</relativePath>
   </parent>

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

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

diff --git a/gedbrowserng/src/main/resources/banner.txt b/gedbrowserng/src/main/resources/banner.txt
@@ -5,4 +5,4 @@
  | (_| |  __/ (_| | |_) | | | (_) \ V  V /\__ \  __/ |  | | | | (_| |
   \__, |\___|\__,_|_.__/|_|  \___/ \_/\_/ |___/\___|_|  |_| |_|\__, |
    __/ |                                                        __/ |
-  |___/    gedbrowserng-1.3.0-RC1                      |___/
+  |___/    gedbrowserng-1.3.0-RC2-SNAPSHOT                      |___/
diff --git a/geoservice-client/pom.xml b/geoservice-client/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.3.0-RC1</version>
+    <version>1.3.0-RC2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

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

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

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

diff --git a/geoservice/pom.xml b/geoservice/pom.xml
@@ -6,7 +6,7 @@
 
   <parent>
     <artifactId>gedbrowser-top</artifactId>
-    <version>1.3.0-RC1</version>
+    <version>1.3.0-RC2-SNAPSHOT</version>
     <groupId>org.schoellerfamily.gedbrowser</groupId>
     <relativePath>..</relativePath>
   </parent>
@@ -223,7 +223,7 @@
             </goals>
             <configuration>
               <imageTags>
-                <imageTag>latest</imageTag>
+                <imageTag>snapshot</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.3.0-RC1.jar geoservice.jar
+ADD geoservice-1.3.0-RC2-SNAPSHOT.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.3.0-RC1";
+    private static final String VERSION = "1.3.0-RC2-SNAPSHOT";
     /** */
     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.3.0-RC1
+  |___/    gedbrowser-geoservice-1.3.0-RC2-SNAPSHOT
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.3.0-RC1", appInfo.getVersion());
+                "1.3.0-RC2-SNAPSHOT", 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.3.0-RC1</version>
+  <version>1.3.0-RC2-SNAPSHOT</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.3.0-RC1</gedbrowser.version>
+    <gedbrowser.version>1.3.0-RC2-SNAPSHOT</gedbrowser.version>
 
     <!-- These all step forward together -->
     <spring.version>4.3.26.RELEASE</spring.version>
@@ -117,7 +117,7 @@
 
     <docker-plugin.version>1.2.2</docker-plugin.version>
     <docker.image.prefix>dickschoeller</docker.image.prefix>
-    <docker.image.tag>1.3.0-RC1</docker.image.tag>
+    <docker.image.tag>1.3.0-RC2-SNAPSHOT</docker.image.tag>
 
     <config-dir>${project.basedir}/config</config-dir>
     <server.port>8080</server.port>