Update maven-dependency-tree & maven-archetype-plugin

felipe29 · Mar 2, 2020 · 21ee047 · 21ee047
1 parent 6d97666
commit 21ee047
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/java/maven.embedder/external/binaries-list b/java/maven.embedder/external/binaries-list
@@ -15,5 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 A2AC1CD690AB4C80DEFE7F9BCE14D35934C35CEC jdom:jdom:1.0
-BF206C4AA93C74A739FBAF1F1C78E3AD5F167245 org.apache.maven.shared:maven-dependency-tree:2.0
+5D9CE6ADD7B714B8095F0E3E396C5E9F8C5DCFEF org.apache.maven.shared:maven-dependency-tree:2.2
 2DDF9BB8C3B41BC2891832A6D6FC25F8BF41D77F org.apache.maven:apache-maven:3.3.9:bin@zip
diff --git a/...nal/maven-dependency-tree-2.0-license.txt → ...nal/maven-dependency-tree-2.2-license.txt b/...nal/maven-dependency-tree-2.0-license.txt → ...nal/maven-dependency-tree-2.2-license.txt
@@ -1,9 +1,9 @@
 Name: Maven Dependency Tree
-Version: 2.0
+Version: 2.2
 Description: Maven Dependency Tree
 License: Apache-2.0
 Origin: Apache Software Foundation
-URL: http://maven.apache.org/
+URL: https://maven.apache.org/
 
                                  Apache License
                            Version 2.0, January 2004

diff --git a/java/maven.embedder/nbproject/project.properties b/java/maven.embedder/nbproject/project.properties
@@ -16,10 +16,10 @@
 # under the License.
 
 is.autoload=true
-javac.source=1.7
+javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial
 release.external/jdom-1.0.jar=modules/ext/maven/jdom-1.0.jar
-release.external/maven-dependency-tree-2.0.jar=modules/ext/maven/maven-dependency-tree-2.0.jar
+release.external/maven-dependency-tree-2.2.jar=modules/ext/maven/maven-dependency-tree-2.2.jar
 bundled.maven=apache-maven-3.3.9
 extra.module.files=maven/
 nbm.executable.files=maven/bin/mvn,maven/bin/mvnDebug,maven/bin/mvnyjp

diff --git a/java/maven.embedder/nbproject/project.xml b/java/maven.embedder/nbproject/project.xml
@@ -265,8 +265,8 @@
                 <package>org.apache.maven.wagon.shared.http4</package>
             </friend-packages>
             <class-path-extension>
-                <runtime-relative-path>ext/maven/maven-dependency-tree-2.0.jar</runtime-relative-path>
-                <binary-origin>external/maven-dependency-tree-2.0.jar</binary-origin>
+                <runtime-relative-path>ext/maven/maven-dependency-tree-2.2.jar</runtime-relative-path>
+                <binary-origin>external/maven-dependency-tree-2.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/maven/jdom-1.0.jar</runtime-relative-path>

diff --git a/java/maven/src/org/netbeans/modules/maven/options/MavenCommandSettings.java b/java/maven/src/org/netbeans/modules/maven/options/MavenCommandSettings.java
@@ -65,7 +65,7 @@ public String getCommand(String command) {
                 toRet = "install:install-file";//NOI18N
             }
             else if (COMMAND_CREATE_ARCHETYPENG.equals(command)) {
-                toRet = "org.apache.maven.plugins:maven-archetype-plugin:2.4:generate"; // NOI18N
+                toRet = "org.apache.maven.plugins:maven-archetype-plugin:3.1.2:generate"; // NOI18N
             }
             else if (COMMAND_SCM_CHECKOUT.equals(command)) {
                 toRet = "scm:checkout";//NOI18N