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:10:23 UTC
[maven-build-cache-extension] branch mvn4 created (now c7c570e)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-build-cache-extension.git.
at c7c570e mvn4 aggregator
This branch includes the following new commits:
new c7c570e mvn4 aggregator
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.
[maven-build-cache-extension] 01/01: mvn4 aggregator
Posted by gn...@apache.org.
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-build-cache-extension.git
commit c7c570e4e8ed8e6ad81296a14391537b3c4f09c2
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:10:16 2022 +0100
mvn4 aggregator
---
.gitmodules | 8 --------
maven/maven3 | 1 -
maven/maven4 | 1 -
pom.xml | 19 +++++++++++++------
4 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 93f16fe..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,8 +0,0 @@
-[submodule "maven3"]
- path = maven/maven3
- url = https://github.com/apache/maven.git
- branch = MNG-7391-maven-3.8.x
-[submodule "maven4"]
- path = maven/maven4
- url = https://github.com/apache/maven.git
- branch = MNG-7391-master
diff --git a/maven/maven3 b/maven/maven3
deleted file mode 160000
index 9366ea7..0000000
--- a/maven/maven3
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9366ea7ba16c834e5fd74965dc10c184ca0ccb50
diff --git a/maven/maven4 b/maven/maven4
deleted file mode 160000
index 91b57d5..0000000
--- a/maven/maven4
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 91b57d5b40ed6204b1eb49dbc29f54adf322dd7e
diff --git a/pom.xml b/pom.xml
index 822ac0b..25942d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,12 +55,12 @@ under the License.
<junitVersion>5.8.1</junitVersion>
<mockitoVersion>3.2.0</mockitoVersion>
<plexusUtilsVersion>3.4.1</plexusUtilsVersion>
- <wagonVersion>3.4.3</wagonVersion>
+ <wagonVersion>3.5.2-SNAPSHOT</wagonVersion>
<securityDispatcherVersion>2.0</securityDispatcherVersion>
<cipherVersion>2.0</cipherVersion>
<modelloVersion>1.11</modelloVersion>
<jxpathVersion>1.3</jxpathVersion>
- <resolverVersion>1.7.2</resolverVersion>
+ <resolverVersion>1.8.0-SNAPSHOT</resolverVersion>
<slf4jVersion>1.7.32</slf4jVersion>
<xmlunitVersion>2.6.4</xmlunitVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
@@ -184,7 +184,7 @@ under the License.
<artifactId>formatter-maven-plugin</artifactId>
<version>${formatter-maven-plugin.version}</version>
<configuration>
- <configFile>${maven.multiModuleProjectDirectory}/src/build/eclipse-formatter-config.xml</configFile>
+ <configFile>config/eclipse-formatter-config.xml</configFile>
<skip>${format.skip}</skip>
<lineEnding>KEEP</lineEnding>
<cachedir>${project.build.directory}/cache</cachedir>
@@ -198,6 +198,13 @@ under the License.
<phase>process-sources</phase>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-resources</artifactId>
+ <version>5-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>net.revelc.code</groupId>
@@ -254,8 +261,8 @@ under the License.
<version>3.1.2</version>
<configuration>
<violationSeverity>info</violationSeverity>
- <suppressionsLocation>${maven.multiModuleProjectDirectory}/src/build/checkstyle-suppressions.xml</suppressionsLocation>
- <headerLocation>${maven.multiModuleProjectDirectory}/src/build/maven-header.txt</headerLocation>
+ <violationIgnore>JavadocVariable,JavadocMethod,HiddenField</violationIgnore>
+ <headerLocation>config/maven-header-2.txt</headerLocation>
</configuration>
<dependencies>
<dependency>
@@ -266,7 +273,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-resources</artifactId>
- <version>3</version>
+ <version>5-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>