Add an organize-manifest mojo

tycho-core/src/main/java/org/eclipse/tycho/core/resolver/target/ArtifactTypeHelper.java → tycho-api/src/main/java/org/eclipse/tycho/ArtifactTypeHelper.java

@@ -10,7 +10,7 @@
  * Contributors:
  *    SAP SE - initial API and implementation
  *******************************************************************************/
-package org.eclipse.tycho.core.resolver.target;
+package org.eclipse.tycho;
 
 import static org.eclipse.tycho.ArtifactType.TYPE_BUNDLE_FRAGMENT;
 import static org.eclipse.tycho.ArtifactType.TYPE_ECLIPSE_FEATURE;
@@ -24,20 +24,14 @@
 import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;
 import org.eclipse.equinox.p2.metadata.Version;
 import org.eclipse.equinox.p2.metadata.VersionRange;
-import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
 import org.eclipse.equinox.p2.query.IQuery;
 import org.eclipse.equinox.p2.query.QueryUtil;
 import org.eclipse.equinox.spi.p2.publisher.PublisherHelper;
-import org.eclipse.tycho.ArtifactKey;
-import org.eclipse.tycho.ArtifactType;
-import org.eclipse.tycho.DefaultArtifactKey;
-import org.eclipse.tycho.IArtifactFacade;
-import org.eclipse.tycho.IllegalArtifactReferenceException;
-import org.eclipse.tycho.PackagingType;
 
 public class ArtifactTypeHelper {
 
-    // p2 installable units
+    public static final String CAPABILITY_NS_OSGI_BUNDLE = "osgi.bundle"; //see org.eclipse.equinox.p2.publisher.eclipse.BundlesAction.CAPABILITY_NS_OSGI_BUNDLE
+    public static final String OSGI_BUNDLE_CLASSIFIER = "osgi.bundle"; //see org.eclipse.equinox.p2.publisher.eclipse.BundlesAction.OSGI_BUNDLE_CLASSIFIER
 
     /**
      * Returns a query matching the installable units representing the specified Eclipse
@@ -90,8 +84,7 @@ public static IRequirement createRequirementFor(String type, String id, VersionR
     }
 
     private static IRequirement createBundleRequirement(String id, VersionRange versionRange) {
-        return MetadataFactory.createRequirement(BundlesAction.CAPABILITY_NS_OSGI_BUNDLE, id, versionRange, null, false,
-                true); // optional=false, multiple=true
+        return MetadataFactory.createRequirement(CAPABILITY_NS_OSGI_BUNDLE, id, versionRange, null, false, true); // optional=false, multiple=true
     }
 
     private static IRequirement createFeatureRequirement(String id, VersionRange versionRange) {
@@ -187,4 +180,8 @@ public static String getType(IArtifactFacade artifactFacade) {
         return ArtifactType.TYPE_INSTALLABLE_UNIT;
     }
 
+    public static boolean isBundle(IArtifactKey key) {
+        return key != null && OSGI_BUNDLE_CLASSIFIER.equals(key.getClassifier());
+    }
+
 }

tycho-api/src/main/java/org/eclipse/tycho/TargetPlatform.java

@@ -13,7 +13,12 @@
 package org.eclipse.tycho;
 
 import java.io.File;
+import java.util.stream.Stream;
 
+import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+import org.eclipse.equinox.p2.metadata.VersionRange;
+import org.eclipse.equinox.p2.query.IQuery;
+import org.eclipse.equinox.p2.query.IQueryResult;
 import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
 import org.eclipse.equinox.spi.p2.publisher.PublisherHelper;
@@ -89,6 +94,18 @@ default ResolvedArtifactKey resolvePackage(String packageName, String versionRef
                 location);
     }
 
+    default Stream<ArtifactKey> resolvePackages(String packageName, VersionRange versionRange) {
+        IQuery<IInstallableUnit> query = ArtifactTypeHelper.createQueryFor(PublisherHelper.CAPABILITY_NS_JAVA_PACKAGE,
+                packageName, versionRange);
+        IQueryResult<IInstallableUnit> result = getMetadataRepository().query(query, null);
+        return result.stream().flatMap(iu -> {
+            return iu.getArtifacts().stream().filter(key -> ArtifactTypeHelper.isBundle(key)).map(key -> {
+                return new DefaultArtifactKey(ArtifactType.TYPE_ECLIPSE_PLUGIN, key.getId(),
+                        key.getVersion().toString());
+            });
+        });
+    }
+
     /**
      * @return the target platform content as a {@link IMetadataRepository}.
      */

tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/TargetPlatformProject.java

@@ -22,6 +22,7 @@
 import org.eclipse.equinox.p2.metadata.IArtifactKey;
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.tycho.ArtifactKey;
+import org.eclipse.tycho.ArtifactTypeHelper;
 import org.eclipse.tycho.DefaultArtifactKey;
 import org.eclipse.tycho.DependencyArtifacts;
 import org.eclipse.tycho.PackagingType;
@@ -32,7 +33,6 @@
 import org.eclipse.tycho.core.ArtifactDependencyWalker;
 import org.eclipse.tycho.core.TychoProject;
 import org.eclipse.tycho.core.osgitools.targetplatform.DefaultDependencyArtifacts;
-import org.eclipse.tycho.core.resolver.target.ArtifactTypeHelper;
 import org.eclipse.tycho.model.Feature;
 import org.eclipse.tycho.targetplatform.P2TargetPlatform;
 

tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultP2ResolutionResult.java

@@ -27,8 +27,8 @@
 import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.tycho.ArtifactKey;
 import org.eclipse.tycho.ArtifactType;
+import org.eclipse.tycho.ArtifactTypeHelper;
 import org.eclipse.tycho.DefaultArtifactKey;
-import org.eclipse.tycho.core.resolver.target.ArtifactTypeHelper;
 import org.eclipse.tycho.p2.resolver.ClassifiedArtifactKey;
 import org.eclipse.tycho.p2.resolver.ClassifiedLocation;
 import org.eclipse.tycho.targetplatform.P2TargetPlatform;

tycho-core/src/main/java/org/eclipse/tycho/core/resolver/target/ArtifactMatcher.java

@@ -31,6 +31,7 @@
 import org.eclipse.equinox.p2.query.IQueryResult;
 import org.eclipse.equinox.p2.query.QueryUtil;
 import org.eclipse.equinox.spi.p2.publisher.PublisherHelper;
+import org.eclipse.tycho.ArtifactTypeHelper;
 import org.eclipse.tycho.IllegalArtifactReferenceException;
 
 public class ArtifactMatcher {

tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/PublishProductToolImpl.java

@@ -33,10 +33,10 @@
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
 import org.eclipse.tycho.ArtifactKey;
 import org.eclipse.tycho.ArtifactType;
+import org.eclipse.tycho.ArtifactTypeHelper;
 import org.eclipse.tycho.BuildFailureException;
 import org.eclipse.tycho.DependencySeed;
 import org.eclipse.tycho.Interpolator;
-import org.eclipse.tycho.core.resolver.target.ArtifactTypeHelper;
 import org.eclipse.tycho.core.shared.MavenLogger;
 import org.eclipse.tycho.p2.repository.PublishingRepository;
 import org.eclipse.tycho.p2.tools.publisher.facade.PublishProductTool;

tycho-core/src/main/java/org/eclipse/tycho/p2resolver/P2ResolverImpl.java

@@ -48,6 +48,7 @@
 import org.eclipse.equinox.p2.query.QueryUtil;
 import org.eclipse.tycho.ArtifactKey;
 import org.eclipse.tycho.ArtifactType;
+import org.eclipse.tycho.ArtifactTypeHelper;
 import org.eclipse.tycho.DefaultArtifactKey;
 import org.eclipse.tycho.DependencyResolutionException;
 import org.eclipse.tycho.ExecutionEnvironmentConfiguration;
@@ -66,7 +67,6 @@
 import org.eclipse.tycho.core.resolver.P2ResolutionResult;
 import org.eclipse.tycho.core.resolver.P2Resolver;
 import org.eclipse.tycho.core.resolver.shared.PomDependencies;
-import org.eclipse.tycho.core.resolver.target.ArtifactTypeHelper;
 import org.eclipse.tycho.core.shared.LoggingProgressMonitor;
 import org.eclipse.tycho.core.shared.MavenLogger;
 import org.eclipse.tycho.core.shared.MultiLineLogger;

tycho-core/src/main/java/org/eclipse/tycho/p2resolver/PomDependencyCollectorImpl.java

@@ -37,12 +37,12 @@
 import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
 import org.eclipse.tycho.ArtifactKey;
 import org.eclipse.tycho.ArtifactType;
+import org.eclipse.tycho.ArtifactTypeHelper;
 import org.eclipse.tycho.DefaultArtifactKey;
 import org.eclipse.tycho.IArtifactFacade;
 import org.eclipse.tycho.IRawArtifactFileProvider;
 import org.eclipse.tycho.ReactorProject;
 import org.eclipse.tycho.TychoConstants;
-import org.eclipse.tycho.core.resolver.target.ArtifactTypeHelper;
 import org.eclipse.tycho.core.resolver.target.FileArtifactRepository;
 import org.eclipse.tycho.p2.repository.ArtifactTransferPolicies;
 import org.eclipse.tycho.p2.repository.FileRepositoryArtifactProvider;

tycho-core/src/main/java/org/eclipse/tycho/p2resolver/TargetPlatformBaseImpl.java

@@ -26,6 +26,7 @@
 import org.eclipse.equinox.p2.metadata.Version;
 import org.eclipse.equinox.p2.metadata.VersionRange;
 import org.eclipse.tycho.ArtifactType;
+import org.eclipse.tycho.ArtifactTypeHelper;
 import org.eclipse.tycho.DefaultArtifactKey;
 import org.eclipse.tycho.DependencyResolutionException;
 import org.eclipse.tycho.ExecutionEnvironmentResolutionHints;
@@ -34,7 +35,6 @@
 import org.eclipse.tycho.IllegalArtifactReferenceException;
 import org.eclipse.tycho.ReactorProjectIdentities;
 import org.eclipse.tycho.core.resolver.target.ArtifactMatcher;
-import org.eclipse.tycho.core.resolver.target.ArtifactTypeHelper;
 import org.eclipse.tycho.p2.repository.LocalArtifactRepository;
 import org.eclipse.tycho.targetplatform.P2TargetPlatform;
 

tycho-core/src/main/java/org/eclipse/tycho/p2resolver/TargetPlatformFactoryImpl.java

@@ -64,6 +64,7 @@
 import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository;
 import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
+import org.eclipse.tycho.ArtifactTypeHelper;
 import org.eclipse.tycho.ExecutionEnvironmentConfiguration;
 import org.eclipse.tycho.ExecutionEnvironmentResolutionHints;
 import org.eclipse.tycho.IArtifactFacade;
@@ -84,7 +85,6 @@
 import org.eclipse.tycho.core.osgitools.MavenBundleResolver;
 import org.eclipse.tycho.core.osgitools.OsgiBundleProject;
 import org.eclipse.tycho.core.resolver.shared.ReferencedRepositoryMode;
-import org.eclipse.tycho.core.resolver.target.ArtifactTypeHelper;
 import org.eclipse.tycho.core.resolver.target.DuplicateReactorIUsException;
 import org.eclipse.tycho.core.resolver.target.FileArtifactRepository;
 import org.eclipse.tycho.core.resolver.target.TargetPlatformFilterEvaluator;

tycho-extras/tycho-dependency-tools-plugin/pom.xml

@@ -39,6 +39,10 @@
 			<groupId>org.eclipse.tycho</groupId>
 			<artifactId>tycho-core</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>biz.aQute.bnd</groupId>
+			<artifactId>biz.aQute.bndlib</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

tycho-extras/tycho-dependency-tools-plugin/src/main/java/org/eclipse/tycho/extras/pde/ListDependenciesMojo.java → tycho-extras/tycho-dependency-tools-plugin/src/main/java/org/eclipse/tycho/extras/pde/list/ListDependenciesMojo.java

@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.tycho.extras.pde;
+package org.eclipse.tycho.extras.pde.list;
 
 import java.io.BufferedWriter;
 import java.io.File;

tycho-extras/tycho-dependency-tools-plugin/src/main/java/org/eclipse/tycho/extras/pde/organize/BundleInfo.java

@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2023 Christoph Läubrich and others.
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.tycho.extras.pde.organize;
+
+import java.util.jar.Manifest;
+
+import org.osgi.framework.Constants;
+import org.osgi.framework.Version;
+
+public class BundleInfo {
+
+    private Version version;
+    private Manifest manifest;
+
+    public BundleInfo(Manifest manifest) {
+        this.manifest = manifest;
+    }
+
+    public Manifest manifest() {
+        return manifest;
+    }
+
+    public Version version() {
+        if (version == null) {
+            String v = manifest().getMainAttributes().getValue(Constants.BUNDLE_VERSION);
+            if (v == null) {
+                v = "0";
+            }
+            version = Version.parseVersion(v);
+        }
+        return version;
+    }
+}

tycho-extras/tycho-dependency-tools-plugin/src/main/java/org/eclipse/tycho/extras/pde/organize/ExportedPackages.java

@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2023 Christoph Läubrich and others.
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.tycho.extras.pde.organize;
+
+public class ExportedPackages {
+
+    public ExportedPackages(String manifestValue) {
+        // TODO Auto-generated constructor stub
+    }
+
+}

tycho-extras/tycho-dependency-tools-plugin/src/main/java/org/eclipse/tycho/extras/pde/organize/ImportedPackage.java

@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2023 Christoph Läubrich and others.
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.tycho.extras.pde.organize;
+
+import org.eclipse.equinox.p2.metadata.VersionRange;
+import org.osgi.framework.Constants;
+
+import aQute.bnd.header.Attrs;
+
+public class ImportedPackage {
+
+    private ImportedPackages packages;
+    private String packageName;
+    private Attrs attrs;
+    private VersionRange version;
+
+    public ImportedPackage(ImportedPackages packages, String packageName, Attrs attrs) {
+        this.packages = packages;
+        this.packageName = packageName;
+        this.attrs = attrs;
+    }
+
+    public String getPackageName() {
+        return packageName;
+    }
+
+    public VersionRange getVersionRange() {
+        if (version == null) {
+            String string = attrs.get(Constants.VERSION_ATTRIBUTE);
+            if (string == null) {
+                version = VersionRange.emptyRange;
+            } else {
+                version = VersionRange.create(string);
+            }
+        }
+        return version;
+    }
+
+    public boolean isJava() {
+        return packageName.startsWith("java.");
+    }
+
+    @Override
+    public String toString() {
+        VersionRange version = getVersionRange();
+        if (version.equals(VersionRange.emptyRange)) {
+            return getPackageName();
+        }
+        return getPackageName() + " " + getVersionRange();
+    }
+
+}

tycho-extras/tycho-dependency-tools-plugin/src/main/java/org/eclipse/tycho/extras/pde/organize/ImportedPackages.java

@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2023 Christoph Läubrich and others.
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package org.eclipse.tycho.extras.pde.organize;
+
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+import java.util.stream.Stream;
+
+import aQute.bnd.header.Attrs;
+import aQute.bnd.header.OSGiHeader;
+import aQute.bnd.header.Parameters;
+
+public class ImportedPackages {
+
+    //import package order is not important so we can sort here by name
+    private Map<String, ImportedPackage> packages = new TreeMap<>();
+
+    public ImportedPackages(String manifestValue) {
+        if (manifestValue != null) {
+            Parameters header = OSGiHeader.parseHeader(manifestValue);
+            for (Entry<String, Attrs> entry : header.entrySet()) {
+                packages.put(entry.getKey(), new ImportedPackage(this, entry.getKey(), entry.getValue()));
+            }
+        }
+    }
+
+    public Stream<ImportedPackage> packages() {
+        return packages.values().stream();
+
+    }
+
+}