Tony Mancill · Sudip Mukherjee · Tony Mancill · Tony Mancill · c0021456 · c0021456
--- a/debian/changelog
+++ b/debian/changelog
+tycho (1.3.0-1) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Sudip Mukherjee ]
+  * Update to upstream tycho-1.3.0
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Sat, 30 Nov 2019 19:03:59 +0000
+
 tycho (1.2.0-1) unstable; urgency=medium

  * Team upload.

--- a/debian/control
+++ b/debian/control
@@ -15,8 +15,6 @@ Build-Depends:
 libdecentxml-java,
 libeclipse-core-net-java,
 libeclipse-core-runtime-java,
- libeclipse-jdt-compiler-apt-java,
- libeclipse-jdt-core-java,
 libeclipse-osgi-compatibility-state-java,
 libeclipse-osgi-java (>= 3.13.0+eclipse4.8),
 libeclipse-osgi-util-java,
@@ -60,7 +58,9 @@ Build-Depends:
 libxz-java,
 maven-debian-helper,
 rsync,
- zip
+ zip,
+ libtycho-java (>=1.2.0),
+ libecj-java
 Standards-Version: 4.4.1
 Vcs-Git: https://salsa.debian.org/java-team/tycho.git
 Vcs-Browser: https://salsa.debian.org/java-team/tycho

--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -12,7 +12,5 @@ org.codehaus.plexus plexus-compiler-* jar s/.*/2.x/ * *
 org.codehaus.plexus plexus-utils jar s/.*/2.x/ * *
 s/org.eclipse.tycho/org.eclipse.osgi/ org.eclipse.osgi * s/.*/debian/ * *
 s/org.eclipse.tycho/org.eclipse.osgi/ org.eclipse.osgi.compatibility.state * s/.*/debian/ * *
-s/org.eclipse.tycho/org.eclipse.jdt/ org.eclipse.jdt.core * s/.*/debian/ * *
-s/org.eclipse.tycho/org.eclipse.jdt/ org.eclipse.jdt.compiler.apt * s/.*/debian/ * *

 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * *
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@

 	<groupId>org.eclipse.tycho</groupId>
 	<artifactId>tycho</artifactId>
-	<version>1.2.0</version>
+	<version>1.3.0</version>
 	<packaging>pom</packaging>

 	<name>Tycho</name>
@@ -85,23 +85,21 @@
 		<cipherVersion>1.7</cipherVersion>
 		<modelloVersion>1.4</modelloVersion>
 		<jxpathVersion>1.3</jxpathVersion>
-		<pluginToolsVersion>3.3</pluginToolsVersion>
+		<pluginToolsVersion>3.5.2</pluginToolsVersion>
 		<maven-version>3.0</maven-version>
 		<!-- NOTE: when updating surefire version, double-check Import-Package statements generated by bnd-maven-plugin and possibly adapt instructions in various bnd.bnd files -->
-		<surefire-version>2.19.1</surefire-version>
+		<surefire-version>2.22.0</surefire-version>

 		<!-- dependencies to Eclipse artifacts deployed by tycho-releng/ -->
 		<equinoxVersion>3.13.0.v20180226-1711</equinoxVersion>
 		<equinoxVersionMaven>${equinoxVersion}</equinoxVersionMaven>
 		<equinoxCompatVersion>1.1.100.v20180131-1413</equinoxCompatVersion>
 		<equinoxCompatVersionMaven>${equinoxCompatVersion}</equinoxCompatVersionMaven>
-		<jdtVersion>3.13.102</jdtVersion>
-		<jdtVersionMaven>${jdtVersion}</jdtVersionMaven>
-		<jdtAptVersion>1.3.110</jdtAptVersion>
-		<jdtAptVersionMaven>${jdtAptVersion}</jdtAptVersionMaven>
+		<ecjVersion>3.15.1</ecjVersion>
+		<ecjVersionMaven>${ecjVersion}</ecjVersionMaven>

 		<!-- version of Tycho used by this build -->
-		<tychoBootstrapVersion>1.1.0</tychoBootstrapVersion>
+		<tychoBootstrapVersion>1.2.0</tychoBootstrapVersion>
 	</properties>

 	<dependencyManagement>
@@ -228,13 +226,8 @@
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.jdt</groupId>
-				<artifactId>org.eclipse.jdt.core</artifactId>
-				<version>${jdtVersionMaven}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jdt</groupId>
-				<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-				<version>${jdtAptVersionMaven}</version>
+				<artifactId>ecj</artifactId>
+				<version>${ecjVersionMaven}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.eclipse.tycho</groupId>
@@ -409,7 +402,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.19.1</version>
+					<version>2.22.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>

--- a/setup/Tycho.setup
+++ b/setup/Tycho.setup
@@ -16,8 +16,8 @@
    label="Tycho">
  <setupTask
      xsi:type="jdt:JRETask"
-      version="JavaSE-1.7"
-      location="${jre.location-1.7}">
+      version="JavaSE-1.8"
+      location="${jre.location-1.8}">
    <description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
  </setupTask>
  <setupTask

--- a/sisu-equinox/pom.xml
+++ b/sisu-equinox/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho</artifactId>
-		<version>1.2.0</version>
+		<version>1.3.0</version>
 	</parent>

 	<artifactId>sisu-equinox</artifactId>

--- a/sisu-equinox/sisu-equinox-api/.settings/org.eclipse.jdt.core.prefs
+++ b/sisu-equinox/sisu-equinox-api/.settings/org.eclipse.jdt.core.prefs
@@ -5,6 +5,7 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

--- a/sisu-equinox/sisu-equinox-api/pom.xml
+++ b/sisu-equinox/sisu-equinox-api/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>sisu-equinox</artifactId>
-		<version>1.2.0</version>
+		<version>1.3.0</version>
 	</parent>
 	<artifactId>sisu-equinox-api</artifactId>


--- a/sisu-equinox/sisu-equinox-embedder/.settings/org.eclipse.jdt.core.prefs
+++ b/sisu-equinox/sisu-equinox-embedder/.settings/org.eclipse.jdt.core.prefs
@@ -5,6 +5,7 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

--- a/sisu-equinox/sisu-equinox-embedder/pom.xml
+++ b/sisu-equinox/sisu-equinox-embedder/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>sisu-equinox</artifactId>
-		<version>1.2.0</version>
+		<version>1.3.0</version>
 	</parent>
 	<artifactId>sisu-equinox-embedder</artifactId>


--- a/sisu-equinox/sisu-equinox-embedder/src/main/java/org/eclipse/sisu/equinox/embedder/internal/DefaultEquinoxEmbedder.java
+++ b/sisu-equinox/sisu-equinox-embedder/src/main/java/org/eclipse/sisu/equinox/embedder/internal/DefaultEquinoxEmbedder.java
@@ -203,6 +203,7 @@ public class DefaultEquinoxEmbedder extends AbstractLogEnabled
    private void activateBundlesInWorkingOrder() {
        // activate bundles which need to do work in their respective activator; stick to a working order (cf. bug 359787)
        // TODO this order should come from the EquinoxRuntimeLocator
+    	tryActivateBundle("org.apache.felix.scr");
        tryActivateBundle("org.eclipse.equinox.ds");
        tryActivateBundle("org.eclipse.equinox.registry");
        tryActivateBundle("org.eclipse.core.net");

--- a/sisu-equinox/sisu-equinox-launching/.settings/org.eclipse.jdt.core.prefs
+++ b/sisu-equinox/sisu-equinox-launching/.settings/org.eclipse.jdt.core.prefs
@@ -5,6 +5,7 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

--- a/sisu-equinox/sisu-equinox-launching/pom.xml
+++ b/sisu-equinox/sisu-equinox-launching/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>sisu-equinox</artifactId>
-		<version>1.2.0</version>
+		<version>1.3.0</version>
 	</parent>
 	<artifactId>sisu-equinox-launching</artifactId>


--- a/sisu-equinox/sisu-equinox-launching/src/main/java/org/eclipse/sisu/equinox/launching/DefaultEquinoxInstallationDescription.java
+++ b/sisu-equinox/sisu-equinox-launching/src/main/java/org/eclipse/sisu/equinox/launching/DefaultEquinoxInstallationDescription.java
@@ -33,6 +33,7 @@ public class DefaultEquinoxInstallationDescription implements EquinoxInstallatio
        setDefaultStartLevel("org.eclipse.equinox.simpleconfigurator", 1);
        setDefaultStartLevel("org.eclipse.osgi", -1);
        setDefaultStartLevel("org.eclipse.equinox.ds", 1);
+        setDefaultStartLevel("org.apache.felix.scr", 1);
    }

    private static void setDefaultStartLevel(String id, int level) {

--- a/target-platform-configuration/.settings/org.eclipse.jdt.core.prefs
+++ b/target-platform-configuration/.settings/org.eclipse.jdt.core.prefs
@@ -5,6 +5,7 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

--- a/target-platform-configuration/pom.xml
+++ b/target-platform-configuration/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<artifactId>tycho</artifactId>
 		<groupId>org.eclipse.tycho</groupId>
-		<version>1.2.0</version>
+		<version>1.3.0</version>
 	</parent>

 	<artifactId>target-platform-configuration</artifactId>

--- a/tycho-artifactcomparator/.settings/org.eclipse.jdt.core.prefs
+++ b/tycho-artifactcomparator/.settings/org.eclipse.jdt.core.prefs
@@ -5,6 +5,7 @@ org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

--- a/tycho-artifactcomparator/pom.xml
+++ b/tycho-artifactcomparator/pom.xml
@@ -16,7 +16,7 @@
  <parent>
    <groupId>org.eclipse.tycho</groupId>
    <artifactId>tycho</artifactId>
-    <version>1.2.0</version>
+    <version>1.3.0</version>
  </parent>
  <artifactId>tycho-artifactcomparator</artifactId>


--- a/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tycho Core Maven/OSGi Shared Classes Tests
 Bundle-SymbolicName: org.eclipse.tycho.core.shared.tests
-Bundle-Version: 1.2.0
+Bundle-Version: 1.3.0
 Fragment-Host: org.eclipse.tycho.core.shared
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.8.2"

--- a/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.tycho</groupId>
 		<artifactId>tycho-bundles</artifactId>
-		<version>1.2.0</version>
+		<version>1.3.0</version>
 	</parent>

 	<artifactId>org.eclipse.tycho.core.shared.tests</artifactId>