Merge pull request #85 from andham/misc-fixes

mojohaus · Jan 21, 2020 · 5b8a1cf · 5b8a1cf
2 parents 9dd13af + 6c0cbf5
commit 5b8a1cf
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,19 @@
+# Need trusty distro to work with java <9
+dist: trusty
 language: java
+env:
+  - MAVEN_VERSION=3.3.9
+  - MAVEN_VERSION=3.5.4
+  - MAVEN_VERSION=3.6.3
 jdk:
   - openjdk7
-  - oraclejdk8
-script: "mvn --show-version --errors --batch-mode -Prun-its clean verify"
+  - openjdk8
+  - openjdk11
+install:
+  # Specify version of io.takari:maven that supports Java 7
+  - "mvn -N io.takari:maven:0.5.0:wrapper -Dmaven=${MAVEN_VERSION}"
+  - "./mvnw --show-version --errors --batch-mode validate dependency:go-offline"
+script: "./mvnw --show-version --errors --batch-mode -Prun-its clean verify"
 cache:
     directories:
     - $HOME/.m2

diff --git a/src/it/settings.xml b/src/it/settings.xml
@@ -37,17 +37,6 @@ under the License.
             <enabled>true</enabled>
           </snapshots>
         </repository>
-        <repository>
-          <id>codehaus.snapshots</id>
-          <name>Codehaus Snapshot Repository</name>
-          <url>http://snapshots.repository.codehaus.org/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
       </repositories>
       <pluginRepositories>
         <pluginRepository>

diff --git a/src/it/surefire/pom.xml b/src/it/surefire/pom.xml
@@ -21,14 +21,25 @@
 
     <defaultGoal>package</defaultGoal>
 
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.1</version>
+          <configuration>
+            <source>1.7</source>
+            <target>1.7</target>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
-
       <plugin>
-
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>        
+        <groupId>@project.groupId@</groupId>
+        <artifactId>@project.artifactId@</artifactId>
+        <version>@project.version@</version>
         <executions>
-
           <execution>
             <id>reserve-ports</id>
             <phase>process-test-resources</phase>
@@ -49,25 +60,21 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId> 
         <version>2.9</version>
-          <configuration>
-            <!-- surefire cant see this system property, will be fixed in surefire 2.5 see SUREFIRE-511 -->
-            <systemProperties>
-              <property>
-                <name>port1</name>
-                <value>${port1}</value>
-              </property>            
-            </systemProperties>
-
-            <!-- but env can see this -->
-            <environmentVariables>
-              <port1>${port1}</port1>
-              <targetDir>${project.build.directory}</targetDir>
-            </environmentVariables>
-          </configuration>
-    </plugin>
+        <configuration>
+          <systemProperties>
+            <property>
+              <name>port1</name>
+              <value>${port1}</value>
+            </property>            
+          </systemProperties>
+          <environmentVariables>
+            <port1>${port1}</port1>
+            <targetDir>${project.build.directory}</targetDir>
+          </environmentVariables>
+        </configuration>
+      </plugin>
     </plugins>
 
-
   </build>
 
   <properties>