Merge pull request #348 from snieguu/master

Version 2.67.1, fix maven build
bitbar · Nov 13, 2018 · 6d845e9 · 6d845e9
2 parents c5f21f8 + e4abc3c
commit 6d845e9
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 35 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -0,0 +1,25 @@
+#!/usr/bin/env groovy
+node('linux && maven && gpg') {
+    ansiColor('xterm') {
+        stage('Checkout') {
+            checkout([
+                    $class           : 'GitSCM',
+                    branches         : [
+                            [
+                                    name: env.BRANCH
+                            ]
+                    ],
+                    userRemoteConfigs: [
+                            [
+                                    credentialsId: 'f652697e-beb7-4724-b1b5-4913a2bf45f5',
+                                    url          : '[email protected]:bitbar/testdroid-api.git'
+                            ]
+                    ]
+            ])
+        }
+
+        stage('Build') {
+            sh('mvn clean package source:jar javadoc:jar gpg:sign deploy:deploy -DaltDeploymentRepository=ossrh::default::https://oss.sonatype.org/service/local/staging/deploy/maven2/')
+        }
+    }
+}
diff --git a/pom.xml b/pom.xml
@@ -1,11 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.testdroid</groupId>
     <artifactId>testdroid-api</artifactId>
-    <version>2.67</version>
+    <version>2.67.1</version>
     <packaging>jar</packaging>
     <name>Testdroid API v2</name>
     <url>https://github.com/bitbar/testdroid-api</url>
@@ -14,14 +12,13 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <jackson.version>2.9.6</jackson.version>
-        <slf4j.version>1.7.25</slf4j.version>
-        <junit.jupiter.version>5.3.1</junit.jupiter.version>
-        <org.apache.commons.io.version>2.6</org.apache.commons.io.version>
-        <org.apache.commons.lang3.version>3.8.1</org.apache.commons.lang3.version>
-        <org.apache.httpcomponents.httpclient.version>4.5.6</org.apache.httpcomponents.httpclient.version>
-        <com.google.http-client>1.26.0</com.google.http-client>
+        <slf4j.version>1.7.13</slf4j.version>
+        <junit.jupiter.version>5.2.0</junit.jupiter.version>
+        <org.apache.commons.io.version>2.5</org.apache.commons.io.version>
+        <org.apache.commons.lang3.version>3.3.2</org.apache.commons.lang3.version>
+        <org.apache.httpcomponents.httpclient.version>4.5.2</org.apache.httpcomponents.httpclient.version>
+        <com.google.http-client>1.25.0</com.google.http-client>
         <hamcrest.version>2.0.0.0</hamcrest.version>
-        <surefire.booter.version>2.22.1</surefire.booter.version>
     </properties>
     <scm>
         <connection>scm:git:git://github.com:bitbar/testdroid-api.git</connection>
@@ -54,13 +51,22 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.2</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
                     <forceJavacCompilerUse>true</forceJavacCompilerUse>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.1</version>
+                <!--Workaround for https://issues.apache.org/jira/browse/SUREFIRE-1588-->
+                <configuration>
+                    <useSystemClassLoader>false</useSystemClassLoader>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>3.1.0</version>
@@ -81,29 +87,21 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
+                <artifactId>maven-gpg-plugin</artifactId>
                 <configuration>
-                    <argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
+                    <gpgArguments>
+                        <arg>--pinentry-mode</arg>
+                        <arg>loopback</arg>
+                    </gpgArguments>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-gpg-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>sign-artifacts</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>sign</goal>
-                        </goals>
-                        <configuration>
-                            <gpgArguments>
-                                <arg>--pinentry-mode</arg>
-                                <arg>loopback</arg>
-                            </gpgArguments>
-                        </configuration>
-                    </execution>
-                </executions>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.0.0</version>
+                <configuration>
+                    <additionalJOption>-Xdoclint:none</additionalJOption>
+                </configuration>
             </plugin>
         </plugins>
     </build>
@@ -161,10 +159,5 @@
             <version>${hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.maven.surefire</groupId>
-            <artifactId>surefire-booter</artifactId>
-            <version>${surefire.booter.version}</version>
-        </dependency>
     </dependencies>
 </project>