From 8d46218a06801812a3708b69b204e6d94565c4fd Mon Sep 17 00:00:00 2001 From: Peter Kriens Date: Thu, 1 Jun 2023 15:26:09 +0200 Subject: [PATCH] Revert "Upgrade to plexus-build-api 1.1.0" The current Eclipse we're using is still based on the sonatype code base. In Eclipse, with ecj, the patch generates an error that it clearly does not do on javac/gradle. @gnodet, can you take a look? This reverts commit 24439733d9b5003bfb231eb274de3e7bb56addc8. --- Signed-off-by: Peter Kriens --- bndtools.m2e/bnd.bnd | 2 +- bndtools.test/tester/cnf/ext/repositories.bnd | 2 +- cnf/ext/central.mvn | 2 +- maven-plugins/bnd-maven-plugin/pom.xml | 2 +- .../java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java | 2 +- maven-plugins/bnd-plugin-parent/pom.xml | 4 ++-- maven-plugins/bnd-reporter-maven-plugin/pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bndtools.m2e/bnd.bnd b/bndtools.m2e/bnd.bnd index c9145ac6d7..c9902646ee 100644 --- a/bndtools.m2e/bnd.bnd +++ b/bndtools.m2e/bnd.bnd @@ -37,7 +37,7 @@ org.eclipse.m2e.core,\ org.eclipse.m2e.jdt,\ org.eclipse.osgi,\ - org.codehaus.plexus:plexus-build-api + org.sonatype.plexus:plexus-build-api Bundle-SymbolicName: ${p};singleton:=true Bundle-ActivationPolicy: lazy diff --git a/bndtools.test/tester/cnf/ext/repositories.bnd b/bndtools.test/tester/cnf/ext/repositories.bnd index 884fdb1a61..85a3996c2a 100644 --- a/bndtools.test/tester/cnf/ext/repositories.bnd +++ b/bndtools.test/tester/cnf/ext/repositories.bnd @@ -19,7 +19,7 @@ mavencentral: https://repo.maven.apache.org/maven2 cache="${workspace}/cnf/cache/stable/Eclipse-2018-12",\ aQute.bnd.repository.maven.pom.provider.BndPomRepository;\ name="Eclipse m2e 1.10.0 Dependencies";\ - revision="org.apache.maven:maven-core:3.5.3,org.apache.maven:maven-aether-provider:3.3.9,org.codehaus.plexus:plexus-build-api:1.1.0";\ + revision="org.apache.maven:maven-core:3.5.3,org.apache.maven:maven-aether-provider:3.3.9,org.sonatype.plexus:plexus-build-api:0.0.7";\ releaseUrls="${mavencentral}";\ location="${workspace}/cnf/cache/stable/Eclipse-m2e-1.10.0/index.xml" diff --git a/cnf/ext/central.mvn b/cnf/ext/central.mvn index 56c88ae158..e2def31420 100644 --- a/cnf/ext/central.mvn +++ b/cnf/ext/central.mvn @@ -161,6 +161,6 @@ org.apache.maven:maven-plugin-api:${maven.target.version} org.apache.maven:maven-repository-metadata:${maven.target.version} org.apache.maven:maven-settings:${maven.target.version} org.eclipse.aether:aether-api:${aether.version} -org.codehaus.plexus:plexus-build-api:1.1.0 +org.sonatype.plexus:plexus-build-api:0.0.7 org.codehaus.plexus:plexus-utils:3.0.22 org.codehaus.plexus:plexus-classworlds:2.5.2 diff --git a/maven-plugins/bnd-maven-plugin/pom.xml b/maven-plugins/bnd-maven-plugin/pom.xml index 9371c37dc0..314c438888 100644 --- a/maven-plugins/bnd-maven-plugin/pom.xml +++ b/maven-plugins/bnd-maven-plugin/pom.xml @@ -40,7 +40,7 @@ maven-mapping - org.codehaus.plexus + org.sonatype.plexus plexus-build-api diff --git a/maven-plugins/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java b/maven-plugins/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java index 3633995275..331fda524d 100644 --- a/maven-plugins/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java +++ b/maven-plugins/bnd-maven-plugin/src/main/java/aQute/bnd/maven/plugin/AbstractBndMavenPlugin.java @@ -74,7 +74,7 @@ import org.codehaus.plexus.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.codehaus.plexus.build.BuildContext; +import org.sonatype.plexus.build.incremental.BuildContext; /** * Abstract base class for all bnd-maven-plugin mojos. diff --git a/maven-plugins/bnd-plugin-parent/pom.xml b/maven-plugins/bnd-plugin-parent/pom.xml index 6404ee4256..e35bebdfab 100644 --- a/maven-plugins/bnd-plugin-parent/pom.xml +++ b/maven-plugins/bnd-plugin-parent/pom.xml @@ -114,9 +114,9 @@ provided - org.codehaus.plexus + org.sonatype.plexus plexus-build-api - 1.1.0 + 0.0.7 org.slf4j diff --git a/maven-plugins/bnd-reporter-maven-plugin/pom.xml b/maven-plugins/bnd-reporter-maven-plugin/pom.xml index 16f2a9ccca..dc07de8e8f 100644 --- a/maven-plugins/bnd-reporter-maven-plugin/pom.xml +++ b/maven-plugins/bnd-reporter-maven-plugin/pom.xml @@ -38,7 +38,7 @@ maven-mapping - org.codehaus.plexus + org.sonatype.plexus plexus-build-api