You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/01/28 22:12:31 UTC

[maven-wagon] 01/01: mvn4 aggregator

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

gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git

commit 128d5c84a5af3ea66ff52c7a6d9ea96777ace888
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:12:28 2022 +0100

    mvn4 aggregator
---
 pom.xml                                                      | 12 ++++++------
 .../maven/wagon/providers/http/HugeFileDownloadTest.java     |  2 +-
 wagon-providers/wagon-scm/pom.xml                            |  8 +-------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index f50b996..62b2a44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>34</version>
+    <version>35-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.maven.wagon</groupId>
@@ -40,7 +40,7 @@ under the License.
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
     <slf4jVersion>1.7.32</slf4jVersion>
     <maven.site.path>wagon-archives/wagon-LATEST</maven.site.path>
-    <javaVersion>7</javaVersion>
+    <javaVersion>8</javaVersion>
     <project.build.outputTimestamp>2021-12-22T22:48:38Z</project.build.outputTimestamp>
   </properties>
 
@@ -411,17 +411,17 @@ under the License.
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <version>1.15</version>
+        <version>1.20</version>
         <configuration>
           <signature>
             <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java17</artifactId>
+            <artifactId>java18</artifactId>
             <version>1.0</version>
           </signature>
         </configuration>
         <executions>
           <execution>
-            <id>check-java-1.7-compat</id>
+            <id>check-java-compat</id>
             <phase>process-classes</phase>
             <goals>
               <goal>check</goal>
@@ -432,7 +432,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M2</version>
+        <version>3.0.0</version>
         <executions>
           <execution>
             <goals>
diff --git a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
index ce75714..d31c666 100644
--- a/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
+++ b/wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/http/HugeFileDownloadTest.java
@@ -198,7 +198,7 @@ public class HugeFileDownloadTest
         final OpenOption[] options = { StandardOpenOption.WRITE, StandardOpenOption.CREATE_NEW,
                                        StandardOpenOption.SPARSE };
 
-        try ( final SeekableByteChannel channel = Files.newByteChannel( hugeFile.toPath(), options ) )
+        try ( SeekableByteChannel channel = Files.newByteChannel( hugeFile.toPath(), options ) )
         {
             channel.position( HUGE_FILE_SIZE );
             channel.write( buf );
diff --git a/wagon-providers/wagon-scm/pom.xml b/wagon-providers/wagon-scm/pom.xml
index 5a96e9c..51e6fee 100644
--- a/wagon-providers/wagon-scm/pom.xml
+++ b/wagon-providers/wagon-scm/pom.xml
@@ -34,7 +34,7 @@ under the License.
   </description>
 
   <properties>
-    <mavenScmVersion>1.11.1</mavenScmVersion>
+    <mavenScmVersion>2.0.0-M2-SNAPSHOT</mavenScmVersion>
   </properties>
 
   <dependencies>
@@ -55,12 +55,6 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.maven.scm</groupId>
-      <artifactId>maven-scm-provider-cvsexe</artifactId>
-      <version>${mavenScmVersion}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.scm</groupId>
       <artifactId>maven-scm-provider-gitexe</artifactId>
       <version>${mavenScmVersion}</version>
       <scope>test</scope>