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

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

commit 0a2b34c72add575005e565b540ec022b55c758c5
Author: Tibor17 <tibordig...@apache.org>
AuthorDate: Sun Nov 18 10:46:27 2018 +0100

    [SUREFIRE-1600] Surefire Project using surefire:2.12.4 is not fully able to 
work with JDK 10+ on internal build system. Therefore surefire-shadefire should 
go with Surefire:3.0.0-M1.
---
 surefire-shadefire/pom.xml                             | 18 +++++++-----------
 ....apache.maven.surefire.providerapi.SurefireProvider |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/surefire-shadefire/pom.xml b/surefire-shadefire/pom.xml
index 0d95ca2..ba40b76 100644
--- a/surefire-shadefire/pom.xml
+++ b/surefire-shadefire/pom.xml
@@ -46,17 +46,17 @@
     <dependency>
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>surefire-junit3</artifactId>
-      <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to 
https://issues.apache.org/jira/browse/MRELEASE-799 -->
+      <version>3.0.0-M1</version> <!-- ${shadedVersion}, but resolved due to 
https://issues.apache.org/jira/browse/MRELEASE-799 -->
     </dependency>
     <dependency>
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>surefire-api</artifactId>
-      <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to 
https://issues.apache.org/jira/browse/MRELEASE-799 -->
+      <version>3.0.0-M1</version> <!-- ${shadedVersion}, but resolved due to 
https://issues.apache.org/jira/browse/MRELEASE-799 -->
     </dependency>
     <dependency>
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>surefire-booter</artifactId>
-      <version>2.12.4</version> <!-- ${shadedVersion}, but resolved due to 
https://issues.apache.org/jira/browse/MRELEASE-799 -->
+      <version>3.0.0-M1</version> <!-- ${shadedVersion}, but resolved due to 
https://issues.apache.org/jira/browse/MRELEASE-799 -->
     </dependency>
   </dependencies>
 
@@ -73,15 +73,17 @@
             <configuration>
               <artifactSet>
                 <includes>
+                  
<include>org.apache.maven.surefire:surefire-logger-api</include>
                   <include>org.apache.maven.surefire:surefire-api</include>
                   <include>org.apache.maven.surefire:surefire-booter</include>
+                  <include>org.apache.maven.surefire:common-junit3</include>
                   <include>org.apache.maven.surefire:surefire-junit3</include>
                 </includes>
               </artifactSet>
               <relocations>
                 <relocation>
-                  <pattern>org.apache.maven.surefire</pattern>
-                  
<shadedPattern>org.apache.maven.surefire.shadefire</shadedPattern>
+                  <pattern>org.apache.maven</pattern>
+                  <shadedPattern>org.apache.maven.shadefire</shadedPattern>
                 </relocation>
               </relocations>
             </configuration>
@@ -95,12 +97,6 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
diff --git 
a/surefire-shadefire/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
 
b/surefire-shadefire/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
index 61bb1a4..1445853 100644
--- 
a/surefire-shadefire/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
+++ 
b/surefire-shadefire/src/main/resources/META-INF/services/org.apache.maven.surefire.providerapi.SurefireProvider
@@ -16,4 +16,4 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-org.apache.maven.surefire.shadefire.junit.JUnit3Provider
+org.apache.maven.shadefire.surefire.junit.JUnit3Provider

Reply via email to