[maven-dependency-tree] branch master updated: [MSHARED-1069] Upgrade Parent to 36

[sj...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-tree.git


The following commit(s) were added to refs/heads/master by this push:
     new 7d1c702  [MSHARED-1069] Upgrade Parent to 36
7d1c702 is described below

commit 7d1c702fcc00f118d02ecb03465cb2a1f364d17e
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sat May 7 12:02:56 2022 +0200

    [MSHARED-1069] Upgrade Parent to 36
---
 pom.xml                  | 22 ++++------------------
 src/it/reactor/setup.bsh | 43 -------------------------------------------
 2 files changed, 4 insertions(+), 61 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5f5042c..16c3f8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>
-    <version>34</version>
+    <version>36</version>
     <relativePath />
   </parent>
 
@@ -45,7 +45,7 @@
   </issueManagement>
   <ciManagement>
     <system>Jenkins</system>
-    <url>https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-dependency-tree/</url>
+    <url>https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-dependency-tree/</url>
   </ciManagement>
   <distributionManagement>
     <site>
@@ -102,26 +102,11 @@
   </dependencies>
 
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.3.1</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>3.2.2</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>3.10.0</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-metadata</artifactId>
+        <version>2.1.1</version>
         <executions>
           <execution>
             <goals>
@@ -137,6 +122,7 @@
           <debug>true</debug>
           <projectsDirectory>src/it</projectsDirectory>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
+          <cloneClean>true</cloneClean>
           <preBuildHookScript>setup</preBuildHookScript>
           <postBuildHookScript>verify</postBuildHookScript>
           <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
diff --git a/src/it/reactor/setup.bsh b/src/it/reactor/setup.bsh
deleted file mode 100644
index 9c7f0c9..0000000
--- a/src/it/reactor/setup.bsh
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.
- */
-
-import java.io.*;
-
-import org.codehaus.plexus.util.*;
-
-files = FileUtils.getFiles( basedir, "resolved-*.txt", "" ).iterator();
-
-while ( files.hasNext() )
-{
-  file = files.next();
-  System.out.println( "deleting file " + file );
-  file.delete();
-}
-
-// delete modules from local repository: not really necessary since invoker.properties only compiles, but sanity check
-files = FileUtils.getDirectoryNames( new File( basedir, "../.." ), "local-repo/org/apache/maven/its/dependency-tree/module*", "", true ).iterator();
-
-while ( files.hasNext() )
-{
-  file = new File( files.next() );
-  System.out.println( "deleting directory " + file );
-  FileUtils.deleteDirectory( file );
-}
-
-return true;