Upgrade baseline, java 8, fix maven build (#37)

* Upgrade baseline, java 8, fix maven build * Update pom.xml * Rerun CI * Use 2.60.3 jackson-api plugin requires it
jenkinsci · Apr 29, 2019 · e4279a1 · e4279a1
1 parent d5b1f14
commit e4279a1
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 15 deletions.
diff --git a/azure-commons-core/pom.xml b/azure-commons-core/pom.xml
@@ -30,11 +30,6 @@
             <artifactId>java-jwt</artifactId>
             <version>3.2.0</version>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/azure-commons-plugin/pom.xml b/azure-commons-plugin/pom.xml
@@ -60,6 +60,7 @@
                 <groupId>org.jenkins-ci.tools</groupId>
                 <artifactId>maven-hpi-plugin</artifactId>
                 <configuration>
+                    <minimumJavaVersion>1.8</minimumJavaVersion>
                     <maskClasses>
                         com.google.common.base.
                     </maskClasses>

diff --git a/...-plugin/src/main/java/com/microsoft/jenkins/azurecommons/telemetry/AppInsightsClient.java b/...-plugin/src/main/java/com/microsoft/jenkins/azurecommons/telemetry/AppInsightsClient.java
@@ -152,7 +152,7 @@ private Map<String, String> formalizeProperties(Map<String, String> properties)
     }
 
     private void putJenkinsInfo(final Map<String, String> properties) {
-        final Jenkins j = Jenkins.getInstance();
+        final Jenkins j = Jenkins.getInstanceOrNull();
         if (j == null) {
             properties.put(AppInsightsConstants.PROP_JENKINS_INSTANCE_ID, "local");
             properties.put(AppInsightsConstants.PROP_JENKINS_VERSION, "local");

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>2.11</version>
+        <version>3.42</version>
     </parent>
 
     <artifactId>azure-commons-parent</artifactId>
@@ -18,8 +18,8 @@
     </modules>
 
     <properties>
-        <jenkins.version>1.625.3</jenkins.version>
-        <java.level>7</java.level>
+        <jenkins.version>2.60.3</jenkins.version>
+        <java.level>8</java.level>
     </properties>
 
     <licenses>
@@ -59,21 +59,30 @@
     </pluginRepositories>
 
     <dependencies>
-        <dependency>
-            <groupId>org.jenkins-ci.main</groupId>
-            <artifactId>jenkins-core</artifactId>
-            <version>${jenkins.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure</artifactId>
             <version>1.3.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>20.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>jackson2-api</artifactId>
+            <version>2.9.8</version>
+        </dependency>
+
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -82,6 +91,41 @@
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.reactivex</groupId>
+                <artifactId>rxjava</artifactId>
+                <version>1.3.8</version>
+            </dependency>
+            <dependency>
+                <groupId>joda-time</groupId>
+                <artifactId>joda-time</artifactId>
+                <version>2.7</version>
+            </dependency>
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>3.12.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+                <version>2.9.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>2.9.8</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>3.8.1</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>
@@ -133,4 +177,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>