This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new a88d2c8 SLING-10218 : Update maven/plexus dependencies
a88d2c8 is described below
commit a88d2c8a9256fd722bfce9d6b9bf7de67b8e7571
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Tue Mar 16 08:05:23 2021 +0100
SLING-10218 : Update maven/plexus dependencies
---
pom.xml | 43 ++++++++++------------
.../feature/maven/mojos/AnalyseFeaturesMojo.java | 2 +-
.../sling/feature/maven/mojos/ApisJarMojo.java | 2 +-
3 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/pom.xml b/pom.xml
index 69ec6df..e001a72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,25 +33,23 @@
<properties>
<sling.java.version>8</sling.java.version>
- <maven.version>3.5.0</maven.version>
- <maven.scm.version>1.11.1</maven.scm.version>
+ <maven.version>3.6.3</maven.version>
+ <maven.scm.version>1.11.2</maven.scm.version>
<maven.site.path>${project.artifactId}-archives/${project.artifactId}-LATEST</maven.site.path>
-
<maven-artifact-transfer.version>0.11.0</maven-artifact-transfer.version>
</properties>
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-slingfeature-maven-plugin.git</url>
- <tag>slingfeature-maven-plugin-1.2.2</tag>
- </scm>
+ </scm>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
- <version>1.7.1</version>
+ <version>2.1.0</version>
<executions>
<execution>
<id>generate-metadata</id>
@@ -78,10 +76,7 @@
<goal>helpmojo</goal>
</goals>
</execution>
- </executions>
- <configuration>
-
<skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -99,8 +94,8 @@
<exclude>src/site/markdown/**</exclude>
<exclude>src/test/resources/**/*.txt</exclude>
<exclude>src/test/resources/**/*.feature</exclude>
- <exclude>src/test/resources/**/*.xml</exclude>
-
<exclude>src/test/resources/META-INF/services/*</exclude>
+
<exclude>src/test/resources/**/*.xml</exclude>
+
<exclude>src/test/resources/META-INF/services/*</exclude>
<exclude>src/it/**/*.json</exclude>
</excludes>
</configuration>
@@ -151,7 +146,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.6</version>
+ <version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -230,12 +225,12 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>3.3.0</version>
+ <version>3.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>3.5</version>
+ <version>3.6.0</version>
<scope>provided</scope>
</dependency>
<!-- for converting Maven to OSGi versions -->
@@ -247,17 +242,17 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId>
- <version>1.0-alpha-6</version>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>3.5</version>
+ <version>4.2.4</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.24</version>
+ <version>3.3.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -267,23 +262,23 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.5</version>
+ <version>2.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-filtering</artifactId>
- <version>3.1.1</version>
+ <version>3.2.0</version>
</dependency>
<!-- schema validation -->
<dependency>
<groupId>com.github.java-json-tools</groupId>
<artifactId>json-schema-validator</artifactId>
- <version>2.2.10</version>
+ <version>2.2.14</version>
</dependency>
<!-- APIs JARs -->
<dependency>
@@ -314,12 +309,12 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model-builder</artifactId>
- <version>3.6.0</version>
+ <version>3.6.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
- <version>${maven-artifact-transfer.version}</version>
+ <version>0.13.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git
a/src/main/java/org/apache/sling/feature/maven/mojos/AnalyseFeaturesMojo.java
b/src/main/java/org/apache/sling/feature/maven/mojos/AnalyseFeaturesMojo.java
index 39c440c..fddc40c 100644
---
a/src/main/java/org/apache/sling/feature/maven/mojos/AnalyseFeaturesMojo.java
+++
b/src/main/java/org/apache/sling/feature/maven/mojos/AnalyseFeaturesMojo.java
@@ -169,7 +169,7 @@ public class AnalyseFeaturesMojo extends
AbstractIncludingFeatureMojo {
+ "'. See log output for error messages.");
hasErrors = true;
} else {
- getLog().debug(MessageUtils.buffer().a("feature
").debug(f.getId().toMvnId())
+ getLog().debug(MessageUtils.buffer().a("feature
").project(f.getId().toMvnId())
.a(" succesfully passed all
analysis").toString());
}
} catch (Exception t) {
diff --git
a/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
b/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
index 53956f1..4b292dc 100644
--- a/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
+++ b/src/main/java/org/apache/sling/feature/maven/mojos/ApisJarMojo.java
@@ -546,7 +546,7 @@ public class ApisJarMojo extends
AbstractIncludingFeatureMojo {
throw new MojoExecutionException("API generation has errors,
please see report files for more information");
}
- getLog().info(MessageUtils.buffer().a("APIs JARs for Feature
").debug(feature.getId().toMvnId())
+ getLog().info(MessageUtils.buffer().a("APIs JARs for Feature
").project(feature.getId().toMvnId())
.a(" succesfully created").toString());
}
