JDK11 & SpringBoot 2.1 (#20)

julian-eggers · Nov 9, 2018 · 1194e05 · 1194e05
1 parent eeabe9d
commit 1194e05
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 118 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 /.settings/
 /.classpath
 /.project
+/.factorypath
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: java
 
 jdk:
-  - oraclejdk9
+  - oraclejdk11  
 
 cache:
   directories:
@@ -10,9 +10,8 @@ cache:
 install: mvn package -Dgpg.skip=true
 
 before_install:
-  - sudo apt-get install jq
-  - wget -O ~/codacy-coverage-reporter-assembly-latest.jar $(curl https://api.github.com/repos/codacy/codacy-coverage-reporter/releases/latest | jq -r .assets[0].browser_download_url)
+  - wget -O ~/codacy-coverage-reporter-assembly.jar https://github.com/codacy/codacy-coverage-reporter/releases/download/4.0.5/codacy-coverage-reporter-4.0.5-assembly.jar
 
 after_success:
   - mvn coveralls:report
-  - java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter -l Java -r target/site/jacoco/jacoco.xml
+  - java -jar ~/codacy-coverage-reporter-assembly.jar report -l Java -r target/site/jacoco/jacoco.xml
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:9-jre-slim
+FROM openjdk:11-jre-slim
 EXPOSE 8080
 ADD target/dockerhub-webhook-forwarder.jar dockerhub-webhook-forwarder.jar
-ENTRYPOINT ["java", "-jar", "-Dfile.encoding=UTF-8", "-Djava.security.egd=file:/dev/./urandom", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "dockerhub-webhook-forwarder.jar"]
+ENTRYPOINT ["java", "-jar", "-Dfile.encoding=UTF-8", "-Djava.security.egd=file:/dev/./urandom", "dockerhub-webhook-forwarder.jar"]
diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/README.md b/README.md
@@ -54,3 +54,17 @@ You can choose between the [original event](https://docs.docker.com/docker-hub/w
 | --webhookevent.forward.awssqs.queues.compressed | no |  |  |
 
 You have to specify at least one queue.
+
+
+
+## Build & Release
+
+### Build
+```
+mvn clean package dockerfile:build
+```
+
+### Release
+```
+mvn clean package dockerfile:build dockerfile:tag@tag-latest dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version github-release:release
+```
diff --git a/pom.xml b/pom.xml
@@ -5,29 +5,28 @@
   <name>dockerhub-webhook-forwarder</name>
   <description>Provides a dockerhub webhook-endpoint and forwards events to a rabbitmq.</description>
   <url>https://github.com/julian-eggers/dockerhub-webhook-forwarder</url>
-  <version>0.7.0-RELEASE</version>
+  <version>0.7.1-RELEASE</version>
 
   <properties>
     <!-- System -->
     <timestamp>${maven.build.timestamp}</timestamp>
     <maven.build.timestamp.format>dd.MM.yyyy HH:mm</maven.build.timestamp.format>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>9</java.version>
+    <java.version>11</java.version>
     <!-- Testing -->
-    <jacoco.version>0.8.0</jacoco.version>
-    <powermock.version>2.0.0-beta.5</powermock.version>
-    <easymock.version>3.5.1</easymock.version>
+    <jacoco.version>0.8.2</jacoco.version>
+    <powermock.version>2.0.0-RC.3</powermock.version>
+    <easymock.version>4.0.1</easymock.version>
     <!-- Build -->
-    <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
     <coveralls.version>4.3.0</coveralls.version>
-    <dockerfile-maven-plugin.version>1.3.7</dockerfile-maven-plugin.version>
-    <github-release-plugin.version>1.2.0</github-release-plugin.version>
+    <dockerfile-maven-plugin.version>1.4.8</dockerfile-maven-plugin.version>
+    <github-release-plugin.version>1.3.0</github-release-plugin.version>
   </properties>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.0.0.RELEASE</version>
+    <version>2.1.0.RELEASE</version>
   </parent>
 
   <dependencies>
@@ -69,7 +68,7 @@
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-aws-messaging</artifactId>
-      <version>1.2.2.RELEASE</version>
+      <version>2.0.1.RELEASE</version>
     </dependency>
 
     <!-- Other -->
@@ -81,7 +80,7 @@
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
-      <version>20180130</version>
+      <version>20180813</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
@@ -177,30 +176,8 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-javadocs</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-gpg-plugin</artifactId>
-        <version>${maven-gpg-plugin.version}</version>
-        <executions>
-          <execution>
-            <id>sign-artifacts</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>sign</goal>
-            </goals>
-          </execution>
-        </executions>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>pl.project13.maven</groupId>
@@ -268,7 +245,7 @@
         <groupId>org.eluder.coveralls</groupId>
         <artifactId>coveralls-maven-plugin</artifactId>
         <version>${coveralls.version}</version>
-        <!-- Required to support Java 9 -->
+        <!-- Required to support Jigsaw -->
         <dependencies>
           <dependency>
             <groupId>javax.xml.bind</groupId>
@@ -328,19 +305,6 @@
             </configuration>
           </execution>
         </executions>
-        <!-- Required to support Java 9 -->
-        <dependencies>
-          <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-archiver</artifactId>
-            <version>3.4</version>
-          </dependency>
-          <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>javax.activation-api</artifactId>
-            <version>1.2.0</version>
-          </dependency>
-        </dependencies>
       </plugin>
       <plugin>
         <groupId>de.jutzig</groupId>