From 22970e0dff1e747899746a7ae7ec527b145a678c Mon Sep 17 00:00:00 2001 From: Richard Schoeller Date: Sun, 12 Feb 2017 21:23:34 -0500 Subject: [PATCH] change versions to 1.1.2-SNAPSHOT --- README.md | 2 +- config/docker-shakedown.sh | 4 ++-- gedbrowser-analytics/pom.xml | 6 +++--- gedbrowser-dao/pom.xml | 6 +++--- gedbrowser-datamodel/pom.xml | 2 +- .../gedbrowser/datamodel/GedObject.java | 2 +- gedbrowser-geographics/pom.xml | 6 +++--- gedbrowser-mongo-dao/pom.xml | 8 ++++---- gedbrowser-reader/pom.xml | 4 ++-- gedbrowser-renderer/pom.xml | 10 +++++----- gedbrowser-selenium/pom.xml | 2 +- gedbrowser/pom.xml | 16 ++++++++-------- gedbrowser/src/main/docker/Dockerfile | 2 +- gedbrowser/src/main/resources/banner.txt | 2 +- .../gedbrowser/test/ApplicationInfoTest.java | 2 +- geoservice-client/pom.xml | 4 ++-- geoservice-common/pom.xml | 2 +- geoservice-persistence-mongo/pom.xml | 6 +++--- geoservice-persistence/pom.xml | 4 ++-- geoservice/pom.xml | 6 +++--- 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 | 4 ++-- 25 files changed, 54 insertions(+), 54 deletions(-) diff --git a/README.md b/README.md index 1a037ff2..164b2243 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ role to see living people. * Place GEDCOM files in /var/lib/gedbrowser * Create /var/lib/gedbrowser/userFile.csv rows are: username,firstname,lastname,email,password,role,role... -* java -jar gedbrowser/target/gedbrowser-1.1.1.jar +* java -jar gedbrowser/target/gedbrowser-1.1.2-SNAPSHOT.jar Running with Docker requires running the MongoDB with Docker. The following commands allow you to do this without conflicting ports with a native mongod diff --git a/config/docker-shakedown.sh b/config/docker-shakedown.sh index 31fddda6..cc4f4f51 100755 --- a/config/docker-shakedown.sh +++ b/config/docker-shakedown.sh @@ -1,6 +1,6 @@ #!/bin/bash -docker run --link mongo:mongo -v /home/travis/gedbrowser:/var/lib/gedbrowser -p 8086:8080 -p 8087:8080 --name geoservice -d dickschoeller/geoservice:latest -docker run --link mongo:mongo --link geoservice:geoservice -v /home/travis/gedbrowser:/var/lib/gedbrowser -p 8080:8080 -p 8081:8081 --name gedbrowser -d dickschoeller/gedbrowser:latest +docker run --link mongo:mongo -v /home/travis/gedbrowser:/var/lib/gedbrowser -p 8086:8080 -p 8087:8080 --name geoservice -d dickschoeller/geoservice:snapshot +docker run --link mongo:mongo --link geoservice:geoservice -v /home/travis/gedbrowser:/var/lib/gedbrowser -p 8080:8080 -p 8081:8081 --name gedbrowser -d dickschoeller/gedbrowser:snapshot echo "Wait a minute" sleep 1m echo "Done waiting, let's see how Docker has done" diff --git a/gedbrowser-analytics/pom.xml b/gedbrowser-analytics/pom.xml index 5e566e7d..ad4f2b6b 100644 --- a/gedbrowser-analytics/pom.xml +++ b/gedbrowser-analytics/pom.xml @@ -5,7 +5,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.1.1 + 1.1.2-SNAPSHOT .. @@ -40,12 +40,12 @@ org.schoellerfamily.gedbrowser gedbrowser-datamodel - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser gedbrowser-reader - 1.1.1 + 1.1.2-SNAPSHOT test diff --git a/gedbrowser-dao/pom.xml b/gedbrowser-dao/pom.xml index 6acfb176..3a397649 100644 --- a/gedbrowser-dao/pom.xml +++ b/gedbrowser-dao/pom.xml @@ -4,7 +4,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.1.1 + 1.1.2-SNAPSHOT .. @@ -133,12 +133,12 @@ org.schoellerfamily.gedbrowser gedbrowser-datamodel - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser gedbrowser-reader - 1.1.1 + 1.1.2-SNAPSHOT org.springframework diff --git a/gedbrowser-datamodel/pom.xml b/gedbrowser-datamodel/pom.xml index a6132522..eadab804 100644 --- a/gedbrowser-datamodel/pom.xml +++ b/gedbrowser-datamodel/pom.xml @@ -5,7 +5,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.1.1 + 1.1.2-SNAPSHOT .. 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 f57c9bd3..719b99c0 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 @@ -14,7 +14,7 @@ public class GedObject { /** */ protected static final String DEFAULT_IDX_NAME = ""; /** */ - public static final String VERSION = "1.1.1"; + public static final String VERSION = "1.1.2-SNAPSHOT"; /** */ protected static final String DEFAULT_SURNAME = ""; /** */ diff --git a/gedbrowser-geographics/pom.xml b/gedbrowser-geographics/pom.xml index b4b7e82d..c49f6393 100644 --- a/gedbrowser-geographics/pom.xml +++ b/gedbrowser-geographics/pom.xml @@ -5,7 +5,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.1.1 + 1.1.2-SNAPSHOT .. @@ -40,12 +40,12 @@ org.schoellerfamily.gedbrowser gedbrowser-datamodel - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser gedbrowser-reader - 1.1.1 + 1.1.2-SNAPSHOT test diff --git a/gedbrowser-mongo-dao/pom.xml b/gedbrowser-mongo-dao/pom.xml index 48ed0fd2..ab621cf8 100644 --- a/gedbrowser-mongo-dao/pom.xml +++ b/gedbrowser-mongo-dao/pom.xml @@ -4,7 +4,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.1.1 + 1.1.2-SNAPSHOT .. @@ -133,17 +133,17 @@ org.schoellerfamily.gedbrowser gedbrowser-dao - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser gedbrowser-datamodel - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser gedbrowser-reader - 1.1.1 + 1.1.2-SNAPSHOT org.springframework diff --git a/gedbrowser-reader/pom.xml b/gedbrowser-reader/pom.xml index 63615680..679cb32d 100644 --- a/gedbrowser-reader/pom.xml +++ b/gedbrowser-reader/pom.xml @@ -5,7 +5,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.1.1 + 1.1.2-SNAPSHOT .. @@ -40,7 +40,7 @@ org.schoellerfamily.gedbrowser gedbrowser-datamodel - 1.1.1 + 1.1.2-SNAPSHOT junit diff --git a/gedbrowser-renderer/pom.xml b/gedbrowser-renderer/pom.xml index 30e22ae2..470a5df8 100644 --- a/gedbrowser-renderer/pom.xml +++ b/gedbrowser-renderer/pom.xml @@ -5,7 +5,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.1.1 + 1.1.2-SNAPSHOT .. @@ -40,22 +40,22 @@ org.schoellerfamily.gedbrowser gedbrowser-datamodel - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser gedbrowser-reader - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser gedbrowser-analytics - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser geoservice-client - 1.1.1 + 1.1.2-SNAPSHOT junit diff --git a/gedbrowser-selenium/pom.xml b/gedbrowser-selenium/pom.xml index 41728851..67658941 100644 --- a/gedbrowser-selenium/pom.xml +++ b/gedbrowser-selenium/pom.xml @@ -5,7 +5,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.1.1 + 1.1.2-SNAPSHOT .. diff --git a/gedbrowser/pom.xml b/gedbrowser/pom.xml index fff0c8de..1351ee3d 100644 --- a/gedbrowser/pom.xml +++ b/gedbrowser/pom.xml @@ -5,7 +5,7 @@ gedbrowser-top - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser .. @@ -55,37 +55,37 @@ org.schoellerfamily.gedbrowser gedbrowser-datamodel - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser gedbrowser-reader - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser gedbrowser-renderer - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser gedbrowser-mongo-dao - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser gedbrowser-analytics - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser gedbrowser-geographics - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser geoservice-client - 1.1.1 + 1.1.2-SNAPSHOT org.springframework.boot diff --git a/gedbrowser/src/main/docker/Dockerfile b/gedbrowser/src/main/docker/Dockerfile index fd5ea248..1baefb89 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.1.1.jar gedbrowser.jar +ADD gedbrowser-1.1.2-SNAPSHOT.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 3cf02b18..3e7789e9 100644 --- a/gedbrowser/src/main/resources/banner.txt +++ b/gedbrowser/src/main/resources/banner.txt @@ -5,4 +5,4 @@ | (_| | __/ (_| | |_) | | | (_) \ V V /\__ \ __/ | \__, |\___|\__,_|_.__/|_| \___/ \_/\_/ |___/\___|_| __/ | - |___/ gedbrowser-1.1.1 + |___/ gedbrowser-1.1.2-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 index ad19e7b9..71bfea8d 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.1.1", appInfo.getVersion()); + "1.1.2-SNAPSHOT", appInfo.getVersion()); } /** */ diff --git a/geoservice-client/pom.xml b/geoservice-client/pom.xml index aafdcff1..b26d4e12 100644 --- a/geoservice-client/pom.xml +++ b/geoservice-client/pom.xml @@ -4,7 +4,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.1.1 + 1.1.2-SNAPSHOT .. @@ -147,7 +147,7 @@ org.schoellerfamily.gedbrowser geoservice-persistence - 1.1.1 + 1.1.2-SNAPSHOT de.grundid.opendatalab diff --git a/geoservice-common/pom.xml b/geoservice-common/pom.xml index 11c026ca..46d00da0 100644 --- a/geoservice-common/pom.xml +++ b/geoservice-common/pom.xml @@ -4,7 +4,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.1.1 + 1.1.2-SNAPSHOT .. diff --git a/geoservice-persistence-mongo/pom.xml b/geoservice-persistence-mongo/pom.xml index 3349b721..5d235196 100644 --- a/geoservice-persistence-mongo/pom.xml +++ b/geoservice-persistence-mongo/pom.xml @@ -4,7 +4,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.1.1 + 1.1.2-SNAPSHOT .. @@ -133,12 +133,12 @@ org.schoellerfamily.gedbrowser geoservice-common - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser geoservice-persistence - 1.1.1 + 1.1.2-SNAPSHOT org.springframework diff --git a/geoservice-persistence/pom.xml b/geoservice-persistence/pom.xml index 388bb8c9..39443e22 100644 --- a/geoservice-persistence/pom.xml +++ b/geoservice-persistence/pom.xml @@ -4,7 +4,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.1.1 + 1.1.2-SNAPSHOT .. @@ -133,7 +133,7 @@ org.schoellerfamily.gedbrowser geoservice-common - 1.1.1 + 1.1.2-SNAPSHOT de.grundid.opendatalab diff --git a/geoservice/pom.xml b/geoservice/pom.xml index a800960d..6f2314e9 100644 --- a/geoservice/pom.xml +++ b/geoservice/pom.xml @@ -5,7 +5,7 @@ gedbrowser-top - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser .. @@ -55,12 +55,12 @@ org.schoellerfamily.gedbrowser geoservice-persistence - 1.1.1 + 1.1.2-SNAPSHOT org.schoellerfamily.gedbrowser geoservice-persistence-mongo - 1.1.1 + 1.1.2-SNAPSHOT diff --git a/geoservice/src/main/docker/Dockerfile b/geoservice/src/main/docker/Dockerfile index 8db94d09..00a91d49 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.1.1.jar geoservice.jar +ADD geoservice-1.1.2-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 index f4429804..b6630e33 100644 --- a/geoservice/src/main/java/org/schoellerfamily/geoservice/controller/ApplicationInfo.java +++ b/geoservice/src/main/java/org/schoellerfamily/geoservice/controller/ApplicationInfo.java @@ -15,7 +15,7 @@ public String getName() { * @return the version string. */ public String getVersion() { - return "1.1.1"; + return "1.1.2-SNAPSHOT"; } /** diff --git a/geoservice/src/main/resources/banner.txt b/geoservice/src/main/resources/banner.txt index 00450b6d..d4698cf5 100644 --- a/geoservice/src/main/resources/banner.txt +++ b/geoservice/src/main/resources/banner.txt @@ -10,4 +10,4 @@ | (_| | __/ (_) \__ \ __/ | \ V /| | (_| __/ \__, |\___|\___/|___/\___|_| \_/ |_|\___\___| __/ | - |___/ gedbrowser-geoservice-1.1.1 + |___/ gedbrowser-geoservice-1.1.2-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 index 2a14c078..f7264c23 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.1.1", appInfo.getVersion()); + "1.1.2-SNAPSHOT", appInfo.getVersion()); } } diff --git a/pom.xml b/pom.xml index 6712d6c6..44a497c8 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.schoellerfamily.gedbrowser gedbrowser-top - 1.1.1 + 1.1.2-SNAPSHOT pom @@ -47,7 +47,7 @@ dickschoeller - latest + snapshot UTF-8 UTF-8