Correct AppVeyor build for Java 7 and 11

Simplify build configuration and use default Maven version
mojohaus · Nov 25, 2018 · ffaa5c7 · ffaa5c7
1 parent a95178e
commit ffaa5c7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,25 +1,15 @@
 version: '{build}'
+image:
+  - Visual Studio 2017
 skip_tags: true
 clone_depth: 10
 environment:
   matrix:
     - JAVA_HOME: C:\Program Files\Java\jdk1.7.0
     - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
-    - JAVA_HOME: C:\Program Files\Java\jdk11.0
+    - JAVA_HOME: C:\Program Files\Java\jdk11
 
-install:
-  - ps: |
-      Add-Type -AssemblyName System.IO.Compression.FileSystem
-      if (!(Test-Path -Path "C:\maven" )) {
-        (new-object System.Net.WebClient).DownloadFile('https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip', 'C:\maven-bin.zip')
-        [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
-      }
-# Prepend Java entry, remove Ruby entry (C:\Ruby193\bin;) from PATH
-  - cmd: SET PATH=C:\maven\apache-maven-3.6.0\bin;%JAVA_HOME%\bin;%PATH:C:\Ruby193\bin;=%
-  - cmd: SET MAVEN_OPTS=-Xmx768m
-  - cmd: mvn --version
-  - cmd: java -version
 build_script:
-  - mvn -B clean verify
+  - mvn -B -V clean verify -Dhttps.protocols=TLSv1.2
 cache:
   - C:\Users\appveyor\.m2
diff --git a/pom.xml b/pom.xml
@@ -153,15 +153,6 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <version>2.22.1</version>
         </plugin>
-        <plugin>
-          <artifactId>maven-surefire-resport-plugin</artifactId>
-          <version>2.22.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>cobertura-maven-plugin</artifactId>
-          <version>2.7</version>
-        </plugin>
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
           <version>3.7.1</version>
@@ -217,6 +208,10 @@
           <preBuildHookScript>setup</preBuildHookScript>
           <postBuildHookScript>verify</postBuildHookScript>
           <addTestClassPath>true</addTestClassPath>
+          <properties>
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+            <https.protocols>TLSv1.2</https.protocols>
+          </properties>
           <filterProperties>
             <enforcerPluginVersion>${enforcerPluginVersion}</enforcerPluginVersion>
           </filterProperties>
@@ -242,7 +237,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-invoker-plugin</artifactId>
-          <version>1.10</version>
+          <version>3.0.1</version>
         </plugin>
       </plugins>
   </reporting>