Merge "Remove redundant files"
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/pom.xml b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/pom.xml
index 2d28758..5d7da80 100644
--- a/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/pom.xml
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.aspectj.e44x/pom.xml
@@ -53,7 +53,7 @@
<configuration>
<source>
<repository>
- <url>http://download.eclipse.org/tools/ajdt/44/dev/update</url>
+ <url>https://download.eclipse.org/tools/ajdt/410/dev/update/ajdt-e410-2.2.4.202103162301</url>
<layout>p2</layout>
</repository>
</source>
diff --git a/dependencies/bundles/org.eclipse.rcptt.updates.helios/.gitignore b/dependencies/bundles/org.eclipse.rcptt.updates.helios/.gitignore
new file mode 100644
index 0000000..529bcce
--- /dev/null
+++ b/dependencies/bundles/org.eclipse.rcptt.updates.helios/.gitignore
@@ -0,0 +1 @@
+dependencies/*
\ No newline at end of file
diff --git a/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/internal/launching/aut/BaseAutLaunch.java b/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/internal/launching/aut/BaseAutLaunch.java
index 1b0b8aa..cc3dc7c 100644
--- a/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/internal/launching/aut/BaseAutLaunch.java
+++ b/launching/org.eclipse.rcptt.launching/src/org/eclipse/rcptt/internal/launching/aut/BaseAutLaunch.java
@@ -438,6 +438,9 @@
}
LaunchInfoCache.copyCache(launchConfiguration, copy);
LaunchInfoCache.remove(launchConfiguration);
+ // To disable clear area during restart
+ boolean configClearArea = copy.getAttribute(IPDELauncherConstants.CONFIG_CLEAR_AREA, false);
+ copy.setAttribute(IPDELauncherConstants.CONFIG_CLEAR_AREA, false);
copy.setAttribute(IPDEConstants.RESTART, true);
copy.setAttribute(IQ7Launch.ATTR_AUT_ID, getId());
if (locationOnRestart != null) {
@@ -447,7 +450,11 @@
launch.setAttribute(IQ7Launch.ATTR_AUT_ID, ""); // To disable
// terminate by id.
launch = copy.launch(launch.getLaunchMode(), new NullProgressMonitor());
-
+ // Set attributes to default after restart
+ copy.setAttribute(IPDEConstants.RESTART, false);
+ copy.setAttribute(IPDELauncherConstants.CONFIG_CLEAR_AREA, configClearArea);
+ copy.setAttribute(IQ7Launch.ATTR_AUT_ID, "");
+ copy.doSave();
BaseAutManager.INSTANCE.handleRestart(BaseAutLaunch.this, oldLaunch, launch, copy);
} catch (Exception e) {
terminated(e);
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 8c30631..5503253 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -35,6 +35,16 @@
<module>rcptt-maven-util</module>
</modules>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-versions-plugin</artifactId>
+ <version>1.5.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/releng/target-platforms/2020-03/ide.target b/releng/target-platforms/2020-03/ide.target
index f8ba282..1d82171 100644
--- a/releng/target-platforms/2020-03/ide.target
+++ b/releng/target-platforms/2020-03/ide.target
@@ -41,5 +41,9 @@
<unit id="org.eclipse.equinox.weaving.hook" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/ajdt/410/dev/update"/>
</location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+ <repository location="https://download.eclipse.org/swtchart/releases/0.12.0/repository"/>
+ <unit id="org.eclipse.swtchart.feature.source.feature.group" version="0.12.0.202003130409"/>
+ </location>
</locations>
</target>
\ No newline at end of file
diff --git a/runtime/tesla/org.eclipse.rcptt.tesla.chart/META-INF/MANIFEST.MF b/runtime/tesla/org.eclipse.rcptt.tesla.chart/META-INF/MANIFEST.MF
index 9f3418d..cd6b695 100644
--- a/runtime/tesla/org.eclipse.rcptt.tesla.chart/META-INF/MANIFEST.MF
+++ b/runtime/tesla/org.eclipse.rcptt.tesla.chart/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
Bundle-SymbolicName: org.eclipse.rcptt.tesla.chart;singleton:=true
Bundle-Version: 2.5.2.qualifier
Automatic-Module-Name: org.eclipse.rcptt.tesla.chart
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.rcptt.tesla.core,
org.eclipse.rcptt.tesla.swt,
org.eclipse.swtchart,
diff --git a/runtime/updates/org.eclipse.rcptt.updates.runtime/.gitignore b/runtime/updates/org.eclipse.rcptt.updates.runtime/.gitignore
new file mode 100644
index 0000000..7081897
--- /dev/null
+++ b/runtime/updates/org.eclipse.rcptt.updates.runtime/.gitignore
@@ -0,0 +1 @@
+q7/*
\ No newline at end of file
