Fix up the explicit dependencies in pom files based on reports

from maven-dependency-plugin. Fix up deploy and release scripts to publish release jars. Needed a substitution to bring those up to publish jars at the latest release version. Fixes #668 Fixes #671 Fixes #672 Fixes #673 Fixes #674 Fixes #675 Fixes #676 Fixes #677 Fixes #678 Fixes #679 Fixes #680 Fixes #681 Fixes #682
dickschoeller · May 1, 2018 · 1a9dfe1 · 1a9dfe1
1 parent ad1488b
commit 1a9dfe1
Show file tree

Hide file tree

Showing 18 changed files with 158 additions and 79 deletions.
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.2.2' || $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.2.2' || $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/config/release.sh b/config/release.sh
@@ -27,6 +27,8 @@ sed -i -e "s/$development_version/$release_version/" geoservice/src/main/resourc
 sed -i -e "s/$development_version/$release_version/" README.md
 sed -i -e "s/$development_version/$release_version/" gedbrowser-api/src/main/resources/banner.txt
 sed -i -e "s/$development_version/$release_version/" gedbrowser-api/src/main/docker/Dockerfile
+sed -i -e "s/XXXXXX/$release_version/" config/deploy.sh
+sed -i -e "s/XXXXXX/$release_version/" config/before-deploy.sh
 
 # Fix published docker version
 sed -i -e "s/docker.image.tag.snapshot/docker.image.tag>$release_version/" pom.xml
@@ -76,6 +78,8 @@ sed -i -e "s/$release_version/$new_development_version/" gedbrowser-api/src/main
 
 sed -i -e "s/docker.image.tag.$release_version/docker.image.tag>snapshot/" pom.xml
 sed -i -e 's/imageTag>latest/imageTag>snapshot/' gedbrowser/pom.xml geoservice/pom.xml gedbrowser-api/pom.xml
+sed -i -e "s/$release_version/XXXXXX/" config/deploy.sh
+sed -i -e "s/$release_version/XXXXXX/" config/before-deploy.sh
 
 git add -A
 git status

diff --git a/gedbrowser-analytics/pom.xml b/gedbrowser-analytics/pom.xml
@@ -57,6 +57,11 @@
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/gedbrowser-api/pom.xml b/gedbrowser-api/pom.xml
@@ -68,6 +68,10 @@
       <groupId>org.schoellerfamily.gedbrowser</groupId>
       <artifactId>gedbrowser-mongo-dao</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.schoellerfamily.gedbrowser</groupId>
+      <artifactId>gedbrowser-dao</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -82,15 +86,19 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-security</artifactId>
     </dependency -->
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-expression</artifactId>
-    </dependency>
     <!-- end questionable -->
     <dependency>
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-mongodb</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
 
     <!-- Testing dependencies -->
     <dependency>
@@ -108,6 +116,11 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <reporting>

diff --git a/gedbrowser-dao/pom.xml b/gedbrowser-dao/pom.xml
@@ -134,12 +134,6 @@
       <groupId>org.schoellerfamily.gedbrowser</groupId>
       <artifactId>gedbrowser-datamodel</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.schoellerfamily.gedbrowser</groupId>
-      <artifactId>gedbrowser-reader</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
 
     <dependency>
       <groupId>org.springframework</groupId>
@@ -153,10 +147,6 @@
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-commons</artifactId>
     </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>junit</groupId>

diff --git a/gedbrowser-geographics/pom.xml b/gedbrowser-geographics/pom.xml
@@ -52,6 +52,14 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>junit</groupId>

diff --git a/gedbrowser-mongo-dao/pom.xml b/gedbrowser-mongo-dao/pom.xml
@@ -162,8 +162,12 @@
       <artifactId>spring-data-mongodb</artifactId>
     </dependency>
     <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib</artifactId>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
     </dependency>
 
     <dependency>
@@ -176,15 +180,5 @@
       <artifactId>spring-test</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>log4j-over-slf4j</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/gedbrowser-reader/pom.xml b/gedbrowser-reader/pom.xml
@@ -54,6 +54,11 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/gedbrowser-renderer/pom.xml b/gedbrowser-renderer/pom.xml
@@ -60,6 +60,26 @@
       <groupId>org.schoellerfamily.gedbrowser</groupId>
       <artifactId>geoservice-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.schoellerfamily.gedbrowser</groupId>
+      <artifactId>geoservice-persistence</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>de.grundid.opendatalab</groupId>
+      <artifactId>geojson-jackson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>junit</groupId>

diff --git a/gedbrowser-writer/pom.xml b/gedbrowser-writer/pom.xml
@@ -64,6 +64,11 @@
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/gedbrowser/pom.xml b/gedbrowser/pom.xml
@@ -70,15 +70,15 @@
     </dependency>
     <dependency>
       <groupId>org.schoellerfamily.gedbrowser</groupId>
-      <artifactId>gedbrowser-mongo-dao</artifactId>
+      <artifactId>gedbrowser-dao</artifactId>
     </dependency>
     <dependency>
       <groupId>org.schoellerfamily.gedbrowser</groupId>
-      <artifactId>gedbrowser-analytics</artifactId>
+      <artifactId>gedbrowser-mongo-dao</artifactId>
     </dependency>
     <dependency>
       <groupId>org.schoellerfamily.gedbrowser</groupId>
-      <artifactId>gedbrowser-geographics</artifactId>
+      <artifactId>gedbrowser-analytics</artifactId>
     </dependency>
     <dependency>
       <groupId>org.schoellerfamily.gedbrowser</groupId>
@@ -117,6 +117,14 @@
       <groupId>org.springframework.data</groupId>
       <artifactId>spring-data-mongodb</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+    </dependency>
 
     <!-- Testing dependencies -->
     <dependency>
@@ -185,6 +193,11 @@
       <artifactId>sauce_junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <reporting>

diff --git a/geoservice-client/pom.xml b/geoservice-client/pom.xml
@@ -149,10 +149,6 @@
       <artifactId>geoservice-persistence</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>de.grundid.opendatalab</groupId>
-      <artifactId>geojson-jackson</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter</artifactId>
@@ -162,16 +158,12 @@
       <artifactId>spring-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
     </dependency>
 
     <dependency>

diff --git a/geoservice-common/pom.xml b/geoservice-common/pom.xml
@@ -147,20 +147,12 @@
       <artifactId>spring-data-commons</artifactId>
     </dependency>
     <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib</artifactId>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
     </dependency>
 
     <dependency>

diff --git a/geoservice-persistence-mongo/pom.xml b/geoservice-persistence-mongo/pom.xml
@@ -152,8 +152,16 @@
       <artifactId>spring-data-mongodb</artifactId>
     </dependency>
     <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib</artifactId>
+      <groupId>com.google.maps</groupId>
+      <artifactId>google-maps-services</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
     </dependency>
 
     <dependency>
@@ -166,15 +174,5 @@
       <artifactId>spring-test</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>log4j-over-slf4j</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/geoservice-persistence/pom.xml b/geoservice-persistence/pom.xml
@@ -155,20 +155,12 @@
       <artifactId>spring-data-commons</artifactId>
     </dependency>
     <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib</artifactId>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
     </dependency>
 
     <dependency>