From 2cc9b9cb3db9e3dfcd143f83483e07f1e5f10418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= Date: Sat, 16 Dec 2023 12:45:12 +0100 Subject: [PATCH] Move DependencySeed to api module and util method to the ReactorProject --- .../java/org/eclipse/tycho}/DependencySeed.java | 3 +-- .../java/org/eclipse/tycho/ReactorProject.java | 10 ++++++++++ .../tycho/core/utils/TychoProjectUtils.java | 17 ----------------- .../AbstractDirectorApplicationCommand.java | 2 +- .../tools/director/shared/DirectorRuntime.java | 2 +- .../facade/MirrorApplicationService.java | 2 +- .../p2/tools/publisher/DependencySeedUtil.java | 2 +- .../tools/publisher/PublishProductToolImpl.java | 2 +- .../tools/publisher/PublisherServiceImpl.java | 2 +- .../publisher/facade/PublishProductTool.java | 2 +- .../publisher/facade/PublisherService.java | 2 +- .../p2tools/MirrorApplicationServiceImpl.java | 2 +- .../p2resolver/PublishProductToolTest.java | 2 +- .../tycho/p2resolver/PublisherServiceTest.java | 2 +- .../p2tools/MirrorApplicationServiceTest.java | 2 +- .../p2/director/AbstractProductMojo.java | 3 +-- .../p2/director/MaterializeProductsMojo.java | 2 +- .../tycho/plugins/p2/director/Product.java | 2 +- .../plugins/p2/director/ProductConfig.java | 2 +- .../plugins/p2/director/ProductConfigTest.java | 2 +- .../p2/publisher/AbstractPublishMojo.java | 5 ++--- .../p2/publisher/PublishCategoriesMojo.java | 2 +- .../p2/publisher/PublishEEProfileMojo.java | 2 +- .../plugins/p2/publisher/PublishOsgiEEMojo.java | 2 +- .../p2/publisher/PublishProductMojo.java | 2 +- .../p2/repository/AssembleRepositoryMojo.java | 5 ++--- 26 files changed, 36 insertions(+), 47 deletions(-) rename {tycho-core/src/main/java/org/eclipse/tycho/core/resolver/shared => tycho-api/src/main/java/org/eclipse/tycho}/DependencySeed.java (98%) diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/shared/DependencySeed.java b/tycho-api/src/main/java/org/eclipse/tycho/DependencySeed.java similarity index 98% rename from tycho-core/src/main/java/org/eclipse/tycho/core/resolver/shared/DependencySeed.java rename to tycho-api/src/main/java/org/eclipse/tycho/DependencySeed.java index 5daaedbeff..f28b2e368a 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/shared/DependencySeed.java +++ b/tycho-api/src/main/java/org/eclipse/tycho/DependencySeed.java @@ -10,10 +10,9 @@ * Contributors: * SAP AG - initial API and implementation *******************************************************************************/ -package org.eclipse.tycho.core.resolver.shared; +package org.eclipse.tycho; import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.tycho.ArtifactType; /** * Handle on a unit which defines dependencies of a project. There may be more than one dependency diff --git a/tycho-api/src/main/java/org/eclipse/tycho/ReactorProject.java b/tycho-api/src/main/java/org/eclipse/tycho/ReactorProject.java index b2d803c568..9cc993dbc2 100644 --- a/tycho-api/src/main/java/org/eclipse/tycho/ReactorProject.java +++ b/tycho-api/src/main/java/org/eclipse/tycho/ReactorProject.java @@ -14,6 +14,8 @@ package org.eclipse.tycho; import java.io.File; +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Supplier; /** @@ -70,6 +72,14 @@ public interface ReactorProject extends IDependencyMetadata { public String getExpandedVersion(); + /** + * Returns the (editable) list of {@link DependencySeed}s for the given project. + */ + @SuppressWarnings("unchecked") + default List getDependencySeeds() { + return computeContextValue(TychoConstants.CTX_DEPENDENCY_SEEDS, () -> new CopyOnWriteArrayList<>()); + } + /** * human-readable id used in error messages */ diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/utils/TychoProjectUtils.java b/tycho-core/src/main/java/org/eclipse/tycho/core/utils/TychoProjectUtils.java index aa8b355fc9..a2e8999942 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/utils/TychoProjectUtils.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/core/utils/TychoProjectUtils.java @@ -12,8 +12,6 @@ *******************************************************************************/ package org.eclipse.tycho.core.utils; -import java.util.ArrayList; -import java.util.List; import java.util.Optional; import java.util.Properties; @@ -25,7 +23,6 @@ import org.eclipse.tycho.TargetPlatform; import org.eclipse.tycho.TychoConstants; import org.eclipse.tycho.core.osgitools.DefaultReactorProject; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; public class TychoProjectUtils { private static final String TYCHO_NOT_CONFIGURED = "Tycho build extension not configured for "; @@ -62,20 +59,6 @@ public static TargetPlatform getTargetPlatformIfAvailable(ReactorProject project return (TargetPlatform) project.getContextValue(TargetPlatform.FINAL_TARGET_PLATFORM_KEY); } - /** - * Returns the (editable) list of {@link DependencySeed}s for the given project. - */ - @SuppressWarnings("unchecked") - public static List getDependencySeeds(ReactorProject project) { - List dependencySeeds = (List) project - .getContextValue(TychoConstants.CTX_DEPENDENCY_SEEDS); - if (dependencySeeds == null) { - dependencySeeds = new ArrayList<>(); - project.setContextValue(TychoConstants.CTX_DEPENDENCY_SEEDS, dependencySeeds); - } - return dependencySeeds; - } - /** * Computes the merged properties from maven session and the project * diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/director/shared/AbstractDirectorApplicationCommand.java b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/director/shared/AbstractDirectorApplicationCommand.java index 9af260c91e..dff225b57e 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/director/shared/AbstractDirectorApplicationCommand.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/director/shared/AbstractDirectorApplicationCommand.java @@ -21,8 +21,8 @@ import java.util.stream.Collectors; import org.eclipse.tycho.ArtifactType; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.TargetEnvironment; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; import org.eclipse.tycho.p2.CommandLineArguments; /** diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/director/shared/DirectorRuntime.java b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/director/shared/DirectorRuntime.java index 88f0f3188e..307d0b876f 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/director/shared/DirectorRuntime.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/director/shared/DirectorRuntime.java @@ -16,8 +16,8 @@ import java.net.URI; import java.util.Map; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.TargetEnvironment; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; /** * A runtime environment of the p2 director application. diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/mirroring/facade/MirrorApplicationService.java b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/mirroring/facade/MirrorApplicationService.java index 5c6ec60935..2362e74a4b 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/mirroring/facade/MirrorApplicationService.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/mirroring/facade/MirrorApplicationService.java @@ -18,7 +18,7 @@ import java.util.Map; import org.eclipse.tycho.BuildDirectory; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.p2.tools.BuildContext; import org.eclipse.tycho.p2.tools.DestinationRepositoryDescriptor; import org.eclipse.tycho.p2.tools.FacadeException; diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/DependencySeedUtil.java b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/DependencySeedUtil.java index dedbcbaf70..095e40e2d9 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/DependencySeedUtil.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/DependencySeedUtil.java @@ -13,7 +13,7 @@ package org.eclipse.tycho.p2.tools.publisher; import org.eclipse.equinox.p2.metadata.IInstallableUnit; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; +import org.eclipse.tycho.DependencySeed; public class DependencySeedUtil { diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/PublishProductToolImpl.java b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/PublishProductToolImpl.java index 7ae086009b..4d73213b55 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/PublishProductToolImpl.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/PublishProductToolImpl.java @@ -34,8 +34,8 @@ import org.eclipse.tycho.ArtifactKey; import org.eclipse.tycho.ArtifactType; import org.eclipse.tycho.BuildFailureException; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.Interpolator; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; import org.eclipse.tycho.core.resolver.target.ArtifactTypeHelper; import org.eclipse.tycho.core.shared.MavenLogger; import org.eclipse.tycho.p2.repository.PublishingRepository; diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/PublisherServiceImpl.java b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/PublisherServiceImpl.java index b240c0db15..73b74585e6 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/PublisherServiceImpl.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/PublisherServiceImpl.java @@ -29,9 +29,9 @@ import org.eclipse.equinox.p2.publisher.AdviceFileAdvice; import org.eclipse.equinox.p2.publisher.IPublisherAction; import org.eclipse.equinox.p2.publisher.actions.JREAction; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.ExecutionEnvironment; import org.eclipse.tycho.core.ee.impl.CustomEEResolutionHints; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; import org.eclipse.tycho.p2.repository.PublishingRepository; import org.eclipse.tycho.p2.tools.FacadeException; import org.eclipse.tycho.p2.tools.publisher.facade.PublisherService; diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/facade/PublishProductTool.java b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/facade/PublishProductTool.java index 208aaf4cd6..297005b4b4 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/facade/PublishProductTool.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/facade/PublishProductTool.java @@ -16,7 +16,7 @@ import java.io.File; import java.util.List; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; +import org.eclipse.tycho.DependencySeed; public interface PublishProductTool { diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/facade/PublisherService.java b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/facade/PublisherService.java index b62278fa3e..dd0249d223 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/facade/PublisherService.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/p2/tools/publisher/facade/PublisherService.java @@ -15,8 +15,8 @@ import java.io.File; import java.util.Collection; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.ExecutionEnvironment; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; import org.eclipse.tycho.p2.tools.FacadeException; public interface PublisherService { diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2tools/MirrorApplicationServiceImpl.java b/tycho-core/src/main/java/org/eclipse/tycho/p2tools/MirrorApplicationServiceImpl.java index a715ef23a1..68ea32319b 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/p2tools/MirrorApplicationServiceImpl.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/p2tools/MirrorApplicationServiceImpl.java @@ -51,7 +51,7 @@ import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository; import org.eclipse.tycho.ArtifactType; import org.eclipse.tycho.BuildDirectory; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.core.shared.StatusTool; import org.eclipse.tycho.p2.repository.GAV; import org.eclipse.tycho.p2.repository.RepositoryLayoutHelper; diff --git a/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/PublishProductToolTest.java b/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/PublishProductToolTest.java index db3e746927..c7eae473de 100644 --- a/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/PublishProductToolTest.java +++ b/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/PublishProductToolTest.java @@ -50,9 +50,9 @@ import org.eclipse.equinox.p2.query.QueryUtil; import org.eclipse.tycho.BuildFailureException; import org.eclipse.tycho.DependencyResolutionException; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.Interpolator; import org.eclipse.tycho.TargetEnvironment; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; import org.eclipse.tycho.p2.repository.PublishingRepository; import org.eclipse.tycho.p2.repository.module.PublishingRepositoryImpl; import org.eclipse.tycho.p2.tools.publisher.PublishProductToolImpl; diff --git a/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/PublisherServiceTest.java b/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/PublisherServiceTest.java index e6ca60ed9d..1a5eaf0315 100644 --- a/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/PublisherServiceTest.java +++ b/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/PublisherServiceTest.java @@ -32,8 +32,8 @@ import org.eclipse.equinox.p2.metadata.Version; import org.eclipse.equinox.p2.repository.metadata.IMetadataRepository; import org.eclipse.equinox.spi.p2.publisher.PublisherHelper; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.TargetEnvironment; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; import org.eclipse.tycho.p2.repository.ImmutableInMemoryMetadataRepository; import org.eclipse.tycho.p2.repository.PublishingRepository; import org.eclipse.tycho.p2.repository.module.PublishingRepositoryImpl; diff --git a/tycho-core/src/test/java/org/eclipse/tycho/p2tools/MirrorApplicationServiceTest.java b/tycho-core/src/test/java/org/eclipse/tycho/p2tools/MirrorApplicationServiceTest.java index 2774684bb4..2c64f2bfb0 100644 --- a/tycho-core/src/test/java/org/eclipse/tycho/p2tools/MirrorApplicationServiceTest.java +++ b/tycho-core/src/test/java/org/eclipse/tycho/p2tools/MirrorApplicationServiceTest.java @@ -36,9 +36,9 @@ import org.eclipse.equinox.p2.metadata.VersionRange; import org.eclipse.equinox.p2.metadata.VersionedId; import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.ReactorProjectIdentities; import org.eclipse.tycho.TargetEnvironment; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; import org.eclipse.tycho.core.test.utils.ResourceUtil; import org.eclipse.tycho.p2.tools.BuildContext; import org.eclipse.tycho.p2.tools.DestinationRepositoryDescriptor; diff --git a/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/AbstractProductMojo.java b/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/AbstractProductMojo.java index 64d3c61e99..dc93851625 100644 --- a/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/AbstractProductMojo.java +++ b/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/AbstractProductMojo.java @@ -26,7 +26,6 @@ import org.eclipse.tycho.core.TargetPlatformConfiguration; import org.eclipse.tycho.core.TychoProjectManager; import org.eclipse.tycho.core.osgitools.DefaultReactorProject; -import org.eclipse.tycho.core.utils.TychoProjectUtils; abstract class AbstractProductMojo extends AbstractMojo { @@ -161,7 +160,7 @@ List getEnvironments() { } ProductConfig getProductConfig() throws MojoFailureException { - return new ProductConfig(products, TychoProjectUtils.getDependencySeeds(DefaultReactorProject.adapt(project))); + return new ProductConfig(products, DefaultReactorProject.adapt(project).getDependencySeeds()); } static String getOsWsArch(TargetEnvironment env, char separator) { diff --git a/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/MaterializeProductsMojo.java b/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/MaterializeProductsMojo.java index b481e5a4a9..e6c76eaa1f 100644 --- a/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/MaterializeProductsMojo.java +++ b/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/MaterializeProductsMojo.java @@ -22,9 +22,9 @@ import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.TargetEnvironment; import org.eclipse.tycho.TychoConstants; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; import org.eclipse.tycho.p2.tools.RepositoryReferences; import org.eclipse.tycho.p2.tools.director.shared.DirectorCommandException; import org.eclipse.tycho.p2.tools.director.shared.DirectorRuntime; diff --git a/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/Product.java b/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/Product.java index 29c460ef5b..310bab1286 100644 --- a/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/Product.java +++ b/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/Product.java @@ -18,8 +18,8 @@ import java.util.Map; import java.util.Objects; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.PlatformPropertiesUtils; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; /** * Value object for the configuration of this Maven plug-in. Used to select products to be diff --git a/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductConfig.java b/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductConfig.java index c2f8fa10fb..88cceb065e 100644 --- a/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductConfig.java +++ b/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductConfig.java @@ -20,7 +20,7 @@ import org.apache.maven.plugin.MojoFailureException; import org.eclipse.tycho.ArtifactType; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; +import org.eclipse.tycho.DependencySeed; /** * Effective product configuration for this Maven plug-in. This is the configuration provided by the diff --git a/tycho-p2-director-plugin/src/test/java/org/eclipse/tycho/plugins/p2/director/ProductConfigTest.java b/tycho-p2-director-plugin/src/test/java/org/eclipse/tycho/plugins/p2/director/ProductConfigTest.java index 8541a4b5b2..ab6f35a17f 100644 --- a/tycho-p2-director-plugin/src/test/java/org/eclipse/tycho/plugins/p2/director/ProductConfigTest.java +++ b/tycho-p2-director-plugin/src/test/java/org/eclipse/tycho/plugins/p2/director/ProductConfigTest.java @@ -25,7 +25,7 @@ import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; import org.eclipse.equinox.p2.metadata.Version; import org.eclipse.tycho.ArtifactType; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; +import org.eclipse.tycho.DependencySeed; import org.junit.Test; public class ProductConfigTest { diff --git a/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/AbstractPublishMojo.java b/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/AbstractPublishMojo.java index d9ff38c7d6..ac52c6e69f 100644 --- a/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/AbstractPublishMojo.java +++ b/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/AbstractPublishMojo.java @@ -17,9 +17,8 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.Component; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.core.maven.AbstractP2Mojo; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; -import org.eclipse.tycho.core.utils.TychoProjectUtils; import org.eclipse.tycho.p2.tools.publisher.facade.PublisherServiceFactory; import org.eclipse.tycho.p2tools.RepositoryReferenceTool; @@ -60,6 +59,6 @@ protected abstract Collection publishContent(PublisherServiceFac * assembly p2 repository. */ private void postPublishedIUs(Collection units) { - TychoProjectUtils.getDependencySeeds(getReactorProject()).addAll(units); + getReactorProject().getDependencySeeds().addAll(units); } } diff --git a/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishCategoriesMojo.java b/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishCategoriesMojo.java index 7b8bd47418..49e789252f 100644 --- a/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishCategoriesMojo.java +++ b/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishCategoriesMojo.java @@ -28,10 +28,10 @@ import org.apache.maven.plugins.annotations.ResolutionScope; import org.codehaus.plexus.util.FileUtils; import org.eclipse.tycho.BuildDirectory; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.PackagingType; import org.eclipse.tycho.core.TychoProject; import org.eclipse.tycho.core.osgitools.EclipseRepositoryProject; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; import org.eclipse.tycho.model.Category; import org.eclipse.tycho.p2.tools.FacadeException; import org.eclipse.tycho.p2.tools.publisher.facade.PublisherService; diff --git a/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishEEProfileMojo.java b/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishEEProfileMojo.java index 94aa256223..4702f1e59f 100644 --- a/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishEEProfileMojo.java +++ b/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishEEProfileMojo.java @@ -21,7 +21,7 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.p2.tools.FacadeException; import org.eclipse.tycho.p2.tools.publisher.facade.PublisherService; import org.eclipse.tycho.p2.tools.publisher.facade.PublisherServiceFactory; diff --git a/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishOsgiEEMojo.java b/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishOsgiEEMojo.java index 1cea4c47c3..63a79e713b 100644 --- a/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishOsgiEEMojo.java +++ b/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishOsgiEEMojo.java @@ -26,9 +26,9 @@ import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.toolchain.ToolchainManager; import org.codehaus.plexus.logging.Logger; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.ExecutionEnvironment; import org.eclipse.tycho.core.ee.ExecutionEnvironmentUtils; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; import org.eclipse.tycho.p2.tools.FacadeException; import org.eclipse.tycho.p2.tools.publisher.facade.PublisherService; import org.eclipse.tycho.p2.tools.publisher.facade.PublisherServiceFactory; diff --git a/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishProductMojo.java b/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishProductMojo.java index 7b96432091..62853a963f 100644 --- a/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishProductMojo.java +++ b/tycho-p2-publisher-plugin/src/main/java/org/eclipse/tycho/plugins/p2/publisher/PublishProductMojo.java @@ -46,6 +46,7 @@ import org.eclipse.tycho.ArtifactDescriptor; import org.eclipse.tycho.ArtifactType; import org.eclipse.tycho.DependencyArtifacts; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.FileLockService; import org.eclipse.tycho.Interpolator; import org.eclipse.tycho.PackagingType; @@ -56,7 +57,6 @@ import org.eclipse.tycho.core.TychoProject; import org.eclipse.tycho.core.maven.TychoInterpolator; import org.eclipse.tycho.core.osgitools.EclipseRepositoryProject; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; import org.eclipse.tycho.model.ProductConfiguration; import org.eclipse.tycho.p2.repository.PublishingRepository; import org.eclipse.tycho.p2.repository.module.ModuleArtifactRepository; diff --git a/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/AssembleRepositoryMojo.java b/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/AssembleRepositoryMojo.java index 1bfd23cb81..4ee03e7dc5 100644 --- a/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/AssembleRepositoryMojo.java +++ b/tycho-p2-repository-plugin/src/main/java/org/eclipse/tycho/plugins/p2/repository/AssembleRepositoryMojo.java @@ -31,14 +31,13 @@ import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.MatchPattern; +import org.eclipse.tycho.DependencySeed; import org.eclipse.tycho.FileLockService; import org.eclipse.tycho.PackagingType; import org.eclipse.tycho.ReactorProject; import org.eclipse.tycho.TychoConstants; import org.eclipse.tycho.core.TychoProject; import org.eclipse.tycho.core.osgitools.EclipseRepositoryProject; -import org.eclipse.tycho.core.resolver.shared.DependencySeed; -import org.eclipse.tycho.core.utils.TychoProjectUtils; import org.eclipse.tycho.model.Category; import org.eclipse.tycho.model.Feature; import org.eclipse.tycho.p2.tools.DestinationRepositoryDescriptor; @@ -326,7 +325,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { copyResources(destination); final ReactorProject reactorProject = getReactorProject(); - Collection projectSeeds = TychoProjectUtils.getDependencySeeds(reactorProject); + Collection projectSeeds = reactorProject.getDependencySeeds(); if (projectSeeds.isEmpty()) { getLog().warn("No content specified for p2 repository"); return;