Merge pull request #8 from laeubi/laeubi-patch-1
Create Github Action Verification
diff --git a/depends-maven-plugin/pom.xml b/depends-maven-plugin/pom.xml
index a6f8647..c3d83f8 100644
--- a/depends-maven-plugin/pom.xml
+++ b/depends-maven-plugin/pom.xml
@@ -12,28 +12,60 @@
<parent>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>maven-plugins-pom</artifactId>
- <version>6</version>
+ <version>7</version>
<relativePath>../maven-plugins-pom/pom.xml</relativePath>
</parent>
<artifactId>depends-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>1.4.1-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
<name>Apache ServiceMix :: Plugins :: Maven2 Depends Plugin</name>
<scm>
- <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-maven-plugins.git</url>
- <tag>HEAD</tag>
- </scm>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-maven-plugins.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-maven-plugins.git</developerConnection>
+ <url>https://gitbox.apache.org/repos/asf/servicemix-maven-plugins.git</url>
+ <tag>HEAD</tag>
+ </scm>
+
+ <properties>
+ <project.build.outputTimestamp>1688361696</project.build.outputTimestamp>
+ </properties>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.3.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.3.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>3.6.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>3.0.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.7.0</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.5</version>
+ <version>3.5.1</version>
<executions>
<execution>
<id>default-descriptor</id>
diff --git a/depends-maven-plugin/src/main/java/org/apache/servicemix/tooling/depends/GenerateDependsFileMojo.java b/depends-maven-plugin/src/main/java/org/apache/servicemix/tooling/depends/GenerateDependsFileMojo.java
index bef9c4f..7f1a821 100644
--- a/depends-maven-plugin/src/main/java/org/apache/servicemix/tooling/depends/GenerateDependsFileMojo.java
+++ b/depends-maven-plugin/src/main/java/org/apache/servicemix/tooling/depends/GenerateDependsFileMojo.java
@@ -20,10 +20,17 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.handler.ArtifactHandler;
+import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactCollector;
@@ -71,35 +78,24 @@
@Parameter( defaultValue = "true" )
protected boolean includeType;
+ @Parameter(defaultValue = "true")
+ protected boolean includeExtension;
+
/**
* The file to generate
*/
@Parameter( defaultValue = "${project.build.directory}/classes/META-INF/maven/dependencies.properties" )
private File outputFile;
- @Parameter( defaultValue = "${localRepository}" )
- protected ArtifactRepository localRepo;
-
- @Parameter( defaultValue = "${project.remoteArtifactRepositories}" )
- protected List remoteRepos;
-
@Parameter( defaultValue = "${filterGroupIds}" )
protected String[] filterGroupIds;
@Component
- protected ArtifactMetadataSource artifactMetadataSource;
-
- @Component
- protected ArtifactResolver resolver;
-
- protected ArtifactCollector collector = new DefaultArtifactCollector();
-
- @Component
- protected ArtifactFactory factory;
-
- @Component
private BuildContext buildContext;
+ @Component
+ private ArtifactHandlerManager artifactHandlerManager;
+
public void execute() throws MojoExecutionException, MojoFailureException {
if (buildContext.hasDelta("pom.xml")) {
List<Dependency> dependencies = getDependencies();
@@ -197,6 +193,10 @@
out.println(prefix + "type = " + dependency.getType());
if( includeScope )
out.println(prefix + "scope = " + dependency.getScope());
+ if (includeExtension) {
+ ArtifactHandler handler = artifactHandlerManager.getArtifactHandler(dependency.getType());
+ out.println(prefix + "extension = " + handler.getExtension());
+ }
out.println();
diff --git a/maven-plugins-pom/pom.xml b/maven-plugins-pom/pom.xml
index b5d85e9..40f54f2 100644
--- a/maven-plugins-pom/pom.xml
+++ b/maven-plugins-pom/pom.xml
@@ -26,20 +26,23 @@
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>maven-plugins-pom</artifactId>
- <version>7-SNAPSHOT</version>
+ <version>8-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache ServiceMix :: Plugins :: Plugins POM</name>
<scm>
- <connection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/servicemix-maven-plugins.git</developerConnection>
- <url>https://git-wip-us.apache.org/repos/asf?p=servicemix-maven-plugins.git</url>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-maven-plugins.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-maven-plugins.git</developerConnection>
+ <url>https://gitbox.apache.org/repos/asf?p=servicemix-maven-plugins.git</url>
<tag>HEAD</tag>
</scm>
<properties>
<servicemix.legal.version>1.0</servicemix.legal.version>
+ <java.version>7</java.version>
+ <maven.compiler.source>${java.version}</maven.compiler.source>
+ <maven.compiler.target>${java.version}</maven.compiler.target>
</properties>
<reporting>
@@ -84,8 +87,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>${java.version}</source>
+ <target>${java.version}</target>
</configuration>
</plugin>
<plugin>
@@ -115,7 +118,7 @@
<version>2.9.1</version>
<inherited>true</inherited>
<configuration>
- <source>1.5</source>
+ <source>${java.version}</source>
</configuration>
<executions>
<execution>
