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 2020/04/19 21:48:11 UTC

[maven-surefire] branch SUREFIRE-1770 updated (26a5c14 -> c43218d)

This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a change to branch SUREFIRE-1770
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.


 discard 26a5c14  [SUREFIRE-1770] make build Reproducible
     add 521efbf  [SUREFIRE-1774] Upgrade Maven Parent to Version 34
     add e0387fb  [jenkins][github][travis] build supports single JDK 9+ (GH JDK11 and TravisCI JDK14)
     add a592032  maven-assembly-plugin:2.6 crashed on JDK14, Updated to Version 3.2.0
     add e9a60af  NPE (SystemUtils.isJavaVersionAtLeast) in the maven-javadoc-plugin
     add fda1ce2  prevent from failing the IT 855 on JDK 15
     add e5d6e58  [SUREFIRE-1695] Support multiple inheritance of @Categories
     add 8f75ada  resolved dependency upgrade with objenesis
     add 66b11bd  [SUREFIRE-1777] Upgrade Fluido to Version 1.9
     add 8e30aaa  fixed wrong use of classpathDependencyExcludes
     add f09e509  GH workflows for pull_request
     new c43218d  [SUREFIRE-1770] make build Reproducible

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (26a5c14)
            \
             N -- N -- N   refs/heads/SUREFIRE-1770 (c43218d)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/maven.yml                        |   6 +-
 .github/workflows/{maven.yml => smoketest.yml}     |  16 +-
 .travis.yml                                        |   2 +-
 README.md                                          |   8 +-
 maven-surefire-plugin/pom.xml                      |   1 -
 pom.xml                                            |  20 +-
 src/site/site.xml                                  |   2 +-
 .../jiras/Surefire995CategoryInheritanceIT.java    | 122 ++++++++---
 .../surefire-855-failsafe-use-bundle/pom.xml       |  12 +-
 .../surefire-855-failsafe-use-jar/pom.xml          |  12 +-
 .../surefire-855-failsafe-use-war/pom.xml          |  12 +-
 .../surefire-995-categoryInheritance/pom.xml       |   7 +-
 .../{CategorizedTest.java => group/ABCTest.java}   |  11 +-
 .../{CategorizedTest.java => group/ATest.java}     |   9 +-
 .../AbstractBCTest.java}                           |  12 +-
 .../AbstractCTest.java}                            |  12 +-
 .../{CategorizedTest.java => group/BBCTest.java}   |  11 +-
 .../test/java/jiras/surefire955/group/BCTest.java} |  10 +-
 .../{CategorizedTest.java => group/BTest.java}     |  12 +-
 .../surefire955/group/UncategorizedTest.java}      |  10 +-
 .../jiras/surefire955/group/marker/CategoryA.java} |   5 +-
 .../jiras/surefire955/group/marker/CategoryB.java} |   4 +-
 .../jiras/surefire955/group/marker/CategoryC.java} |   5 +-
 surefire-providers/common-junit48/pom.xml          | 224 ++++++++++++++-------
 .../common/junit48/GroupMatcherCategoryFilter.java |  49 ++++-
 .../GroupMatcherCategoryFilterPreJUnit412Test.java | 100 +++++++++
 .../junit48/GroupMatcherCategoryFilterTest.java    | 138 +++++++++++++
 .../junit48/tests/group/ABCParameterizedTest.java  |  44 ++--
 .../common/junit48/tests/group/ABCTest.java        |  15 +-
 .../common/junit48/tests/group/ABMethodTest.java   |  20 +-
 .../surefire/common/junit48/tests/group/ATest.java |  12 +-
 .../common/junit48/tests/group/AbstractBCTest.java |  15 +-
 .../common/junit48/tests/group/AbstractCTest.java  |  14 +-
 .../common/junit48/tests/group/BBCTest.java        |  15 +-
 .../common/junit48/tests/group/BCTest.java         |  15 +-
 .../surefire/common/junit48/tests/group/BTest.java |  14 +-
 .../junit48/tests/group/UncategorizedTest.java     |  14 +-
 .../junit48/tests/group/marker/CategoryA.java      |   6 +-
 .../junit48/tests/group/marker/CategoryB.java      |   6 +-
 .../junit48/tests/group/marker/CategoryC.java      |   6 +-
 40 files changed, 768 insertions(+), 260 deletions(-)
 copy .github/workflows/{maven.yml => smoketest.yml} (82%)
 copy surefire-its/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/{CategorizedTest.java => group/ABCTest.java} (78%)
 copy surefire-its/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/{CategorizedTest.java => group/ATest.java} (84%)
 copy surefire-its/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/{CategorizedTest.java => group/AbstractBCTest.java} (77%)
 copy surefire-its/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/{CategorizedTest.java => group/AbstractCTest.java} (80%)
 copy surefire-its/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/{CategorizedTest.java => group/BBCTest.java} (78%)
 copy surefire-its/src/test/resources/{surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/IgnoredTest.java => surefire-995-categoryInheritance/src/test/java/jiras/surefire955/group/BCTest.java} (84%)
 copy surefire-its/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/{CategorizedTest.java => group/BTest.java} (82%)
 copy surefire-its/src/test/resources/{surefire-818-ignored-tests-on-npe/src/test/java/cyril/test/IgnoredTest.java => surefire-995-categoryInheritance/src/test/java/jiras/surefire955/group/UncategorizedTest.java} (86%)
 copy surefire-its/src/test/resources/{junit48-method-pattern/src/test/java/junit4/SampleCategory.java => surefire-995-categoryInheritance/src/test/java/jiras/surefire955/group/marker/CategoryA.java} (92%)
 copy surefire-its/src/test/resources/{surefire-1036-NonFilterableJUnitRunnerWithCategories/src/test/java/jiras/surefire1036/IntegrationTest.java => surefire-995-categoryInheritance/src/test/java/jiras/surefire955/group/marker/CategoryB.java} (92%)
 copy surefire-its/src/test/resources/{junit48-method-pattern/src/test/java/junit4/SampleCategory.java => surefire-995-categoryInheritance/src/test/java/jiras/surefire955/group/marker/CategoryC.java} (92%)
 create mode 100644 surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/GroupMatcherCategoryFilterPreJUnit412Test.java
 create mode 100644 surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/GroupMatcherCategoryFilterTest.java
 copy surefire-its/src/test/resources/surefire-985-parameterized-and-categories/src/test/java/sample/parameterized/Parameterized02Test.java => surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/tests/group/ABCParameterizedTest.java (60%)
 copy surefire-its/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/CategorizedTest.java => surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/tests/group/ABCTest.java (75%)
 copy surefire-its/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/CategorizedTest.java => surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/tests/group/ABMethodTest.java (67%)
 copy surefire-its/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/CategorizedTest.java => surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/tests/group/ATest.java (79%)
 copy surefire-its/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/CategorizedTest.java => surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/tests/group/AbstractBCTest.java (73%)
 copy surefire-its/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/CategorizedTest.java => surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/tests/group/AbstractCTest.java (75%)
 copy surefire-its/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/CategorizedTest.java => surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/tests/group/BBCTest.java (75%)
 copy surefire-its/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/AppTest.java => surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/tests/group/BCTest.java (82%)
 copy surefire-its/src/test/resources/surefire-995-categoryInheritance/src/test/java/jiras/surefire955/CategorizedTest.java => surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/tests/group/BTest.java (77%)
 copy surefire-its/src/test/resources/surefire-1041-exception-in-junit-runner/src/test/java/test/AppTest.java => surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/tests/group/UncategorizedTest.java (82%)
 copy maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/DataZT1A.java => surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/tests/group/marker/CategoryA.java (87%)
 copy maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/DataZT1A.java => surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/tests/group/marker/CategoryB.java (87%)
 copy maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/DataZT1A.java => surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/tests/group/marker/CategoryC.java (87%)


[maven-surefire] 01/01: [SUREFIRE-1770] make build Reproducible

Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch SUREFIRE-1770
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git

commit c43218dc482227d05b642773bf5190bcf7d2fe64
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Wed Apr 8 22:52:23 2020 +0200

    [SUREFIRE-1770] make build Reproducible
---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index f9cd73b..7cde7cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,7 @@
     <maven.compiler.testSource>1.${javaVersion}</maven.compiler.testSource>
     <maven.compiler.testTarget>1.${javaVersion}</maven.compiler.testTarget>
     <jvm.args.tests>-Xms128m -Xmx144m -XX:SoftRefLRUPolicyMSPerMB=50 -Djava.awt.headless=true -Djdk.net.URLClassPath.disableClassPathURLCheck=true</jvm.args.tests>
+    <project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
   </properties>
 
   <dependencyManagement>
@@ -465,6 +466,11 @@
     <pluginManagement>
       <plugins>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>3.2.3</version><!-- TODO remove when upgrading parent to 35 -->
+        </plugin>
+        <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
           <version>1.12</version>