You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2017/08/28 11:51:25 UTC
svn commit: r1806434 - in /maven/plugins/trunk/maven-jdeps-plugin: ./
src/it/basic/ src/it/basic/src/ src/it/basic/src/main/
src/it/basic/src/main/java/ src/it/unsupported-api_main/
src/it/unsupported-api_test/ src/main/java/org/apache/maven/plugin/jdeps/
Author: rfscholte
Date: Mon Aug 28 11:51:25 2017
New Revision: 1806434
URL: http://svn.apache.org/viewvc?rev=1806434&view=rev
Log:
[MJDEPS-4] Upgrade commons-lang to be able to run with JDK9
Added:
maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/
maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/invoker.properties
maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/pom.xml
maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/src/
maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/src/main/
maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/src/main/java/
maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/src/main/java/Main.java
Modified:
maven/plugins/trunk/maven-jdeps-plugin/pom.xml
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_main/invoker.properties
maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_test/invoker.properties
maven/plugins/trunk/maven-jdeps-plugin/src/main/java/org/apache/maven/plugin/jdeps/AbstractJDepsMojo.java
Modified: maven/plugins/trunk/maven-jdeps-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jdeps-plugin/pom.xml?rev=1806434&r1=1806433&r2=1806434&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jdeps-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-jdeps-plugin/pom.xml Mon Aug 28 11:51:25 2017
@@ -89,9 +89,9 @@ under the License.
<version>3.0.24</version>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.5</version>
</dependency>
<!-- TEST -->
Added: maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/invoker.properties?rev=1806434&view=auto
==============================================================================
--- maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/invoker.properties (added)
+++ maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/invoker.properties Mon Aug 28 11:51:25 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.8+
+invoker.goals=process-classes
Added: maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/pom.xml?rev=1806434&view=auto
==============================================================================
--- maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/pom.xml (added)
+++ maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/pom.xml Mon Aug 28 11:51:25 2017
@@ -0,0 +1,51 @@
+<?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.jdeps.its</groupId>
+ <artifactId>basic</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <properties>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>@project.groupId@</groupId>
+ <artifactId>@project.artifactId@</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jdkinternals</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added: maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/src/main/java/Main.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/src/main/java/Main.java?rev=1806434&view=auto
==============================================================================
--- maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/src/main/java/Main.java (added)
+++ maven/plugins/trunk/maven-jdeps-plugin/src/it/basic/src/main/java/Main.java Mon Aug 28 11:51:25 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.
+ */
+
+public class Main
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
\ No newline at end of file
Modified: maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_main/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_main/invoker.properties?rev=1806434&r1=1806433&r2=1806434&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_main/invoker.properties (original)
+++ maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_main/invoker.properties Mon Aug 28 11:51:25 2017
@@ -15,6 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-invoker.java.version=1.8+
+invoker.java.version=1.8
invoker.goals=process-classes
invoker.buildResult=failure
Modified: maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_test/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_test/invoker.properties?rev=1806434&r1=1806433&r2=1806434&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_test/invoker.properties (original)
+++ maven/plugins/trunk/maven-jdeps-plugin/src/it/unsupported-api_test/invoker.properties Mon Aug 28 11:51:25 2017
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-invoker.java.version=1.8+
+invoker.java.version=1.8
invoker.goals.1=process-classes
invoker.buildResult.1=success
Modified: maven/plugins/trunk/maven-jdeps-plugin/src/main/java/org/apache/maven/plugin/jdeps/AbstractJDepsMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jdeps-plugin/src/main/java/org/apache/maven/plugin/jdeps/AbstractJDepsMojo.java?rev=1806434&r1=1806433&r2=1806434&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jdeps-plugin/src/main/java/org/apache/maven/plugin/jdeps/AbstractJDepsMojo.java (original)
+++ maven/plugins/trunk/maven-jdeps-plugin/src/main/java/org/apache/maven/plugin/jdeps/AbstractJDepsMojo.java Mon Aug 28 11:51:25 2017
@@ -29,7 +29,7 @@ import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.SystemUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
@@ -382,29 +382,7 @@ public abstract class AbstractJDepsMojo
return jdepsExe.getAbsolutePath();
}
- // ----------------------------------------------------------------------
- // Try to find jdepsExe from System.getProperty( "java.home" )
- // By default, System.getProperty( "java.home" ) = JRE_HOME and JRE_HOME
- // should be in the JDK_HOME
- // ----------------------------------------------------------------------
- // For IBM's JDK 1.2
- if ( SystemUtils.IS_OS_AIX )
- {
- jdepsExe =
- new File( SystemUtils.getJavaHome() + File.separator + ".." + File.separator + "sh", jdepsCommand );
- }
- // For Apple's JDK 1.6.x (and older?) on Mac OSX
- // CHECKSTYLE_OFF: MagicNumber
- else if ( SystemUtils.IS_OS_MAC_OSX && SystemUtils.JAVA_VERSION_FLOAT < 1.7f )
- // CHECKSTYLE_ON: MagicNumber
- {
- jdepsExe = new File( SystemUtils.getJavaHome() + File.separator + "bin", jdepsCommand );
- }
- else
- {
- jdepsExe =
- new File( SystemUtils.getJavaHome() + File.separator + ".." + File.separator + "bin", jdepsCommand );
- }
+ jdepsExe = new File( SystemUtils.getJavaHome() + File.separator + ".." + File.separator + "sh", jdepsCommand );
// ----------------------------------------------------------------------
// Try to find jdepsExe from JAVA_HOME environment variable