Update Spring Boot 2.1.11.RELEASE and Spring Cloud Greenwich.SR4 #3047 (#307)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: mteodori

.editorconfig

@@ -0,0 +1,20 @@
+# Editor configuration, see http://editorconfig.org
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.java]
+indent_size = 4
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab

.travis.yml

@@ -1,13 +1,15 @@
 language: java
-sudo: required
+
+jdk:
+  - oraclejdk11
+
 cache:
   directories:
-  - $HOME/.m2
+    - ${HOME}/.m2/repository
 
 services:
   - docker
-jdk:
-  - openjdk11
+
 notifications:
   webhooks:
     urls:
@@ -16,13 +18,16 @@ notifications:
     on_failure: always  # options: [always|never|change] default: always
     on_start: never     # options: [always|never|change] default: always
 
+branches:
+  only:
+    - master
+
 before_script:
   - echo MAVEN_OPTS=-Xmx1536m > ~/.mavenrc
 
 # Enable integration tests
 script:
-  - mvn verify -B
-
+  - mvn verify -B -DskipITs=false
 
 # Send coverage data
 after_success:

pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.1.10.RELEASE</version>
+    <version>2.1.11.RELEASE</version>
     <relativePath /> <!-- lookup parent from repository -->
   </parent>
   <groupId>org.activiti.cloud.examples</groupId>
@@ -21,12 +21,7 @@
     <tag>HEAD</tag>
   </scm>
   <properties>
-    <java.version>11</java.version>
     <activiti-cloud-notifications-service-graphql.version>7.1.201</activiti-cloud-notifications-service-graphql.version>
-    <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
-    <maven-failsafe-plugin.version>3.0.0-M3</maven-failsafe-plugin.version>
-    <maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
-    <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version> <!-- required for jx -->
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -84,32 +79,21 @@
       <version>${activiti-cloud-notifications-service-graphql.version}</version>
       <type>pom</type>
     </dependency>
-
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-parent</artifactId>
       <version>${project.parent.version}</version>
       <type>pom</type>
     </dependency>
     <!-- Marker Pom for Dependency Conversion Validation  -->
-
   </dependencies>
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${maven-compiler-plugin.version}</version>
+        <groupId>pl.project13.maven</groupId>
+        <artifactId>git-commit-id-plugin</artifactId>
         <configuration>
-          <release>${java.version}</release>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
-          <showDeprecation>true</showDeprecation>
-          <showWarnings>true</showWarnings>
-          <optimize>true</optimize>
-          <compilerArgs>
-              <arg>-parameters</arg>
-          </compilerArgs>
+          <verbose>false</verbose>
         </configuration>
       </plugin>
       <plugin>
@@ -118,50 +102,21 @@
         <executions>
           <execution>
             <goals>
-              <goal>repackage</goal>
+              <goal>build-info</goal>
             </goals>
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>${maven-deploy-plugin.version}</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${maven-surefire-plugin.version}</version>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>${maven-failsafe-plugin.version}</version>
-        <configuration>
-          <forkCount>0</forkCount>
-          <useSystemClassLoader>false</useSystemClassLoader>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
     </plugins>
   </build>
   <repositories>
     <repository>
       <id>activiti-releases</id>
-      <name>Activiti Releases</name>
-      <url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-releases/</url>
-    </repository>
-    <repository>
-      <id>activiti-snapsots</id>
-      <name>Activiti Snapshots</name>
-      <url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-snapshots/</url>
+      <url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-releases</url>
     </repository>
   </repositories>
 </project>

src/main/resources/application.properties

@@ -19,10 +19,10 @@ spring.rabbitmq.host=${ACT_RABBITMQ_HOST:rabbitmq}
 spring.rabbitmq.username=${ACT_RABBITMQ_USER:guest}
 spring.rabbitmq.password=${ACT_RABBITMQ_PASS:guest}
 
-#zipkin
-spring.zipkin.base-url= http://zipkin:80/
-spring.zipkin.sender.type= web
-spring.sleuth.enabled = true
-spring.sleuth.sampler.probability = 1.0
+# zipkin (set spring.zipkin.enabled to true to activate)
+spring.zipkin.enabled=false
+spring.zipkin.base-url=http://zipkin:80/
+spring.zipkin.sender.type=web
+spring.sleuth.sampler.probability=1.0
 
 activiti.cloud.application.name=notifications-graphql

src/main/resources/logback-spring.xml

@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <configuration>
-  <springProfile name="kube">
+  <springProfile name="kubernetes">
     <appender name="stash" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
       <destination>logstash:5000</destination>
-
       <encoder class="net.logstash.logback.encoder.LogstashEncoder"/>
     </appender>
-
     <root level="INFO">
       <appender-ref ref="stash"/>
     </root>
   </springProfile>
-  <springProfile name="!kube,local">
+  <springProfile name="!kubernetes,local">
     <include resource="org/springframework/boot/logging/logback/base.xml"/>
     <logger name="org.springframework.web" level="INFO"/>
   </springProfile>