Author: rfscholte
Date: Thu Jul 27 20:53:22 2017
New Revision: 1803234
URL: http://svn.apache.org/viewvc?rev=1803234&view=rev
Log:
[MDEP-577] dependency:list doesn't show module name
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-resolve-java9/
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-resolve-java9/invoker.properties
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-resolve-java9/pom.xml
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-resolve-java9/verify.groovy
Removed:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-list-java9/
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt.vm
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-resolve-java9/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-resolve-java9/invoker.properties?rev=1803234&view=auto
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-resolve-java9/invoker.properties
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-resolve-java9/invoker.properties
Thu Jul 27 20:53:22 2017
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.java.version = 1.9+
+invoker.goals =
${project.groupId}:${project.artifactId}:${project.version}:resolve
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-resolve-java9/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-resolve-java9/pom.xml?rev=1803234&view=auto
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-resolve-java9/pom.xml
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-resolve-java9/pom.xml
Thu Jul 27 20:53:22 2017
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins.dependency</groupId>
+ <artifactId>mdep-571-list-java9</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <description>Test that dependency:list doesn't fail on JRE9</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.6</version>
+ </dependency>
+ </dependencies>
+</project>
Added:
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-resolve-java9/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-resolve-java9/verify.groovy?rev=1803234&view=auto
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-resolve-java9/verify.groovy
(added)
+++
maven/plugins/trunk/maven-dependency-plugin/src/it/projects/mdep-571-resolve-java9/verify.groovy
Thu Jul 27 20:53:22 2017
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+File file = new File( basedir, "build.log" );
+assert file.exists();
+
+String buildLog = file.getText( "UTF-8" );
+assert buildLog.contains( 'org.slf4j:slf4j-api:jar:1.7.6:compile -- module' );
+
+return true;
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java?rev=1803234&r1=1803233&r2=1803234&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugins/dependency/resolvers/ResolveDependenciesMojo.java
Thu Jul 27 20:53:22 2017
@@ -33,7 +33,8 @@ import org.apache.maven.shared.artifact.
import java.io.IOException;
/**
- * Goal that resolves the project dependencies from the repository.
+ * Goal that resolves the project dependencies from the repository.
+ * When using this goal while running on Java 9 the module names will be
visible as well.
*
* @author <a href="mailto:[email protected]";>Brian Fox</a>
* @version $Id$
Modified: maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt.vm?rev=1803234&r1=1803233&r2=1803234&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt.vm
(original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/site/apt/index.apt.vm Thu
Jul 27 20:53:22 2017
@@ -80,7 +80,8 @@ ${project.name}
*{{{./purge-local-repository-mojo.html}dependency:purge-local-repository}}
tells Maven to clear dependency artifact
files out of the local repository, and optionally re-resolve them.
- *{{{./resolve-mojo.html}dependency:resolve}} tells Maven to resolve all
dependencies and displays the version.
+ *{{{./resolve-mojo.html}dependency:resolve}} tells Maven to resolve all
dependencies and displays the version. <<JAVA 9 NOTE:>> <will display the
+ module name when running with Java 9.>
*{{{./resolve-plugins-mojo.html}dependency:resolve-plugins}} tells Maven to
resolve plugins and their dependencies.
