From 7d1c702fcc00f118d02ecb03465cb2a1f364d17e Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Sat, 7 May 2022 12:02:56 +0200 Subject: [PATCH] [MSHARED-1069] Upgrade Parent to 36 --- pom.xml | 22 ++++---------------- src/it/reactor/setup.bsh | 43 ---------------------------------------- 2 files changed, 4 insertions(+), 61 deletions(-) delete mode 100644 src/it/reactor/setup.bsh diff --git a/pom.xml b/pom.xml index 5f5042c..16c3f8c 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.shared maven-shared-components - 34 + 36 @@ -45,7 +45,7 @@ Jenkins - https://ci-builds.apache.org/job/Maven/job/maven-box/job/maven-dependency-tree/ + https://ci-maven.apache.org/job/Maven/job/maven-box/job/maven-dependency-tree/ @@ -102,26 +102,11 @@ - - - - maven-javadoc-plugin - 3.3.1 - - - maven-project-info-reports-plugin - 3.2.2 - - - maven-site-plugin - 3.10.0 - - - org.codehaus.plexus plexus-component-metadata + 2.1.1 @@ -137,6 +122,7 @@ true src/it ${project.build.directory}/it + true setup verify ${project.build.directory}/local-repo 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;