Add sonatype/MavenCentral repository support

Signed-off-by: Peter Kirschner <[email protected]>

Author: peterkir

.github/scripts/ci-build.sh

@@ -1,5 +1,21 @@
 #!/usr/bin/env bash
 set -ev
+
+# gpg key handling for github action build
+if [[ -n "${GPG_PRIVATE_KEY}" && -n "${GPG_PASSPHRASE}" ]]; then
+    echo "GPG environment variables validated successfully"
+    echo "${GPG_PRIVATE_KEY}" | \
+    gpg --batch \
+        --yes \
+        --pinentry-mode loopback \
+        --passphrase "${GPG_PASSPHRASE}" \
+        --import
+
+    echo -e "#\n# list secret keys\n#\n"
+    gpg --list-secret-keys --keyid-format LONG
+fi
+
+# build
 ./gradlew --no-daemon --version
 ./mvnw --version
 ./gradlew --no-daemon -Dmaven.repo.local=dist/m2 --continue :build "$@"

.github/workflows/cibuild.yml

@@ -29,6 +29,13 @@ env:
     -Daether.connector.http.connectionMaxTtl=25
     -Daether.connector.connectTimeout=120000
   BNDTOOLS_CORE_TEST_NOJUNITOSGI: true # This test is very flaky on CI
+  GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+  GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+  P2_SIGN: true
+  P2_SIGN_KEY: ${{ secrets.GPG_KEY_ID }}
+  P2_SIGN_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+  P2_PUB_KEY: ${{ secrets.GPG_PUBLIC_KEY }}        
+  SONATYPE_BEARER: ${{ secrets.SONATYPE_BEARER }}          
 
 defaults:
   run:

biz.aQute.bnd/src/aQute/bnd/main/bnd.java

@@ -69,6 +69,7 @@
 
 import aQute.bnd.build.Container;
 import aQute.bnd.build.Project;
+import aQute.bnd.build.Project.ReleaseParameter;
 import aQute.bnd.build.ProjectBuilder;
 import aQute.bnd.build.ProjectLauncher;
 import aQute.bnd.build.ProjectLauncher.LiveCoding;
@@ -1501,11 +1502,18 @@ public void _release(releaseOptions options) throws Exception {
 			}
 
 		}
-		for (Project p : projects) {
+
+		for (Iterator<Project> iterator = projects.iterator(); iterator.hasNext();) {
+			Project p = iterator.next();
 			if (repo != null) {
 				p.setProperty(Constants.RELEASEREPO, repo);
 			}
-			p.release(options.test());
+			if (iterator.hasNext()) {
+				p.release(options.test());
+			} else {
+				// releasing last bundle in workspace
+				p.release(new ReleaseParameter(null, options.test(), true));
+			}
 		}
 		if (project != null) {
 			getInfo(project);

biz.aQute.bndlib/src/aQute/bnd/build/Project.java

@@ -1142,16 +1142,17 @@ public URI releaseURI(String name, String jarName, InputStream jarStream) throws
 			RepositoryPlugin releaseRepo = releaseRepos.get(0); // use only
 																// first
 			// release repo
-			return releaseRepo(releaseRepo, builder, jarName, jarStream);
+			return releaseRepo(releaseRepo, builder, jarName, jarStream, false);
 		}
 	}
 
-	private URI releaseRepo(RepositoryPlugin releaseRepo, Processor context, String jarName, InputStream jarStream)
-		throws Exception {
+	private URI releaseRepo(RepositoryPlugin releaseRepo, Processor context, String jarName, InputStream jarStream,
+		boolean lastBundleInWorkspace) throws Exception {
 		logger.debug("release to {}", releaseRepo.getName());
 		try {
 			PutOptions putOptions = new RepositoryPlugin.PutOptions();
 			// TODO find sub bnd that is associated with this thing
+			context.set("startSonatypePublish", Boolean.toString(lastBundleInWorkspace));
 			putOptions.context = context;
 			PutResult r = releaseRepo.put(jarStream, putOptions);
 			logger.debug("Released {} to {} in repository {}", jarName, r.artifact, releaseRepo);
@@ -1213,14 +1214,30 @@ public void release(boolean test) throws Exception {
 	 * @throws Exception
 	 */
 	public void release(String name, boolean test) throws Exception {
-		List<RepositoryPlugin> releaseRepos = getReleaseRepos(name);
+		release(new ReleaseParameter(name, test, false));
+	}
+
+	public static class ReleaseParameter {
+		public String	name;
+		public boolean	test;
+		public boolean	lastBundleInWorkspace;
+
+		public ReleaseParameter(String name, boolean test, boolean lastBundleInWorkspace) {
+			this.name = name;
+			this.test = test;
+			this.lastBundleInWorkspace = lastBundleInWorkspace;
+		}
+	}
+
+	public void release(ReleaseParameter relParam) throws Exception, IOException {
+		List<RepositoryPlugin> releaseRepos = getReleaseRepos(relParam.name);
 		if (releaseRepos.isEmpty()) {
 			return;
 		}
 		logger.debug("release");
 		File[] jars = getBuildFiles(false);
 		if (jars == null) {
-			jars = build(test);
+			jars = build(relParam.test);
 			// If build fails jars will be null
 			if (jars == null) {
 				logger.debug("no jars built");
@@ -1232,9 +1249,17 @@ public void release(String name, boolean test) throws Exception {
 		try (ProjectBuilder builder = getBuilder(null)) {
 			builder.init();
 			for (RepositoryPlugin releaseRepo : releaseRepos) {
-				for (File jar : jars) {
+				for (int i = 0; i < jars.length; i++) {
+					File jar = jars[i];
 					try (InputStream jarStream = new BufferedInputStream(IO.stream(jar))) {
-						releaseRepo(releaseRepo, builder, jar.getName(), jarStream);
+						if (relParam.lastBundleInWorkspace && i == jars.length - 1) {
+							// this is the last jar builded inside bnd workspace
+							// and if appropriate "-sub" - the last of builded
+							// sub-bundles
+							releaseRepo(releaseRepo, builder, jar.getName(), jarStream, true);
+						} else {
+							releaseRepo(releaseRepo, builder, jar.getName(), jarStream, false);
+						}
 					}
 				}
 			}

biz.aQute.repository/src/aQute/bnd/repository/maven/provider/Configuration.java

@@ -81,4 +81,9 @@ public interface Configuration {
 	 * @return a comma separated list of tags.
 	 */
 	String tags();
+
+	/**
+	 * @return SonatypeMode for this repository none, manual or autopublish
+	 */
+	SonatypeMode sonatypeMode(String deflt);
 }

biz.aQute.repository/src/aQute/bnd/repository/maven/provider/MavenBndRepository.java

@@ -12,6 +12,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URLDecoder;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -99,13 +100,19 @@
 @BndPlugin(name = "MavenBndRepository", parameters = Configuration.class)
 public class MavenBndRepository extends BaseRepository implements RepositoryPlugin, RegistryPlugin, Plugin, Closeable,
 	Refreshable, Actionable, ToDependencyPom, ReleaseBracketingPlugin {
-	final static Pattern						PREPROCESS_P		= Pattern.compile("\\{\\s*(?<core>[^}]+)\\s*\\}");
 
-	private final static Logger					logger				= LoggerFactory.getLogger(MavenBndRepository.class);
-	private static final int					DEFAULT_POLL_TIME	= 5;
+	public static final String					SONATYPE_RELEASE_DIR			= "cnf/cache/sonatype-release";
+	public static final String					SONATYPE_DEPLOYMENTID_FILE		= "deploymendID.txt";
 
-	private static final String					NONE				= "NONE";
-	private static final String					MAVEN_REPO_LOCAL	= System.getProperty("maven.repo.local",
+	final static Pattern						PREPROCESS_P					= Pattern
+		.compile("\\{\\s*(?<core>[^}]+)\\s*\\}");
+
+	private final static Logger					logger							= LoggerFactory
+		.getLogger(MavenBndRepository.class);
+	private static final int					DEFAULT_POLL_TIME				= 5;
+
+	private static final String					NONE							= "NONE";
+	private static final String					MAVEN_REPO_LOCAL				= System.getProperty("maven.repo.local",
 		"~/.m2/repository");
 	private Configuration						configuration;
 	private Registry							registry;
@@ -115,16 +122,16 @@ public class MavenBndRepository extends BaseRepository implements RepositoryPlug
 	private boolean								inited;
 	IndexFile									index;
 	private ScheduledFuture<?>					indexPoller;
-	private RepoActions							actions				= new RepoActions(this);
+	private RepoActions							actions							= new RepoActions(this);
 	private String								name;
 	private HttpClient							client;
-	private ReleasePluginImpl					releasePlugin		= new ReleasePluginImpl(this, null);
-	private File								base				= IO.work;
-	private String								status				= null;
+	private ReleasePluginImpl					releasePlugin					= new ReleasePluginImpl(this, null);
+	private File								base							= IO.work;
+	private String								status							= null;
 	private boolean								remote;
-	private final AtomicReference<Throwable>	open				= new AtomicReference<>();
+	private final AtomicReference<Throwable>	open							= new AtomicReference<>();
 	Optional<Workspace>							workspace;
-	private AtomicBoolean						polling				= new AtomicBoolean(false);
+	private AtomicBoolean						polling							= new AtomicBoolean(false);
 
 	/**
 	 * Put result
@@ -282,8 +289,7 @@ private void doExtra(PutOptions options, ReleaseDTO instructions, IPom pom, Rele
 			String clazz = extra.clazz;
 			File file = new File(path);
 			if (!file.isFile())
-				reporter.error("-release-maven archive contains a path to a file that does not exist: %s",
-					file);
+				reporter.error("-release-maven archive contains a path to a file that does not exist: %s", file);
 			else {
 				try (Resource r = new FileResource(file)) {
 					Resource what;
@@ -487,7 +493,6 @@ private ReleaseDTO getReleaseDTO(Processor context) {
 			release.passphrase = sign.get("passphrase");
 		}
 
-
 		int clazz = 0;
 
 		for (Iterator<Entry<String, Attrs>> it = p.entrySet()
@@ -515,8 +520,7 @@ private ReleaseDTO getReleaseDTO(Processor context) {
 							.getAbsolutePath();
 					} else {
 						reporter.warning(
-							"The -maven-release instruction has an 'archive' without the path attribute: %s",
-							e);
+							"The -maven-release instruction has an 'archive' without the path attribute: %s", e);
 						continue;
 					}
 					extra.path = path;
@@ -649,18 +653,48 @@ synchronized boolean init() {
 		inited = true;
 
 		try {
-			List<MavenBackingRepository> release = MavenBackingRepository.create(configuration.releaseUrl(), reporter,
-				localRepo, client);
-			List<MavenBackingRepository> snapshot = MavenBackingRepository.create(configuration.snapshotUrl(), reporter,
-				localRepo, client);
-
+			List<MavenBackingRepository> release = new ArrayList<MavenBackingRepository>();
 			MavenBackingRepository staging = null;
 
-			if (configuration.stagingUrl() != null) {
-				staging = MavenBackingRepository.getBackingRepository(configuration.stagingUrl(),
-					reporter, localRepo, client);
+			String releaseUrl = configuration.releaseUrl();
+			SonatypeMode sonatypeMode = configuration.sonatypeMode(SonatypeMode.NONE.name());
+
+			String stagingUrl = configuration.stagingUrl();
+
+			String sonatypeUrl = null;
+			switch (sonatypeMode) {
+				case MANUAL, AUTOPUBLISH -> {
+					logger.info("deployment via Sonatype Central Portal configured in {} mode", sonatypeMode);
+					File releaseDir = registry.getPlugin(Workspace.class)
+						.getFile(SONATYPE_RELEASE_DIR);
+					if (stagingUrl == null) {
+						logger.debug("deployment via relase url to Sonatype Portal configured");
+						List<MavenBackingRepository> releaseLocal = MavenBackingRepository.create(releaseDir.toURI()
+							.toString(), reporter, localRepo, client);
+						release.addAll(releaseLocal);
+						sonatypeUrl = releaseUrl;
+					} else {
+						logger.debug("deployment via staging url to Sonatype Portal configured");
+						release = MavenBackingRepository.create(releaseUrl, reporter, localRepo, client);
+						staging = MavenBackingRepository.getBackingRepository(releaseDir.toURI()
+							.toString(), reporter, localRepo, client);
+						sonatypeUrl = stagingUrl;
+					}
+				}
+				case NONE -> {
+					if (stagingUrl == null) {
+						release = MavenBackingRepository.create(releaseUrl, reporter, localRepo, client);
+					} else {
+						release = MavenBackingRepository.create(releaseUrl, reporter, localRepo, client);
+						staging = MavenBackingRepository.getBackingRepository(configuration.stagingUrl(), reporter,
+							localRepo, client);
+					}
+				}
 			}
 
+			List<MavenBackingRepository> snapshot = MavenBackingRepository.create(configuration.snapshotUrl(), reporter,
+				localRepo, client);
+
 			for (MavenBackingRepository mbr : release) {
 				if (mbr.isRemote()) {
 					remote = true;
@@ -675,9 +709,13 @@ synchronized boolean init() {
 					}
 				}
 
-			storage = new MavenRepository(localRepo, name, release, staging, snapshot,
-				client.promiseFactory()
+			storage = new MavenRepository(localRepo, name, release, staging, snapshot, client.promiseFactory()
 				.executor(), reporter);
+			MavenRepository storageMvn = (MavenRepository) storage;
+			storageMvn.setSonatypeMode(sonatypeMode);
+			if (sonatypeUrl != null) {
+				storageMvn.setSonatypePublisherUrl(sonatypeUrl);
+			}
 
 			File indexFile = getIndexFile();
 			Processor domain = (registry != null) ? registry.getPlugin(Processor.class) : null;
@@ -1085,4 +1123,8 @@ public boolean isRemote() {
 		return remote;
 	}
 
+	public HttpClient getClient() {
+		return client;
+	}
+
 }

biz.aQute.repository/src/aQute/bnd/repository/maven/provider/SonatypeMode.java

@@ -0,0 +1,30 @@
+package aQute.bnd.repository.maven.provider;
+
+public enum SonatypeMode {
+
+	/*
+	 * No special Sonatype Portal handling
+	 */
+	NONE("none"),
+
+	/*
+	 * Manual mode where artifacts are staged but not published
+	 */
+	MANUAL("manual"),
+
+	/*
+	 * Automatic publishing after upload and validatíon
+	 */
+	AUTOPUBLISH("autopublish");
+
+	private final String value;
+
+	SonatypeMode(String value) {
+		this.value = value;
+	}
+
+	@Override
+	public String toString() {
+		return value;
+	}
+}

biz.aQute.repository/src/aQute/maven/provider/MavenBackingRepository.java

@@ -231,7 +231,9 @@ static public MavenBackingRepository getBackingRepository(String url, Reporter r
 		if (uri.getScheme()
 			.equalsIgnoreCase("file")) {
 			File remote = new File(uri);
-			return new MavenFileRepository(localRepo, remote, reporter);
+			MavenFileRepository fileRepo = new MavenFileRepository(localRepo, remote, reporter);
+			fileRepo.setClient(client);
+			return fileRepo;
 		} else {
 			return new MavenRemoteRepository(localRepo, client, url, reporter);
 		}