Skip to content

Commit

Permalink
Remove Tycho specific dev entry support
Browse files Browse the repository at this point in the history
Tycho currently contains support for pde-dev entries explicitly stated
to "support running Tycho its from workspace".

As Tycho is now "pure maven" this is no longer required (and has never
worked well). The features requires some special setup, depends on
deprecated Maven API and even references no longer existing Tycho-code,
this is now removed to lower the barrier for mvn4 transition.
  • Loading branch information
laeubi committed Sep 13, 2024
1 parent e972652 commit c7bd924
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 274 deletions.
45 changes: 0 additions & 45 deletions tycho-core/src/main/java/org/eclipse/tycho/dev/DevBundleInfo.java

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@
import org.eclipse.tycho.core.TychoProject;
import org.eclipse.tycho.core.osgitools.DefaultReactorProject;
import org.eclipse.tycho.core.osgitools.project.BuildOutputJar;
import org.eclipse.tycho.dev.DevBundleInfo;
import org.eclipse.tycho.dev.DevWorkspaceResolver;
import org.eclipse.tycho.p2.tools.RepositoryReferences;
import org.eclipse.tycho.p2maven.InstallableUnitGenerator;
import org.eclipse.tycho.p2tools.RepositoryReferenceTool;
Expand Down Expand Up @@ -591,9 +589,6 @@ public enum ClassLoaderOrder {
@Component
private ProviderHelper providerHelper;

@Component
private DevWorkspaceResolver workspaceState;

@Component
private RepositoryReferenceTool repositoryReferenceTool;

Expand Down Expand Up @@ -854,16 +849,9 @@ public Collection<IRequirement> getAdditionalRequirements() {
protected void setupTestBundles(Set<Artifact> testFrameworkBundles, EquinoxInstallationDescription testRuntime)
throws MojoExecutionException {
for (Artifact artifact : testFrameworkBundles) {
DevBundleInfo devInfo = workspaceState.getBundleInfo(session, artifact.getGroupId(),
artifact.getArtifactId(), artifact.getVersion(), project.getPluginArtifactRepositories());
if (devInfo != null) {
addBundle(testRuntime, devInfo.getArtifactKey(), devInfo.getLocation());
testRuntime.addDevEntries(devInfo.getSymbolicName(), devInfo.getDevEntries());
} else {
File bundleLocation = artifact.getFile();
ArtifactKey bundleArtifactKey = getBundleArtifactKey(bundleLocation);
addBundle(testRuntime, bundleArtifactKey, bundleLocation);
}
File bundleLocation = artifact.getFile();
ArtifactKey bundleArtifactKey = getBundleArtifactKey(bundleLocation);
addBundle(testRuntime, bundleArtifactKey, bundleLocation);
}

testRuntime.addDevEntries(getTestBundleSymbolicName(), getBuildOutputDirectories());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,6 @@

public abstract class AbstractTychoIntegrationTest {

/**
* Location of m2e.tycho workspace state location.
* <p/>
* Value must match among tycho-insitu, DevelopmentWorkspaceState and
* AbstractTychoIntegrationTest.
*/
private static final String SYSPROP_STATELOCATION = "tychodev.workspace.state";

@Rule
public TestName name = new TestName();

Expand Down Expand Up @@ -139,14 +131,6 @@ protected Verifier getVerifier(String test, boolean setTargetPlatform, File user
verifier.addCliOption(customOptions);
}

if (System.getProperty(SYSPROP_STATELOCATION) != null) {
verifier.setForkJvm(false);
String m2eresolver = System.getProperty("tychodev-maven.ext.class.path"); // XXX
if (m2eresolver != null) {
verifier.addCliOption("-Dmaven.ext.class.path=" + m2eresolver);
}
}

return verifier;

}
Expand Down

0 comments on commit c7bd924

Please sign in to comment.