Remove support for deployableFeature option

The deployableFeature option will create "standard eclipse update site directory with feature content will be created under target folder" but we already removed site-packaging from tycho for a while, if one wants to archive similar a category.xml with eclipse-repository packaging gives much more control and power to the user.
eclipse-tycho · Nov 24, 2023 · 0f99be6 · 0f99be6
1 parent a6dfcba
commit 0f99be6
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 336 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -78,6 +78,7 @@ If filtering provided artifacts is enabled, the repository references automatica
 using exclusion and inclusion patterns and therefore allows more fine-grained control which references are added.
 Additionally the automatically added references can be filter based on if they provide any of the filtered units or not.
 If `addOnlyProviding` is `true` repositories that don't provide any filtered unit are not added to the assembled repo.
+
 ```xml
 <plugin>
 	<groupId>org.eclipse.tycho</groupId>
@@ -98,6 +99,11 @@ If `addOnlyProviding` is `true` repositories that don't provide any filtered uni
 
 ```
 
+### Remove support for deployableFeature option
+
+The deployableFeature option will create "standard eclipse update site directory with feature content will be created under target folder" but we already removed site-packaging from Tycho for a while, if one wants to archive similar a category.xml with eclipse-repository packaging gives much more control and power to the user.
+
+
 ## 4.0.3
 
 ### new option to filter added repository-references when assembling a p2-repository

diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
@@ -40,7 +40,6 @@
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.Logger;
-import org.eclipse.equinox.p2.metadata.IInstallableUnit;
 import org.eclipse.osgi.container.namespaces.EclipsePlatformNamespace;
 import org.eclipse.osgi.internal.framework.FilterImpl;
 import org.eclipse.tycho.ArtifactDescriptor;
@@ -58,10 +57,8 @@
 import org.eclipse.tycho.ResolvedArtifactKey;
 import org.eclipse.tycho.TargetEnvironment;
 import org.eclipse.tycho.TychoConstants;
-import org.eclipse.tycho.core.ArtifactDependencyVisitor;
 import org.eclipse.tycho.core.ArtifactDependencyWalker;
 import org.eclipse.tycho.core.BundleProject;
-import org.eclipse.tycho.core.PluginDescription;
 import org.eclipse.tycho.core.TargetPlatformConfiguration;
 import org.eclipse.tycho.core.TychoProject;
 import org.eclipse.tycho.core.ee.ExecutionEnvironmentUtils;
@@ -73,9 +70,6 @@
 import org.eclipse.tycho.core.osgitools.project.EclipsePluginProjectImpl;
 import org.eclipse.tycho.core.resolver.P2ResolverFactory;
 import org.eclipse.tycho.core.utils.TychoProjectUtils;
-import org.eclipse.tycho.model.Feature;
-import org.eclipse.tycho.model.ProductConfiguration;
-import org.eclipse.tycho.model.UpdateSite;
 import org.eclipse.tycho.model.classpath.JUnitBundle;
 import org.eclipse.tycho.model.classpath.JUnitClasspathContainerEntry;
 import org.eclipse.tycho.model.classpath.LibraryClasspathEntry;
@@ -118,40 +112,7 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
 
     @Override
     public ArtifactDependencyWalker getDependencyWalker(ReactorProject project) {
-        final DependencyArtifacts artifacts = getDependencyArtifacts(project);
-
-        final List<ClasspathEntry> cp = getClasspath(project);
-
-        return new ArtifactDependencyWalker() {
-            @Override
-            public void walk(ArtifactDependencyVisitor visitor) {
-                for (ClasspathEntry entry : cp) {
-                    ArtifactDescriptor artifact = artifacts.getArtifact(entry.getArtifactKey());
-                    ArtifactKey key = artifact.getKey();
-                    File location = artifact.getLocation(true);
-                    ReactorProject project = artifact.getMavenProject();
-                    String classifier = artifact.getClassifier();
-                    Collection<IInstallableUnit> installableUnits = artifact.getInstallableUnits();
-
-                    PluginDescription plugin = new DefaultPluginDescription(key, location, project, classifier, null,
-                            installableUnits);
-
-                    visitor.visitPlugin(plugin);
-                }
-            }
-
-            @Override
-            public void traverseFeature(File location, Feature feature, ArtifactDependencyVisitor visitor) {
-            }
-
-            @Override
-            public void traverseUpdateSite(UpdateSite site, ArtifactDependencyVisitor artifactDependencyVisitor) {
-            }
-
-            @Override
-            public void traverseProduct(ProductConfiguration productConfiguration, ArtifactDependencyVisitor visitor) {
-            }
-        };
+        throw new UnsupportedOperationException();
     }
 
     @Override

diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/P2IUProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/P2IUProject.java
@@ -19,7 +19,6 @@
 import org.eclipse.tycho.DefaultArtifactKey;
 import org.eclipse.tycho.ReactorProject;
 import org.eclipse.tycho.TargetEnvironment;
-import org.eclipse.tycho.core.ArtifactDependencyVisitor;
 import org.eclipse.tycho.core.ArtifactDependencyWalker;
 import org.eclipse.tycho.core.TychoProject;
 import org.eclipse.tycho.model.IU;
@@ -28,13 +27,7 @@
 public class P2IUProject extends AbstractArtifactBasedProject {
     @Override
     protected ArtifactDependencyWalker newDependencyWalker(ReactorProject project, TargetEnvironment environment) {
-        return new AbstractArtifactDependencyWalker(getDependencyArtifacts(project, environment),
-                getEnvironments(project, environment)) {
-            @Override
-            public void walk(ArtifactDependencyVisitor visitor) {
-                //Nothing to do
-            }
-        };
+        throw new UnsupportedOperationException();
     }
 
     @Override

diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/P2SiteProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/P2SiteProject.java
@@ -21,21 +21,14 @@
 import org.eclipse.tycho.DefaultArtifactKey;
 import org.eclipse.tycho.ReactorProject;
 import org.eclipse.tycho.TargetEnvironment;
-import org.eclipse.tycho.core.ArtifactDependencyVisitor;
 import org.eclipse.tycho.core.ArtifactDependencyWalker;
 import org.eclipse.tycho.core.TychoProject;
 
 @Component(role = TychoProject.class, hint = org.eclipse.tycho.ArtifactType.TYPE_P2_MAVEN_REPOSITORY)
 public class P2SiteProject extends AbstractArtifactBasedProject {
     @Override
     protected ArtifactDependencyWalker newDependencyWalker(ReactorProject project, TargetEnvironment environment) {
-        return new AbstractArtifactDependencyWalker(getDependencyArtifacts(project, environment),
-                getEnvironments(project, environment)) {
-            @Override
-            public void walk(ArtifactDependencyVisitor visitor) {
-                //Nothing to do
-            }
-        };
+        throw new UnsupportedOperationException();
     }
 
     @Override

diff --git a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/PackageFeatureMojo.java b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/PackageFeatureMojo.java
@@ -102,13 +102,6 @@ public class PackageFeatureMojo extends AbstractTychoPackagingMojo {
     @Parameter(property = "project.build.finalName", alias = "jarName", required = true)
     private String finalName;
 
-    /**
-     * If set to <code>true</code>, standard eclipse update site directory with feature content will
-     * be created under target folder.
-     */
-    @Parameter(defaultValue = "false")
-    private boolean deployableFeature = false;
-
     @Parameter(defaultValue = "${project.build.directory}/site")
     private File target;
 
@@ -200,10 +193,6 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             }
 
             project.getArtifact().setFile(outputJar);
-
-            if (deployableFeature) {
-                assembleDeployableFeature();
-            }
         }
     }
 
@@ -278,11 +267,6 @@ private FileSet getManuallyIncludedFiles(BuildProperties buildProperties) {
         return getFileSet(basedir, buildProperties.getBinIncludes(), binExcludes);
     }
 
-    private void assembleDeployableFeature() throws MojoExecutionException {
-        UpdateSiteAssembler assembler = new UpdateSiteAssembler(plexus, target);
-		getTychoProjectFacet().getDependencyWalker(DefaultReactorProject.adapt(project)).walk(assembler);
-    }
-
     private void expandVersionQualifiers(Feature feature) throws MojoFailureException {
         ReactorProject reactorProject = DefaultReactorProject.adapt(project);
         feature.setVersion(reactorProject.getExpandedVersion());