This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/maven-build-cache-extension.git
The following commit(s) were added to refs/heads/master by this push:
new 2d262e1 Clean build (#31)
2d262e1 is described below
commit 2d262e133749abb5163969b9c0b2f0f2056e7951
Author: Guillaume Nodet <[email protected]>
AuthorDate: Wed Oct 26 15:21:58 2022 +0200
Clean build (#31)
* Clean build
* Use maven-extensions parent and remove animal-sniffer since the jdk
release target does the job
---
.mvn/maven.config | 0
pom.xml | 62 ++++++++++------------
.../buildcache/RemoteCacheRepositoryImpl.java | 2 +-
.../buildcache/checksum/MavenProjectInput.java | 4 +-
.../maven/buildcache/xml/CacheConfigImpl.java | 2 +-
5 files changed, 32 insertions(+), 38 deletions(-)
diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 0000000..e69de29
diff --git a/pom.xml b/pom.xml
index f7b0768..bdeb456 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,10 +23,10 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <parent><!-- TODO switch to maven-extensions:35 -->
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-parent</artifactId>
- <version>34</version>
+ <parent>
+ <groupId>org.apache.maven.extensions</groupId>
+ <artifactId>maven-extensions</artifactId>
+ <version>37</version>
<relativePath/>
</parent>
@@ -41,12 +41,13 @@ under the License.
<url>https://maven.apache.org/extensions/maven-build-cache-extension/</url>
<properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <javaVersion>8</javaVersion>
+ <minimalMavenBuildVersion>3.5.0</minimalMavenBuildVersion>
+ <minimalJavaBuildVersion>11</minimalJavaBuildVersion>
<classWorldsVersion>2.6.0</classWorldsVersion>
- <formatter-maven-plugin.version>2.17.0</formatter-maven-plugin.version>
- <impsort-maven-plugin.version>1.6.2</impsort-maven-plugin.version>
+ <formatter-maven-plugin.version>2.20.0</formatter-maven-plugin.version>
+ <impsort-maven-plugin.version>1.7.0</impsort-maven-plugin.version>
<commonsCliVersion>1.4</commonsCliVersion>
<commonsLangVersion>3.12.0</commonsLangVersion>
@@ -233,13 +234,14 @@ under the License.
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
+ <exclude>.mvn/maven.config</exclude>
<exclude>.asf.yaml</exclude>
<exclude>src/test/resources*/**</exclude>
<exclude>src/test/projects/**</exclude>
<exclude>src/test/remote-repo/**</exclude>
<exclude>src/build/maven-header.txt</exclude>
<exclude>.gitmodules</exclude>
- <exclude>maven/**</exclude>
+ <exclude>.gitattributes</exclude>
</excludes>
</configuration>
</plugin>
@@ -291,27 +293,6 @@ under the License.
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.20</version>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java18</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- <executions>
- <execution>
- <id>check-java-compat</id>
- <phase>process-classes</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -379,7 +360,7 @@ under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.3.0</version>
<executions>
<execution>
<id>add-resources</id>
@@ -397,10 +378,18 @@ under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.10.1</version>
+ <configuration>
+ <release>${javaVersion}</release>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>3.3.0</version>
<executions>
<execution>
<id>copy-maven-distribution</id>
@@ -427,7 +416,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M5</version>
+ <version>3.0.0-M7</version>
<configuration>
<argLine>-Xmx256m --add-exports
java.base/sun.nio.ch=ALL-UNNAMED</argLine>
<environmentVariables>
@@ -466,7 +455,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>3.0.0-M1</version>
+ <version>3.0.1</version>
<executions>
<execution>
<id>default-install</id>
@@ -474,6 +463,11 @@ under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.4.0</version>
+ </plugin>
</plugins>
</build>
diff --git
a/src/main/java/org/apache/maven/buildcache/RemoteCacheRepositoryImpl.java
b/src/main/java/org/apache/maven/buildcache/RemoteCacheRepositoryImpl.java
index 32138ac..c058757 100644
--- a/src/main/java/org/apache/maven/buildcache/RemoteCacheRepositoryImpl.java
+++ b/src/main/java/org/apache/maven/buildcache/RemoteCacheRepositoryImpl.java
@@ -152,7 +152,7 @@ public class RemoteCacheRepositoryImpl implements
RemoteCacheRepository, Closeab
/**
* Downloads content of the resource
- *
+ *
* @return null or content
*/
@Nonnull
diff --git
a/src/main/java/org/apache/maven/buildcache/checksum/MavenProjectInput.java
b/src/main/java/org/apache/maven/buildcache/checksum/MavenProjectInput.java
index c76f873..33ff8bd 100644
--- a/src/main/java/org/apache/maven/buildcache/checksum/MavenProjectInput.java
+++ b/src/main/java/org/apache/maven/buildcache/checksum/MavenProjectInput.java
@@ -838,8 +838,8 @@ public class MavenProjectInput
/**
* Allow skipping generated sources restoration on a per-project level via
a property (which defaults to true)
- * e.g.
<maven.build.cache.restoreGeneratedSources>false<maven.build.cache.restoreGeneratedSources/>
- *
+ * e.g. {@code
<maven.build.cache.restoreGeneratedSources>false<maven.build.cache.restoreGeneratedSources/>}.
+ *
* @param project
* @return
*/
diff --git a/src/main/java/org/apache/maven/buildcache/xml/CacheConfigImpl.java
b/src/main/java/org/apache/maven/buildcache/xml/CacheConfigImpl.java
index ae9efe4..f3d786f 100644
--- a/src/main/java/org/apache/maven/buildcache/xml/CacheConfigImpl.java
+++ b/src/main/java/org/apache/maven/buildcache/xml/CacheConfigImpl.java
@@ -95,7 +95,7 @@ public class CacheConfigImpl implements
org.apache.maven.buildcache.xml.CacheCon
* E.g. to trigger a forced build (full or for a particular module)
* May be also activated via properties for projects via a profile e.g. on
CI when some files produced by the build
* are required (e.g. smth. from target folder as additional CI build
artifacts):
- * <maven.build.cache.skipCache>true<maven.build.cache.skipCache/>
+ * {@code <maven.build.cache.skipCache>true<maven.build.cache.skipCache/>}
*/
public static final String CACHE_SKIP = "maven.build.cache.skipCache";
