From df1ddc6730b7688b6b628de78334fdd19dbdc580 Mon Sep 17 00:00:00 2001 From: Richard Schoeller Date: Thu, 10 Aug 2017 19:01:16 -0400 Subject: [PATCH] Clean up versions for release --- README.md | 2 +- gedbrowser-analytics/pom.xml | 2 +- gedbrowser-dao/pom.xml | 2 +- gedbrowser-datamodel/pom.xml | 2 +- .../org/schoellerfamily/gedbrowser/datamodel/GedObject.java | 2 +- gedbrowser-geographics/pom.xml | 2 +- gedbrowser-mongo-dao/pom.xml | 2 +- gedbrowser-reader/pom.xml | 2 +- gedbrowser-renderer/pom.xml | 2 +- gedbrowser/pom.xml | 4 ++-- gedbrowser/src/main/docker/Dockerfile | 2 +- gedbrowser/src/main/resources/banner.txt | 2 +- .../gedbrowser/test/ApplicationInfoTest.java | 2 +- geoservice-client/pom.xml | 2 +- geoservice-common/pom.xml | 2 +- geoservice-persistence-mongo/pom.xml | 2 +- geoservice-persistence/pom.xml | 2 +- geoservice/pom.xml | 4 ++-- geoservice/src/main/docker/Dockerfile | 2 +- .../geoservice/controller/ApplicationInfo.java | 2 +- geoservice/src/main/resources/banner.txt | 2 +- .../geoservice/test/ApplicationInfoTest.java | 2 +- pom.xml | 6 +++--- 23 files changed, 27 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 89363b84..16710d6d 100644 --- 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 index ca6e5c46..13b564a6 100644 --- a/gedbrowser-analytics/pom.xml +++ b/gedbrowser-analytics/pom.xml @@ -5,7 +5,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.2.2-SNAPSHOT + 1.2.2 .. diff --git a/gedbrowser-dao/pom.xml b/gedbrowser-dao/pom.xml index b82acdf7..59ecc3aa 100644 --- a/gedbrowser-dao/pom.xml +++ b/gedbrowser-dao/pom.xml @@ -4,7 +4,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.2.2-SNAPSHOT + 1.2.2 .. diff --git a/gedbrowser-datamodel/pom.xml b/gedbrowser-datamodel/pom.xml index e481f6ff..64575197 100644 --- a/gedbrowser-datamodel/pom.xml +++ b/gedbrowser-datamodel/pom.xml @@ -5,7 +5,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.2.2-SNAPSHOT + 1.2.2 .. 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 index 1c671e57..fcaff575 100644 --- 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 index 228a3725..2bcc96b2 100644 --- a/gedbrowser-geographics/pom.xml +++ b/gedbrowser-geographics/pom.xml @@ -5,7 +5,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.2.2-SNAPSHOT + 1.2.2 .. diff --git a/gedbrowser-mongo-dao/pom.xml b/gedbrowser-mongo-dao/pom.xml index 756136c9..6dbb6e35 100644 --- a/gedbrowser-mongo-dao/pom.xml +++ b/gedbrowser-mongo-dao/pom.xml @@ -4,7 +4,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.2.2-SNAPSHOT + 1.2.2 .. diff --git a/gedbrowser-reader/pom.xml b/gedbrowser-reader/pom.xml index 2cb9e66c..e6f653c4 100644 --- a/gedbrowser-reader/pom.xml +++ b/gedbrowser-reader/pom.xml @@ -5,7 +5,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.2.2-SNAPSHOT + 1.2.2 .. diff --git a/gedbrowser-renderer/pom.xml b/gedbrowser-renderer/pom.xml index f6644ba6..d3ee6723 100644 --- a/gedbrowser-renderer/pom.xml +++ b/gedbrowser-renderer/pom.xml @@ -5,7 +5,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.2.2-SNAPSHOT + 1.2.2 .. diff --git a/gedbrowser/pom.xml b/gedbrowser/pom.xml index 2bc471a6..0f1b2ee1 100644 --- a/gedbrowser/pom.xml +++ b/gedbrowser/pom.xml @@ -5,7 +5,7 @@ gedbrowser-top - 1.2.2-SNAPSHOT + 1.2.2 org.schoellerfamily.gedbrowser .. @@ -352,7 +352,7 @@ - snapshot + latest ${docker.image.prefix}/${project.artifactId}:${docker.image.tag} ${project.basedir}/src/main/docker diff --git a/gedbrowser/src/main/docker/Dockerfile b/gedbrowser/src/main/docker/Dockerfile index cfd2a0fb..e9f26845 100644 --- 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 index 4593a2e3..39a70588 100644 --- 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 index e486d86c..8e9857f8 100644 --- 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 index f633c1a9..fea4c02d 100644 --- a/geoservice-client/pom.xml +++ b/geoservice-client/pom.xml @@ -4,7 +4,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.2.2-SNAPSHOT + 1.2.2 .. diff --git a/geoservice-common/pom.xml b/geoservice-common/pom.xml index ed7d0141..02cbcbc4 100644 --- a/geoservice-common/pom.xml +++ b/geoservice-common/pom.xml @@ -4,7 +4,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.2.2-SNAPSHOT + 1.2.2 .. diff --git a/geoservice-persistence-mongo/pom.xml b/geoservice-persistence-mongo/pom.xml index 8dd20eea..682e6ec6 100644 --- a/geoservice-persistence-mongo/pom.xml +++ b/geoservice-persistence-mongo/pom.xml @@ -4,7 +4,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.2.2-SNAPSHOT + 1.2.2 .. diff --git a/geoservice-persistence/pom.xml b/geoservice-persistence/pom.xml index d77d3266..a1e1560d 100644 --- a/geoservice-persistence/pom.xml +++ b/geoservice-persistence/pom.xml @@ -4,7 +4,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.2.2-SNAPSHOT + 1.2.2 .. diff --git a/geoservice/pom.xml b/geoservice/pom.xml index 57c36036..8e947942 100644 --- a/geoservice/pom.xml +++ b/geoservice/pom.xml @@ -5,7 +5,7 @@ gedbrowser-top - 1.2.2-SNAPSHOT + 1.2.2 org.schoellerfamily.gedbrowser .. @@ -154,7 +154,7 @@ - snapshot + latest ${docker.image.prefix}/${project.artifactId}:${docker.image.tag} ${project.basedir}/src/main/docker diff --git a/geoservice/src/main/docker/Dockerfile b/geoservice/src/main/docker/Dockerfile index b0eac055..6bd4e03b 100644 --- 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 index a24c4dba..0b41caa8 100644 --- 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 index 449f1209..950531cb 100644 --- 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 index b0f8acf2..bfe24378 100644 --- 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 index b58c36fd..7fe871c3 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.2.2-SNAPSHOT + 1.2.2 pom http://www.schoellerfamily.org @@ -50,7 +50,7 @@ UTF-8 UTF-8 - 1.2.2-SNAPSHOT + 1.2.2 1.5.6.RELEASE 1.5.6.RELEASE @@ -96,7 +96,7 @@ 1.0.0 dickschoeller - snapshot + 1.2.2 ${project.basedir}/config 8080