Skip to content
This repository has been archived by the owner on Nov 19, 2024. It is now read-only.

Commit

Permalink
update min Java version, Maven dependencies and plugins (#92)
Browse files Browse the repository at this point in the history 
* update Maven dependencies and plugins

Signed-off-by: Vincent Privat <[email protected]>

* fix Travis configuration

Signed-off-by: Vincent Privat <[email protected]>

* do not test jdk9 yet, revert maven-hpi-plugin update to keep jdk7

Signed-off-by: Vincent Privat <[email protected]>

* drop Java 7 support, update parent-pom to 3.0, fix enforcer/findbugs errors

* update to jacoco 0.8.0 + others, and fix Maven dependencies

* fix indentation in dependencyManagement block

* use Collections.singletonList() instead of Arrays.asList()
  • Loading branch information
@don-vip @centic9
don-vip authored and centic9 committed Jan 10, 2018
1 parent 9d25840 commit d04b509
Show file tree
Hide file tree
Showing 20 changed files with 189 additions and 111 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ language: java
sudo: false

jdk:
- oraclejdk7
- oraclejdk8
212 changes: 147 additions & 65 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.625.3</version>
<version>3.2</version>
<relativePath />
</parent>

Expand Down Expand Up @@ -97,7 +97,10 @@ THE SOFTWARE.
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.outputEncoding>UTF-8</project.build.outputEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jacoco.version>0.7.8</jacoco.version>
<java.level>8</java.level>
<jacoco.version>0.8.0</jacoco.version>
<jenkins.version>2.54</jenkins.version>
<maven.version>3.5.2</maven.version>
<powermock.version>1.6.6</powermock.version>
</properties>

Expand All @@ -119,7 +122,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>dashboard-view</artifactId>
<version>2.1</version>
<version>2.9.11</version>
<optional>true</optional>
<exclusions>
<exclusion>
Expand All @@ -135,26 +138,24 @@ THE SOFTWARE.
</dependency>
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>asm5</artifactId>
<version>5.0.1</version>
<artifactId>asm6</artifactId>
<version>6.0_BETA</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>5.0.1</version>
<scope>runtime</scope>
<version>6.0</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>5.0.1</version>
<scope>runtime</scope>
<version>6.0</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.4</version>
<version>3.5.1</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -189,40 +190,34 @@ THE SOFTWARE.
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>3.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>3.3.9</version>
<version>${maven.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>3.3.9</version>
<version>${maven.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>3.3.9</version>
<version>${maven.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
<version>3.3.9</version>
<version>${maven.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0.24</version>
<version>3.1.0</version>
</dependency>
<!-- Somehow we need org.w3c.dom.ElementTraversal, but do not get it from any of the dependencies
do not update to 2.x as it will not contain the class any more! -->
Expand All @@ -234,15 +229,116 @@ THE SOFTWARE.
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.1</version>
<version>4.4.8</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>structs</artifactId>
<version>1.2</version>
<version>1.10</version>
</dependency>
</dependencies>


<!-- enforce versions of transitive dependencies to match RequireUpperBoundDeps rule -->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.9.9</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.5</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-embedder</artifactId>
<version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-repository-metadata</artifactId>
<version>${maven.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>3.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
<version>1.7</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
<version>1.7.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
<version>3.2.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId>
<version>3.3.9</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
<version>2.5.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
<version>1.7.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.7.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
<version>1.24</version>
</dependency>
<dependency>
<groupId>org.jenkins-ci.main</groupId>
<artifactId>maven-plugin</artifactId>
<version>2.17</version>
</dependency>
</dependencies>
</dependencyManagement>

<distributionManagement>
<repository>
<id>maven.jenkins-ci.org</id>
Expand All @@ -255,7 +351,7 @@ THE SOFTWARE.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>1.3.1</version>
<version>3.1.0</version>
<executions>
<execution>
<phase>insert-test</phase>
Expand All @@ -276,20 +372,16 @@ THE SOFTWARE.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
<version>3.7.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.9</version>
<version>1.16</version>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java17</artifactId>
<artifactId>java18</artifactId>
<version>1.0</version>
</signature>
</configuration>
Expand Down Expand Up @@ -352,7 +444,6 @@ THE SOFTWARE.
<plugin>
<groupId>org.jenkins-ci.tools</groupId>
<artifactId>maven-hpi-plugin</artifactId>
<version>1.121</version>
<executions>
<execution>
<phase>compile</phase>
Expand All @@ -361,12 +452,33 @@ THE SOFTWARE.
</goals>
</execution>
</executions>

<configuration>
<pluginFirstClassLoader>true</pluginFirstClassLoader>
<maskClasses>org.objectweb.asm.</maskClasses>
</configuration>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>display-info</id>
<phase>validate</phase>
<goals>
<goal>display-info</goal>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<enforceBytecodeVersion>
<excludes>
<exclude>org.ow2.asm:*</exclude>
</excludes>
</enforceBytecodeVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
Expand All @@ -385,7 +497,7 @@ THE SOFTWARE.
<artifactId>
maven-hpi-plugin
</artifactId>
<versionRange>[1.64,)</versionRange>
<versionRange>[2.0,)</versionRange>
<goals>
<goal>hpi</goal>
<goal>apt-compile</goal>
Expand Down Expand Up @@ -418,22 +530,6 @@ THE SOFTWARE.
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.codehaus.groovy.maven
</groupId>
<artifactId>gmaven-plugin</artifactId>
<versionRange>[1.0-rc-5,)</versionRange>
<goals>
<goal>generateTestStubs</goal>
<goal>testCompile</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.jvnet.localizer</groupId>
Expand Down Expand Up @@ -477,20 +573,6 @@ THE SOFTWARE.
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<versionRange>[1.3,)</versionRange>
<goals>
<goal>generateTestStubs</goal>
<goal>testCompile</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>com.cloudbees</groupId>
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/hudson/plugins/jacoco/ExecutionFileLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@


public class ExecutionFileLoader implements Serializable {
private static final long serialVersionUID = 1L;
private final static String[] STARSTAR = {"**"};
private final static String[] ITEM_ZERO = {"{0}"};

Expand All @@ -33,10 +34,10 @@ public class ExecutionFileLoader implements Serializable {
private String[] includes;
private String[] excludes;

private ExecutionDataStore executionDataStore;
private SessionInfoStore sessionInfoStore;
private transient ExecutionDataStore executionDataStore;
private transient SessionInfoStore sessionInfoStore;

private IBundleCoverage bundleCoverage;
private transient IBundleCoverage bundleCoverage;

private ArrayList<FilePath> execFiles;

Expand Down
Loading

0 comments on commit d04b509

Please sign in to comment.