Fixes #335 - Release 1.2.0

Squashed commit of the following: commit e477d18 Merge: 6b545b6 c930504 Author: Richard Schoeller <[email protected]> Date: Wed May 31 18:08:25 2017 -0400 Merge pull request #382 from dickschoeller/fix-release-script minor version handling changes commit c930504 Author: Richard Schoeller <[email protected]> Date: Wed May 31 17:36:26 2017 -0400 tweak merge back slightly commit 937a062 Author: Richard Schoeller <[email protected]> Date: Wed May 31 17:15:02 2017 -0400 minor version handling changes commit 6b545b6 Merge: 0845d1f d73a79d Author: Richard Schoeller <[email protected]> Date: Wed May 31 17:00:07 2017 -0400 Merge pull request #381 from dickschoeller/fix-warning Fix a checkstyle warning commit d73a79d Author: Richard Schoeller <[email protected]> Date: Wed May 31 16:30:42 2017 -0400 Fix a checkstyle warning commit 0845d1f Merge: 7bb3154 ba58c6c Author: Richard Schoeller <[email protected]> Date: Wed May 31 15:29:49 2017 -0400 Merge pull request #380 from dickschoeller/319-null-check-obj-to-doc-converter Fixes #319 - remove redundant null check commit ba58c6c Author: Richard Schoeller <[email protected]> Date: Wed May 31 15:01:19 2017 -0400 Fixes #319 - remove redundant null check commit 7bb3154 Merge: 429414f f9b80ea Author: Richard Schoeller <[email protected]> Date: Wed May 31 13:51:55 2017 -0400 Merge pull request #379 from dickschoeller/378-dependency-update Fixes #378 - dependency update commit f9b80ea Author: Richard Schoeller <[email protected]> Date: Wed May 31 13:19:34 2017 -0400 Fixes #378 - dependency update Changed the version of the docker plugin commit 429414f Merge: 7a50669 228ceea Author: Richard Schoeller <[email protected]> Date: Wed May 24 14:09:24 2017 -0400 Merge pull request #377 from dickschoeller/367-update-dependencies Fixes #367 - update dependencies commit 228ceea Author: Richard Schoeller <[email protected]> Date: Wed May 24 13:27:23 2017 -0400 Fixes #367 - update dependencies commit 7a50669 Merge: 01f3473 30cfad8 Author: Richard Schoeller <[email protected]> Date: Wed May 24 06:22:05 2017 -0400 Merge pull request #366 from dickschoeller/78-firefox-better-wait Fixes #78 - firefox clicks not working commit 30cfad8 Author: Richard Schoeller <[email protected]> Date: Wed May 24 01:38:15 2017 -0400 Fixes #78 - firefox clicks not working It turns out the wait needs to be slightly different. This is fixed by first waiting for a URL change, then the rest of the wait behavior. commit 01f3473 Merge: 7864ac3 e185b82 Author: Richard Schoeller <[email protected]> Date: Fri May 19 01:40:36 2017 -0400 Merge pull request #365 from dickschoeller/21-menu-fragments Fixes #21 - make menu and foot fragments commit e185b82 Author: Richard Schoeller <[email protected]> Date: Fri May 19 00:45:35 2017 -0400 Fixes #21 - make menu and foot fragments Fixes #244 - make source not found page have full menu Fixes #243 - make person not found page have full menu commit 7864ac3 Merge: 991dfba 4d73c0f Author: Richard Schoeller <[email protected]> Date: Mon May 15 15:32:38 2017 -0400 Merge pull request #364 from dickschoeller/287-firefox-again try an earlier version commit 4d73c0f Author: Richard Schoeller <[email protected]> Date: Mon May 15 14:50:22 2017 -0400 screw it, this is not working commit 74131f8 Author: Richard Schoeller <[email protected]> Date: Mon May 15 14:21:35 2017 -0400 try an earlier version commit 991dfba Merge: bec81b3 a53c1bb Author: Richard Schoeller <[email protected]> Date: Mon May 15 14:11:45 2017 -0400 Merge pull request #363 from dickschoeller/287-firefox-version-36 Fixes #287 - firefox 36 in saucelabs tests commit a53c1bb Author: Richard Schoeller <[email protected]> Date: Mon May 15 13:48:46 2017 -0400 back it out. did not work commit c69b604 Author: Richard Schoeller <[email protected]> Date: Mon May 15 13:17:31 2017 -0400 Fixes #287 - firefox 36 in saucelabs tests commit bec81b3 Merge: bb24573 fd09565 Author: Richard Schoeller <[email protected]> Date: Mon May 15 13:09:56 2017 -0400 Merge pull request #362 from dickschoeller/360-try-again change the fix commit fd09565 Author: Richard Schoeller <[email protected]> Date: Mon May 15 12:46:11 2017 -0400 change the fix commit bb24573 Merge: 3ce4728 ce5a8b5 Author: Richard Schoeller <[email protected]> Date: Mon May 15 12:13:43 2017 -0400 Merge pull request #361 from dickschoeller/360-project-parent-version Fixes #360 - VersionEye doesn't like project.parent.version commit ce5a8b5 Author: Richard Schoeller <[email protected]> Date: Mon May 15 11:22:28 2017 -0400 Fixes #360 - VersionEye doesn't like project.parent.version Change over to using an explicit property, gedbrowser.version commit 3ce4728 Merge: e8023c7 0e0b900 Author: Richard Schoeller <[email protected]> Date: Tue May 9 11:36:12 2017 -0400 Merge pull request #354 from dickschoeller/343-docker-hub-readme Fixes #343 commit 0e0b900 Author: Richard Schoeller <[email protected]> Date: Tue May 9 10:36:29 2017 -0400 Add OSS Nexus repository commit 70d2d4b Author: Richard Schoeller <[email protected]> Date: Tue May 9 10:33:54 2017 -0400 Add nexus icon commit a381a00 Author: Richard Schoeller <[email protected]> Date: Tue May 9 10:20:57 2017 -0400 Fixes #343 Add docker hub link to readme commit e8023c7 Merge: fafb018 db7fab3 Author: Richard Schoeller <[email protected]> Date: Tue May 9 09:45:30 2017 -0400 Merge pull request #353 from dickschoeller/352-versions Fixes #352, Fixes #291 - version updates commit db7fab3 Author: Richard Schoeller <[email protected]> Date: Tue May 9 08:59:30 2017 -0400 Remove obsolete rule Apparently UnusedModifierRule went away commit cb74901 Author: Richard Schoeller <[email protected]> Date: Tue May 9 08:47:44 2017 -0400 Fixes #352, Fixes #291 - version updates pmd: 5.6.1 checkstyle 7.7 undertow-core 1.4.14.Final maven-pmd-plugin 3.8 commit fafb018 Merge: 3f1c7b6 8c35ebb Author: Richard Schoeller <[email protected]> Date: Sun May 7 20:28:06 2017 -0400 Merge pull request #334 from dickschoeller/new-script some new script work commit 8c35ebb Author: Richard Schoeller <[email protected]> Date: Sun May 7 20:04:21 2017 -0400 some new script work commit 3f1c7b6 Merge: b93933a 876294d Author: Richard Schoeller <[email protected]> Date: Sun May 7 19:50:34 2017 -0400 Merge pull request #333 from dickschoeller/master script clean up commit b93933a Merge: 51a6f5a 25a51e2 Author: Richard Schoeller <[email protected]> Date: Sun May 7 17:41:32 2017 -0400 Merge branch 'master' into development commit 51a6f5a Merge: ae68933 04e5a8d Author: Richard Schoeller <[email protected]> Date: Sun May 7 16:55:27 2017 -0400 Merge pull request #332 from dickschoeller/328-dependency-update Fixes #328 - update version commit 04e5a8d Author: Richard Schoeller <[email protected]> Date: Sun May 7 16:29:41 2017 -0400 Fixes #328 - update version commit ae68933 Merge: b16dfc1 39ec97b Author: Richard Schoeller <[email protected]> Date: Sun May 7 14:49:33 2017 -0400 Merge pull request #331 from dickschoeller/101-builder-update Fixes #101 - builder work commit 39ec97b Author: Richard Schoeller <[email protected]> Date: Sun May 7 14:18:47 2017 -0400 Fixes #101 - builder work * Refer to builder instead of new in more places * Rework builder to use a facade pattern to organize the different subsystems of the builder * Still could be better commit b16dfc1 Merge: a073547 c3f3041 Author: Richard Schoeller <[email protected]> Date: Sun May 7 00:49:54 2017 -0400 Merge pull request #327 from dickschoeller/250-mongo-cycles remove extra logback config commit c3f3041 Author: Richard Schoeller <[email protected]> Date: Sun May 7 00:25:51 2017 -0400 remove extra logback config commit a073547 Merge: d0591fe 3e23e8b Author: Richard Schoeller <[email protected]> Date: Sun May 7 00:07:01 2017 -0400 Merge pull request #326 from dickschoeller/323-logging Fixes #323 - logging controls commit 3e23e8b Author: Richard Schoeller <[email protected]> Date: Sat May 6 23:42:21 2017 -0400 add logback-test.xml to src/main/resources commit 4f9f44e Author: Richard Schoeller <[email protected]> Date: Sat May 6 22:24:11 2017 -0400 Fixes #323 - logging controls * Changed pom.xml files to include correct logging libraries for test * Added logback-test.xml files to control settings * Modified the travis to stop filtering build console output commit d0591fe Merge: 4d1d80a 8eed4c4 Author: Richard Schoeller <[email protected]> Date: Sat May 6 16:14:03 2017 -0400 Merge pull request #325 from dickschoeller/312-personrenderer-complexity Fixes #312 - PersonRenderer complexity commit 8eed4c4 Author: Richard Schoeller <[email protected]> Date: Sat May 6 14:15:45 2017 -0400 Fixes #312 - PersonRenderer complexity Minor changes to simplify some of the text processing commit 4d1d80a Merge: 7cf902e c6b819e Author: Richard Schoeller <[email protected]> Date: Sat May 6 11:45:27 2017 -0400 Merge pull request #324 from dickschoeller/321-user-vs-authentication Fixes #321 - simplify user vs. authentication in rendering context commit c6b819e Author: Richard Schoeller <[email protected]> Date: Sat May 6 11:16:23 2017 -0400 Fixes #321 - simplify user vs. authentication in rendering context The information gleaned from authentication was redundant with what is in the user object. Take the information from the user object. commit 7cf902e Merge: 2c35473 4e159d3 Author: Richard Schoeller <[email protected]> Date: Sat May 6 00:56:21 2017 -0400 Merge pull request #322 from dickschoeller/313-calendar-provider-in-rendering-context Fixes #313 - CalendarProvider in RenderingContext commit 4e159d3 Author: Richard Schoeller <[email protected]> Date: Sat May 6 00:15:57 2017 -0400 filter DEBUG from main mvn build command commit 55ffc9a Author: Richard Schoeller <[email protected]> Date: Fri May 5 23:49:08 2017 -0400 try again with travis file commit 165ba8c Author: Richard Schoeller <[email protected]> Date: Fri May 5 22:43:52 2017 -0400 update travis file commit fdd5049 Author: Richard Schoeller <[email protected]> Date: Fri May 5 20:16:50 2017 -0400 Fixes #313 - CalendarProvider in RenderingContext Applied the pattern where RenderingContext is a facade for ApplicationInfo, User and CalendarProvider. All this is done using the pattern where default methods of interfaces allow you to do something approximating Ruby mixins. This still leaves User not completely resolved. There is a separate issue for User. commit 2c35473 Merge: 5f6a1bf 9934a4a Author: Richard Schoeller <[email protected]> Date: Wed May 3 06:22:02 2017 -0400 Merge pull request #320 from dickschoeller/307-gedobjecttogeddocumentmongo-bean Fixes #307 - Make the GedObjectToGedDocumentMongoConverter a bean commit 9934a4a Author: Richard Schoeller <[email protected]> Date: Tue May 2 23:46:53 2017 -0400 Fixes #307 - Make the GedObjectToGedDocumentMongoConverter a bean * This required moving the loadAttributes algorithm out of GedDocumentMongo and into GedObjectToGedDocumentMongoConverter. * Change the interface and all the implementations to pass in the converter to the loadGedObject. * Configuration classes have an added bean defintion commit 5f6a1bf Merge: b87d635 e27124a Author: Richard Schoeller <[email protected]> Date: Tue May 2 19:57:10 2017 -0400 Merge pull request #314 from dickschoeller/311-gedobject-methods Fixes #311 - delete unnecessary methods in GedObject commit e27124a Author: Richard Schoeller <[email protected]> Date: Tue May 2 19:31:41 2017 -0400 Fixes #311 - delete unnecessary methods in GedObject commit b87d635 Merge: fada703 1741c08 Author: Richard Schoeller <[email protected]> Date: Tue May 2 06:48:29 2017 -0400 Merge pull request #310 from dickschoeller/309-update-maven-war-plugin Fixes #309 - update maven war plugin to 3.1.0 commit 1741c08 Author: Richard Schoeller <[email protected]> Date: Mon May 1 23:46:03 2017 -0400 Fixes #309 - update maven war plugin to 3.1.0 commit fada703 Merge: 9b3a4f1 9957288 Author: Richard Schoeller <[email protected]> Date: Mon May 1 23:39:38 2017 -0400 Merge pull request #308 from dickschoeller/106-naming-and-organization Fixes #106 - better naming patterns for helper classes commit 9957288 Author: Richard Schoeller <[email protected]> Date: Mon May 1 23:11:45 2017 -0400 Fixes #106 - better naming patterns for helper classes * Renamed the *Helper classes * Reorganized the converters between GedObject and GedDocumentMongo * Made one of the converters a bean commit 9b3a4f1 Merge: 25d6611 355745a Author: Richard Schoeller <[email protected]> Date: Sun Apr 30 23:06:59 2017 -0400 Merge pull request #306 from dickschoeller/246-visitor-document-to-ged Fixes #246 - visitor for document to db object commit 355745a Author: Richard Schoeller <[email protected]> Date: Sun Apr 30 22:42:25 2017 -0400 Fixes #246 - visitor for document to db object commit 25d6611 Merge: 8181025 fec1ff2 Author: Richard Schoeller <[email protected]> Date: Sun Apr 30 18:46:36 2017 -0400 Merge pull request #305 from dickschoeller/272-gedobjectfactory-as-bean Fixes #302 - TestDataReader commit fec1ff2 Author: Richard Schoeller <[email protected]> Date: Sun Apr 30 18:22:00 2017 -0400 Fixes #302 - TestDataReader Fixes #304 - CalendarProvider Both are accessed as beans. Moved test data reader to gedbrowser-reader and made it be part of production. commit 8181025 Merge: 96363ab e2d9e01 Author: Richard Schoeller <[email protected]> Date: Sun Apr 30 11:12:37 2017 -0400 Merge pull request #303 from dickschoeller/272-gedobjectfactory-as-bean Fixes #272 - GedObjectFactory as a bean commit e2d9e01 Author: Richard Schoeller <[email protected]> Date: Sun Apr 30 10:49:26 2017 -0400 add missing bean annotation commit df75bf3 Author: Richard Schoeller <[email protected]> Date: Sun Apr 30 10:28:08 2017 -0400 Fixes #272 - GedObjectFactory as a bean * Change the rest of the tests that were referencing g2g to use Spring to get the reader. * Autowire a few other things that are routinely included commit 96363ab Merge: d50ccb4 fd509e4 Author: Richard Schoeller <[email protected]> Date: Sun Apr 30 09:52:02 2017 -0400 Merge pull request #301 from dickschoeller/272-gedobjectfactory-as-bean GedObjectFactory as Bean commit fd509e4 Author: Richard Schoeller <[email protected]> Date: Sun Apr 30 09:28:09 2017 -0400 GedObjectFactory as Bean * Actually a wrapper around the factory is a bean * The processing that uses the factory is a visitor There will be another round of pull requests on this to actually always use the factory and the wrapper as beans. That is more intrusive on some of the consumers. commit d50ccb4 Merge: 9605d05 c425e2e Author: Richard Schoeller <[email protected]> Date: Sat Apr 29 22:05:38 2017 -0400 Merge pull request #300 from dickschoeller/271-abstractgedline-complexity Fixes #271 - AbstractGedLine complexity commit c425e2e Author: Richard Schoeller <[email protected]> Date: Sat Apr 29 21:37:42 2017 -0400 Fixes #271 - AbstractGedLine complexity Create another layer of abstraction to spread the complexity around. commit 9605d05 Merge: d2fe0be 97a5a66 Author: Richard Schoeller <[email protected]> Date: Sat Apr 29 21:09:38 2017 -0400 Merge pull request #299 from dickschoeller/pmd-warnings remove a couple of warnings commit 97a5a66 Author: Richard Schoeller <[email protected]> Date: Sat Apr 29 20:44:17 2017 -0400 remove a couple of warnings commit d2fe0be Merge: 27cef57 9f476e4 Author: Richard Schoeller <[email protected]> Date: Sat Apr 29 20:40:55 2017 -0400 Merge pull request #298 from dickschoeller/273-gedobject-complexity Fixes #273 - GedObject complexity commit 9f476e4 Author: Richard Schoeller <[email protected]> Date: Sat Apr 29 20:19:20 2017 -0400 remove an extraneous method and some suppressions commit d1bfe86 Author: Richard Schoeller <[email protected]> Date: Sat Apr 29 19:56:40 2017 -0400 remove more warnings commit 7eea281 Author: Richard Schoeller <[email protected]> Date: Sat Apr 29 19:09:06 2017 -0400 Fixes #273 - GedObject complexity * Break up interfaces * Default methods * Make an abstract class to implement finding commit 27cef57 Merge: 273777b 986a64c Author: Richard Schoeller <[email protected]> Date: Sat Apr 29 15:26:19 2017 -0400 Merge pull request #297 from dickschoeller/274-geddocumentmongo-complexity Fixes #274 - GedDocumentMongo complexity commit 986a64c Author: Richard Schoeller <[email protected]> Date: Sat Apr 29 15:04:17 2017 -0400 fix configurations of spring-boot-maven-plugin for travis commit e79f9dd Author: Richard Schoeller <[email protected]> Date: Sat Apr 29 14:31:49 2017 -0400 Fixes #274 - GedDocumentMongo complexity * Remove setType from interface GedDocument * Remove setType, getType and type from GedDocumentMongo * Implement getType in derivatives of GedDocumentMongo commit 273777b Merge: 22ac801 a0951a3 Author: Richard Schoeller <[email protected]> Date: Sat Apr 29 12:54:22 2017 -0400 Merge pull request #296 from dickschoeller/275-person-controller-complexity Fixes #275 - PersonController has poor complexity metrics commit a0951a3 Author: Richard Schoeller <[email protected]> Date: Sat Apr 29 11:52:39 2017 -0400 further refinement commit 71442ff Author: Richard Schoeller <[email protected]> Date: Sat Apr 29 11:28:30 2017 -0400 Fixes #275 - PersonController has poor complexity metrics * Added additional abstraction layers for geo and dated controllers * Moved some behavior into methods that reduce the complexity of caller commit 22ac801 Merge: 175b829 334d151 Author: Richard Schoeller <[email protected]> Date: Fri Apr 28 08:34:53 2017 -0400 Merge pull request #294 from dickschoeller/straighten-out-docker-stuff docker tag handling was off commit 334d151 Author: Richard Schoeller <[email protected]> Date: Fri Apr 28 08:08:02 2017 -0400 docker tag handling was off commit 175b829 Author: Richard Schoeller <[email protected]> Date: Fri Apr 28 01:00:34 2017 -0400 one more bit on docker image publishing commit db2ea71 Author: Richard Schoeller <[email protected]> Date: Fri Apr 28 00:40:16 2017 -0400 fix docker image publishing for release versions commit 64f0e97 Author: Richard Schoeller <[email protected]> Date: Fri Apr 28 00:27:38 2017 -0400 version numbers in more files commit 17d7445 Author: Richard Schoeller <[email protected]> Date: Fri Apr 28 00:21:33 2017 -0400 finish fixing version numbers commit 8add08a Merge: 77e215d 9f320ca Author: Richard Schoeller <[email protected]> Date: Fri Apr 28 00:19:00 2017 -0400 Merge branch 'master' into development commit 77e215d Author: Richard Schoeller <[email protected]> Date: Fri Apr 28 00:03:04 2017 -0400 update pom files to new target version
dickschoeller · May 31, 2017 · c858cb7 · c858cb7
1 parent 876294d
commit c858cb7
Show file tree

Hide file tree

Showing 64 changed files with 486 additions and 482 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -71,7 +71,7 @@ after_success:
   - mvn integration-test verify --settings=../config/settings.xml -B ${INTEGRATION_TEST_ARGS} -Dselenium.browser.name=iexplore      -Dselenium.platform=win8  -Dselenium.timeout=45 -Dselenium.version=3.3.1 2>&1 | grep 'Tests run'
   - mvn integration-test verify --settings=../config/settings.xml -B ${INTEGRATION_TEST_ARGS} -Dselenium.browser.name=MicrosoftEdge -Dselenium.platform=win10 -Dselenium.timeout=45 -Dselenium.version=3.3.1 2>&1 | grep 'Tests run'
   - mvn integration-test verify --settings=../config/settings.xml -B ${INTEGRATION_TEST_ARGS} -Dselenium.browser.name=chrome        -Dselenium.platform=win10 -Dselenium.timeout=45 -Dselenium.version=3.3.1 2>&1 | grep 'Tests run'
+  - mvn integration-test verify --settings=../config/settings.xml -B ${INTEGRATION_TEST_ARGS} -Dselenium.browser.name=firefox       -Dselenium.platform=win8  -Dselenium.timeout=45 -Dselenium.version=3.3.1 2>&1 | grep 'Tests run'
   - cd ..
   - ./config/before-deploy.sh
   - ./config/deploy.sh
-#  - mvn integration-test verify --settings=../config/settings.xml -B ${INTEGRATION_TEST_ARGS} -Dselenium.browser.name=firefox       -Dselenium.platform=linux -Dselenium.timeout=45 -Dselenium.version=3.3.1 2>&1 | grep 'Tests run'
diff --git a/README.md b/README.md
@@ -24,7 +24,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.3.jar
+* java -jar gedbrowser/target/gedbrowser-1.2.0.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
@@ -79,6 +79,12 @@ can be adjusted in the file application.yml.
 * ![](images/versioneye-25.png)
   [VersionEye](https://www.versioneye.com/user/projects/58987dc1f55eb2003257f7bd?child=summary#tab-dependencies)
   dependency analysis
+* ![](images/docker-25.png)
+  [Docker Hub](https://hub.docker.com/r/dickschoeller/)
+  docker image repository
+* ![](images/nexus-25.png)
+  [OSS Nexus Repository](https://oss.sonatype.org/)
+  Java build artifact repository
 
 ## Technology
 

diff --git a/config/#release.sh# b/config/#release.sh#
diff --git a/config/.#release.sh b/config/.#release.sh
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.1.3' || $TRAVIS_BRANCH == 'development' ) ]]; then
+if [[ $TRAVIS_PULL_REQUEST == 'false' && ( $TRAVIS_BRANCH == '1.2.0' || $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.1.3' || $TRAVIS_BRANCH == 'development' ) ]]; then
+if [[ $TRAVIS_PULL_REQUEST == 'false' && ( $TRAVIS_BRANCH == '1.2.0' || $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/config/gedbrowser_restart.sh b/config/gedbrowser_restart.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+export GEDBROWSER_HOME=/var/lib/gedbrowser
+export DATA_DIR=/home/dick/data
+
+docker stop gedbrowser gedbrowser-snapshot
+docker stop geoservice geoservice-snapshot
+docker stop mongo
+
+docker rm gedbrowser gedbrowser-snapshot geoservice geoservice-snapshot mongo
+docker rmi $(docker images | grep none | awk '{ print $3 }' )
+docker rmi mongo
+docker rmi dickschoeller/geoservice:latest
+docker rmi dickschoeller/gedbrowser:latest
+docker rmi $(docker images | grep dickschoeller | awk '{ print $3 }' )
+
+docker run -v ${DATA_DIR}:/data/db --name mongo -p 28001:27017 -d mongo
+docker run --link mongo:mongo -v ${GEDBROWSER_HOME}:/var/lib/gedbrowser -p 8086:8080 -p 8087:8081 --name geoservice -d dickschoeller/geoservice
+docker run --link geoservice:geoservice --link mongo:mongo -v ${GEDBROWSER_HOME}:/var/lib/gedbrowser -p 8082:8080 -p 8083:8081 --name gedbrowser -d dickschoeller/gedbrowser
diff --git a/config/pmd.xml b/config/pmd.xml
@@ -831,7 +831,7 @@ public class Foo {
     </example>
 	</rule>
 
-	<rule name="UnusedModifier" language="java" since="1.02"
+	<!-- rule name="UnusedModifier" language="java" since="1.02"
 		message="Avoid modifiers which are implied by the context"
 		class="net.sourceforge.pmd.lang.java.rule.unusedcode.UnusedModifierRule"
 		externalInfoUrl="https://pmd.github.io/pmd-5.5.1/pmd-java/rules/java/unusedcode.html#UnusedModifier">
@@ -854,7 +854,7 @@ public class Bar {
 }
  ]]>
      </example>
-	</rule>
+	</rule -->
 	<!-- imports -->
 	<rule name="DuplicateImports" since="0.5"
 		message="Avoid duplicate imports such as ''{0}''"

diff --git a/config/release.sh b/config/release.sh
@@ -1,16 +1,18 @@
 #!/bin/bash
 
 # Announce the current version. Get the next
-development_version=$(grep SNAPSHOT pom.xml | sed -e 's/.*[<]version[>]//' -e 's@[<]/version[>]@@')
+development_version=$(grep '[<]version[>].*SNAPSHOT' pom.xml | head -n 1 | sed -e 's/.*[<]version[>]//' -e 's@[<]/version[>]@@')
 release_version=$(echo $development_version | sed -e 's/-SNAPSHOT//');
 echo "Current development version is: $development_version"
 echo "Release version will be $release_version"
 read -p "Enter next release target: " next_target
 new_development_version=${next_target}-SNAPSHOT
+echo "New development version will be $new_development_version"
 
 # Merge to master
 git checkout master
-git merge development
+git pull
+git merge --squash development
 
 # Fix the version numbers in files.
 sed -i -e "s/$development_version/$release_version/" pom.xml */pom.xml
@@ -38,7 +40,7 @@ git status
 while true; do
     read -p "Proceed?" yn
     case $yn in
-        [Yy]* ) make install; break;;
+        [Yy]* ) mvn install; break;;
         [Nn]* ) exit;;
         * ) echo "Please answer yes or no.";;
     esac
@@ -53,7 +55,8 @@ git push
 
 # Merge back to development
 git checkout development
-git merge master
+##### this next step doesn't work ####
+git merge --squash master
 
 # Fix up the pom files.
 sed -i -e "s/$release_version/$new_development_version/" pom.xml */pom.xml
@@ -67,9 +70,8 @@ sed -i -e "s/$release_version/$new_development_version/" geoservice/src/main/jav
 sed -i -e "s/$release_version/$new_development_version/" geoservice/src/main/resources/banner.txt
 sed -i -e "s/$release_version/$new_development_version/" README.md
 
-# Fix published docker version
 sed -i -e "s/docker.image.tag.$release_version/docker.image.tag>snapshot/" pom.xml
-sed -i -e 's/imageTag>snapshot/imageTag>latest/' gedbrowser/pom.xml geoservice/pom.xml
+sed -i -e 's/imageTag>latest/imageTag>snapshot/' gedbrowser/pom.xml geoservice/pom.xml
 
 git add -A
 git status

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.1.3</version>
+    <version>1.2.0</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -40,14 +40,13 @@
     <dependency>
       <groupId>org.schoellerfamily.gedbrowser</groupId>
       <artifactId>gedbrowser-datamodel</artifactId>
-      <version>${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.schoellerfamily.gedbrowser</groupId>
       <artifactId>gedbrowser-reader</artifactId>
-      <version>${project.parent.version}</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>

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.1.3</version>
+    <version>1.2.0</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -133,13 +133,12 @@
     <dependency>
       <groupId>org.schoellerfamily.gedbrowser</groupId>
       <artifactId>gedbrowser-datamodel</artifactId>
-      <version>${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.schoellerfamily.gedbrowser</groupId>
       <artifactId>gedbrowser-reader</artifactId>
-      <version>${project.parent.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>

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.1.3</version>
+    <version>1.2.0</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.1.3";
+    public static final String VERSION = "1.2.0";
     /** */
     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.1.3</version>
+    <version>1.2.0</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -40,14 +40,13 @@
     <dependency>
       <groupId>org.schoellerfamily.gedbrowser</groupId>
       <artifactId>gedbrowser-datamodel</artifactId>
-      <version>${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.schoellerfamily.gedbrowser</groupId>
       <artifactId>gedbrowser-reader</artifactId>
-      <version>${project.parent.version}</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

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.1.3</version>
+    <version>1.2.0</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -133,18 +133,16 @@
     <dependency>
       <groupId>org.schoellerfamily.gedbrowser</groupId>
       <artifactId>gedbrowser-dao</artifactId>
-      <version>${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.schoellerfamily.gedbrowser</groupId>
       <artifactId>gedbrowser-datamodel</artifactId>
-      <version>${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.schoellerfamily.gedbrowser</groupId>
       <artifactId>gedbrowser-reader</artifactId>
-      <version>${project.parent.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>

diff --git a/...rfamily/gedbrowser/persistence/mongo/gedconvert/GedObjectToGedDocumentMongoConverter.java b/...rfamily/gedbrowser/persistence/mongo/gedconvert/GedObjectToGedDocumentMongoConverter.java
@@ -121,11 +121,6 @@ public void loadAttributes(final GedDocument<?> document,
             final List<GedObject> gedAttributes) {
         document.clearAttributes();
         for (final GedObject ged : gedAttributes) {
-            // This happens because appenders create a list entry when they
-            // are not retained.
-            if (ged == null) {
-                continue;
-            }
             final GedDocument<?> documentAttribute =
                     createGedDocument(ged);
             document.addAttribute(documentAttribute);

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.1.3</version>
+    <version>1.2.0</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -40,8 +40,8 @@
     <dependency>
       <groupId>org.schoellerfamily.gedbrowser</groupId>
       <artifactId>gedbrowser-datamodel</artifactId>
-      <version>${project.parent.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>