You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/05/06 00:02:22 UTC
[maven-surefire] branch 1546-1222 updated: powermock 2.0.2 @ java
1.7
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch 1546-1222
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/1546-1222 by this push:
new 106ece9 powermock 2.0.2 @ java 1.7
106ece9 is described below
commit 106ece98ec9624f215e43c963f8fba084a8048f4
Author: tibordigana <ti...@apache.org>
AuthorDate: Mon May 6 02:02:00 2019 +0200
powermock 2.0.2 @ java 1.7
---
Jenkinsfile | 3 --
pom.xml | 175 ++++++++++++++++++++++++------------------------------------
2 files changed, 71 insertions(+), 107 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 3f96cad..b2d8023 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -68,9 +68,6 @@ oses.eachWithIndex { osMapping, indexOfOs ->
boolean first = indexOfOs == 0 && indexOfMaven == 0 && indexOfJdk == 0
def failsafeItPort = 8000 + 100 * indexOfMaven + 10 * indexOfJdk
def allOptions = options + ["-Dfailsafe-integration-test-port=${failsafeItPort}", "-Dfailsafe-integration-test-stop-port=${1 + failsafeItPort}"]
- if (jdk > 7) {
- allOptions += ['-DpowermockVersion=2.0.0', '-Denforcer.skip=true']
- }
ws(dir: "${os == 'windows' ? "${TEMP}\\${BUILD_TAG}" : pwd()}") {
buildProcess(stageKey, jdkName, jdkTestName, mvnName, first ? goalsDepl : goals, allOptions, mavenOpts, first)
}
diff --git a/pom.xml b/pom.xml
index 54ec65a..f06ba53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,8 @@
<doxiaSitetoolsVersion>1.8.1</doxiaSitetoolsVersion>
<!-- maven-shared-utils:3.2.0+ another behavior - broke Surefire performance - end of subprocess notification not arrived in ForkStarter -->
<mavenSharedUtilsVersion>3.1.0</mavenSharedUtilsVersion>
- <powermockVersion>2.0.0-RC.1</powermockVersion>
+ <powermockVersion>2.0.2</powermockVersion>
+ <jacocoVersion>0.8.3</jacocoVersion>
<maven.surefire.scm.devConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-surefire.git</maven.surefire.scm.devConnection>
<maven.site.path>surefire-archives/surefire-LATEST</maven.site.path>
<!-- Override with Jigsaw JRE 9 -->
@@ -102,7 +103,6 @@
<maven.compiler.testSource>1.${javaVersion}</maven.compiler.testSource>
<maven.compiler.testTarget>1.${javaVersion}</maven.compiler.testTarget>
<jvm.args.tests>-server -XX:+UseG1GC -Xms128m -Xmx144m -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true -Djdk.net.URLClassPath.disableClassPathURLCheck=true</jvm.args.tests>
- <jacoco.instrumentation.skip>false</jacoco.instrumentation.skip>
</properties>
<dependencyManagement>
@@ -332,7 +332,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.21.0</version>
+ <version>2.23.4</version>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
@@ -365,6 +365,11 @@
<version>${powermockVersion}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.22.0-GA</version>
+ </dependency>
<!-- END: PowerMock@Java9 -->
<dependency>
<groupId>junit</groupId>
@@ -385,12 +390,19 @@
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.9.1</version>
+<!-- <version>3.12.2</version>-->
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>2.0.3</version>
</dependency>
+ <dependency>
+ <groupId>org.jacoco</groupId>
+ <artifactId>org.jacoco.agent</artifactId>
+ <classifier>runtime</classifier>
+ <version>${jacocoVersion}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
@@ -415,13 +427,6 @@
<artifactId>fest-assert</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jacoco</groupId>
- <artifactId>org.jacoco.agent</artifactId>
- <classifier>runtime</classifier>
- <version>0.8.3</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -487,21 +492,6 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.17</version>
- <executions>
- <execution>
- <id>signature-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java17</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
@@ -513,9 +503,6 @@
<useFile>false</useFile>
<redirectTestOutputToFile>false</redirectTestOutputToFile>
<jvm>${jdk.home}/bin/java</jvm>
- <systemPropertyVariables>
- <jacoco-agent.destfile>${project.build.directory}/jacoco.exec</jacoco-agent.destfile>
- </systemPropertyVariables>
</configuration>
</plugin>
<plugin>
@@ -538,67 +525,65 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.3</version>
+ <version>${jacocoVersion}</version>
+ <configuration>
+ <!--<append>true</append>
+ <inclNoLocationClasses>true</inclNoLocationClasses>
+ <haltOnFailure>false</haltOnFailure>
+ <jmx>false</jmx>-->
+ <includes>
+ <include>**/failsafe/*</include>
+ <include>**/failsafe/**/*</include>
+ <include>**/surefire/*</include>
+ <include>**/surefire/**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/HelpMojo.class</exclude>
+ <exclude>**/shadefire/**/*</exclude>
+ <exclude>org/jacoco/**/*</exclude>
+ <exclude>com/vladium/emma/rt/*</exclude>
+ </excludes>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
<executions>
<execution>
- <id>jacoco-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>instrument</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>instrument</goal>
- </goals>
- <configuration>
- <skip>${jacoco.instrumentation.skip}</skip>
- </configuration>
- </execution>
- <execution>
- <id>restore-classes</id>
+ <id>rat-check</id>
<goals>
- <goal>restore-instrumented-classes</goal>
+ <goal>check</goal>
</goals>
<configuration>
- <skip>${jacoco.instrumentation.skip}</skip>
+ <excludes combine.children="append">
+ <exclude>Jenkinsfile</exclude>
+ <exclude>README.md</exclude>
+ <exclude>.gitignore</exclude>
+ <exclude>.git/**/*</exclude>
+ <exclude>**/.idea</exclude>
+ <exclude>**/.svn/**/*</exclude>
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.versionsBackup</exclude>
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <exclude>.repository/**</exclude> <!-- jenkins with local maven repository -->
+ <exclude>src/test/resources/**/*</exclude>
+ <exclude>src/test/resources/**/*.css</exclude>
+ <exclude>**/*.jj</exclude>
+ <exclude>src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
+ </exclude>
+ <exclude>DEPENDENCIES</exclude>
+ <exclude>.m2/**</exclude>
+ <exclude>.m2</exclude>
+ <exclude>.travis.yml</exclude>
+ </excludes>
</configuration>
</execution>
- <execution>
- <id>jacoco-report</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
</executions>
- <configuration>
- <propertyName>jacoco.agent</propertyName>
- <append>true</append>
- <inclNoLocationClasses>true</inclNoLocationClasses>
- <haltOnFailure>false</haltOnFailure>
- <jmx>false</jmx>
- <includes>
- <include>**/failsafe/*</include>
- <include>**/failsafe/**/*</include>
- <include>**/surefire/*</include>
- <include>**/surefire/**/*</include>
- </includes>
- <excludes>
- <exclude>**/HelpMojo.class</exclude>
- <exclude>**/shadefire/**/*</exclude>
- <exclude>org/jacoco/**/*</exclude>
- <exclude>com/vladium/emma/rt/*</exclude>
- </excludes>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -657,45 +642,27 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
<executions>
<execution>
- <id>rat-check</id>
+ <id>signature-check</id>
<goals>
<goal>check</goal>
</goals>
<configuration>
- <excludes combine.children="append">
- <exclude>Jenkinsfile</exclude>
- <exclude>README.md</exclude>
- <exclude>.gitignore</exclude>
- <exclude>.git/**/*</exclude>
- <exclude>**/.idea</exclude>
- <exclude>**/.svn/**/*</exclude>
- <exclude>**/*.iml</exclude>
- <exclude>**/*.ipr</exclude>
- <exclude>**/*.iws</exclude>
- <exclude>**/*.versionsBackup</exclude>
- <exclude>**/dependency-reduced-pom.xml</exclude>
- <exclude>.repository/**</exclude> <!-- jenkins with local maven repository -->
- <exclude>src/test/resources/**/*</exclude>
- <exclude>src/test/resources/**/*.css</exclude>
- <exclude>**/*.jj</exclude>
- <exclude>src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
- </exclude>
- <exclude>DEPENDENCIES</exclude>
- <exclude>.m2/**</exclude>
- <exclude>.m2</exclude>
- <exclude>.travis.yml</exclude>
- </excludes>
+ <signature>
+ <groupId>org.codehaus.mojo.signature</groupId>
+ <artifactId>java17</artifactId>
+ <version>1.0</version>
+ </signature>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<deployAtEnd>true</deployAtEnd>