Skip to content

Commit

Permalink
change versions to 1.1.2-SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
@dickschoeller
dickschoeller committed Feb 13, 2017
1 parent 2a5762b commit 22970e0
Show file tree
Hide file tree
Showing 25 changed files with 54 additions and 54 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/docker-shakedown.sh
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
6 changes: 3 additions & 3 deletions gedbrowser-analytics/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-top</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down Expand Up @@ -40,12 +40,12 @@
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-datamodel</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-reader</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions gedbrowser-dao/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-top</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down Expand Up @@ -133,12 +133,12 @@
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-datamodel</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-reader</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down
2 changes: 1 addition & 1 deletion gedbrowser-datamodel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-top</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/GedObject.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "";
/** */
Expand Down
6 changes: 3 additions & 3 deletions gedbrowser-geographics/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-top</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down Expand Up @@ -40,12 +40,12 @@
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-datamodel</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-reader</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions gedbrowser-mongo-dao/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-top</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down Expand Up @@ -133,17 +133,17 @@
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-dao</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-datamodel</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-reader</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down
4 changes: 2 additions & 2 deletions gedbrowser-reader/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-top</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down Expand Up @@ -40,7 +40,7 @@
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-datamodel</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
10 changes: 5 additions & 5 deletions gedbrowser-renderer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-top</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down Expand Up @@ -40,22 +40,22 @@
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-datamodel</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-reader</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-analytics</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>geoservice-client</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion gedbrowser-selenium/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-top</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
16 changes: 8 additions & 8 deletions gedbrowser/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<parent>
<artifactId>gedbrowser-top</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<relativePath>..</relativePath>
</parent>
Expand Down Expand Up @@ -55,37 +55,37 @@
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-datamodel</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-reader</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-renderer</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-mongo-dao</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-analytics</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-geographics</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>geoservice-client</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
2 changes: 1 addition & 1 deletion gedbrowser/src/main/docker/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion gedbrowser/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
| (_| | __/ (_| | |_) | | | (_) \ V V /\__ \ __/ |
\__, |\___|\__,_|_.__/|_| \___/ \_/\_/ |___/\___|_|
__/ |
|___/ gedbrowser-1.1.1
|___/ gedbrowser-1.1.2-SNAPSHOT
2 changes: 1 addition & 1 deletion gedbrowser/src/test/java/org/schoellerfamily/gedbrowser/test/ApplicationInfoTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

/** */
Expand Down
4 changes: 2 additions & 2 deletions geoservice-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-top</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down Expand Up @@ -147,7 +147,7 @@
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>geoservice-persistence</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>de.grundid.opendatalab</groupId>
Expand Down
2 changes: 1 addition & 1 deletion geoservice-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-top</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions geoservice-persistence-mongo/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-top</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down Expand Up @@ -133,12 +133,12 @@
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>geoservice-common</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>geoservice-persistence</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down
4 changes: 2 additions & 2 deletions geoservice-persistence/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>gedbrowser-top</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down Expand Up @@ -133,7 +133,7 @@
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>geoservice-common</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>de.grundid.opendatalab</groupId>
Expand Down
6 changes: 3 additions & 3 deletions geoservice/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<parent>
<artifactId>gedbrowser-top</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<relativePath>..</relativePath>
</parent>
Expand Down Expand Up @@ -55,12 +55,12 @@
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>geoservice-persistence</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.schoellerfamily.gedbrowser</groupId>
<artifactId>geoservice-persistence-mongo</artifactId>
<version>1.1.1</version>
<version>1.1.2-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion geoservice/src/main/docker/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion geoservice/src/main/java/org/schoellerfamily/geoservice/controller/ApplicationInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public String getName() {
* @return the version string.
*/
public String getVersion() {
return "1.1.1";
return "1.1.2-SNAPSHOT";
}

/**
Expand Down
2 changes: 1 addition & 1 deletion geoservice/src/main/resources/banner.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
| (_| | __/ (_) \__ \ __/ | \ V /| | (_| __/
\__, |\___|\___/|___/\___|_| \_/ |_|\___\___|
__/ |
|___/ gedbrowser-geoservice-1.1.1
|___/ gedbrowser-geoservice-1.1.2-SNAPSHOT
Loading

0 comments on commit 22970e0

Please sign in to comment.