From 747bd10ad0dfbe3f624944297fd69c715f5beec0 Mon Sep 17 00:00:00 2001 From: Julian Honnen Date: Fri, 9 Apr 2021 08:41:04 +0200 Subject: [PATCH 1/2] allow parallel execution of AbstractOsgiCompilerMojo --- .../eclipse/tycho/compiler/AbstractOsgiCompilerMojo.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/AbstractOsgiCompilerMojo.java b/tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/AbstractOsgiCompilerMojo.java index a12110865e..ef57b6874c 100644 --- a/tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/AbstractOsgiCompilerMojo.java +++ b/tycho-compiler-plugin/src/main/java/org/eclipse/tycho/compiler/AbstractOsgiCompilerMojo.java @@ -104,11 +104,6 @@ public abstract class AbstractOsgiCompilerMojo extends AbstractCompilerMojo */ public static final String RULE_EXCLUDE_ALL = "?**/*"; - /** - * Lock object to ensure thread-safety - */ - private static final Object LOCK = new Object(); - private static final Set MATCH_ALL = Collections.singleton("**/*"); private static final String PREFS_FILE_PATH = ".settings" + File.separator + "org.eclipse.jdt.core.prefs"; @@ -333,9 +328,7 @@ public final void execute() throws MojoExecutionException, MojoFailureException checkTargetLevelCompatibleWithManifestBREEs(effectiveTargetLevel, manifestBREEs); - synchronized (LOCK) { - doCompile(); - } + doCompile(); doFinish(); } From 06d140b6f460ecb6d9a4116c8180e410fd5bc1b8 Mon Sep 17 00:00:00 2001 From: Julian Honnen Date: Fri, 9 Apr 2021 08:42:20 +0200 Subject: [PATCH 2/2] allow parallel execution of PackagePluginMojo --- .../tycho/packaging/PackagePluginMojo.java | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/PackagePluginMojo.java b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/PackagePluginMojo.java index f96efec16e..9057bba25a 100644 --- a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/PackagePluginMojo.java +++ b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/PackagePluginMojo.java @@ -55,7 +55,6 @@ */ @Mojo(name = "package-plugin", threadSafe = true) public class PackagePluginMojo extends AbstractTychoPackagingMojo { - private static final Object LOCK = new Object(); /** * The output directory of the jar file @@ -158,20 +157,16 @@ public class PackagePluginMojo extends AbstractTychoPackagingMojo { @Override public void execute() throws MojoExecutionException { - synchronized (LOCK) { - ReactorProject reactorProject = DefaultReactorProject.adapt(project); - pdeProject = (EclipsePluginProject) reactorProject - .getContextValue(TychoConstants.CTX_ECLIPSE_PLUGIN_PROJECT); - - createSubJars(); + ReactorProject reactorProject = DefaultReactorProject.adapt(project); + pdeProject = (EclipsePluginProject) reactorProject.getContextValue(TychoConstants.CTX_ECLIPSE_PLUGIN_PROJECT); - File pluginFile = createPluginJar(); - project.getArtifact().setFile(pluginFile); - File testPluginFile = createTestPluginJar(reactorProject); - if (testPluginFile != null) { - projectHelper.attachArtifact(project, "jar", ArtifactType.TYPE_ECLIPSE_TEST_FRAGMENT, testPluginFile); - } + createSubJars(); + File pluginFile = createPluginJar(); + project.getArtifact().setFile(pluginFile); + File testPluginFile = createTestPluginJar(reactorProject); + if (testPluginFile != null) { + projectHelper.attachArtifact(project, "jar", ArtifactType.TYPE_ECLIPSE_TEST_FRAGMENT, testPluginFile); } }