Merge "Add TaskChain to run any LcDsl launch configuration headlessly"
diff --git a/org.eclipse.tea.library.build/META-INF/MANIFEST.MF b/org.eclipse.tea.library.build/META-INF/MANIFEST.MF
index c4524da..39d29bd 100644
--- a/org.eclipse.tea.library.build/META-INF/MANIFEST.MF
+++ b/org.eclipse.tea.library.build/META-INF/MANIFEST.MF
@@ -39,7 +39,8 @@
org.eclipse.jgit,
org.eclipse.jdt.launching,
org.eclipse.m2e.maven.runtime,
- org.eclipse.equinox.p2.director.app
+ org.eclipse.equinox.p2.director.app,
+ org.eclipse.jdt.apt.core
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.tea.library.build.chain,
org.eclipse.tea.library.build.chain.plugin,
diff --git a/org.eclipse.tea.library.build/src/org/eclipse/tea/library/build/tasks/maven/SynchronizeMavenArtifact.java b/org.eclipse.tea.library.build/src/org/eclipse/tea/library/build/tasks/maven/SynchronizeMavenArtifact.java
index 5650c67..c0cdb09 100644
--- a/org.eclipse.tea.library.build/src/org/eclipse/tea/library/build/tasks/maven/SynchronizeMavenArtifact.java
+++ b/org.eclipse.tea.library.build/src/org/eclipse/tea/library/build/tasks/maven/SynchronizeMavenArtifact.java
@@ -53,6 +53,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.jdt.apt.core.util.AptConfig;
import org.eclipse.tea.core.services.TaskingLog;
import org.eclipse.tea.library.build.config.BuildDirectories;
import org.eclipse.tea.library.build.config.TeaBuildConfig;
@@ -89,6 +90,10 @@
return;
}
+ // close jar files providing Annotations, see
+ // https://bugs.eclipse.org/565436
+ AptConfig.setFactoryPath(null, AptConfig.getFactoryPath(null));
+
ServiceLocator locator = createServiceLocator(log);
RepositorySystem system = locator.getService(RepositorySystem.class);
RepositorySystemSession session = createSession(log, system);
