Tony Mancill · Sudip Mukherjee · Tony Mancill · Tony Mancill · Tony Mancill · Tony Mancill
--- a/debian/changelog
+++ b/debian/changelog
+tycho (1.2.0-1) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Sudip Mukherjee ]
+  * Update to upstream tycho-1.2.0
+  * Update to compat level 12
+  * Standards Version updated to 4.4.1
+
+  [ tony mancill ]
+  * Set "Rules-Requires-Root: no" in debian/control
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Sat, 16 Nov 2019 21:07:38 +0000
+
 tycho (1.0.0-2) unstable; urgency=medium

  * Team upload.

--- a/debian/compat
+++ b/debian/compat
-11
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders:
 Luca Vercelli <luca.vercelli.to@gmail.com>
 Build-Depends:
 ant,
- debhelper (>= 11~),
+ debhelper-compat (= 12),
 default-jdk,
 libasm-java (>= 5.0),
 libbcel-java,
@@ -61,10 +61,11 @@ Build-Depends:
 maven-debian-helper,
 rsync,
 zip
-Standards-Version: 4.2.1
+Standards-Version: 4.4.1
 Vcs-Git: https://salsa.debian.org/java-team/tycho.git
 Vcs-Browser: https://salsa.debian.org/java-team/tycho
 Homepage: https://eclipse.org/tycho/
+Rules-Requires-Root: no

 Package: libtycho-java
 Architecture: all

--- a/debian/libtycho-java.poms
+++ b/debian/libtycho-java.poms
@@ -52,6 +52,7 @@ tycho-bundles/org.eclipse.tycho.test.utils/pom.xml                --ignore
 tycho-bundles/tycho-bundles-external/pom.xml                      --has-package-version
 tycho-bundles/tycho-bundles-target/pom.xml                        --ignore
 tycho-bundles/tycho-standalone-p2-director/pom.xml                --ignore
+tycho-lib-detector/pom.xml                                        --has-package-version --java-lib
 tycho-compiler-jdt/pom.xml                                        --has-package-version --java-lib
 tycho-compiler-plugin/pom.xml                                     --has-package-version --java-lib
 tycho-core/pom.xml                                                --has-package-version --java-lib

--- a/debian/patches/equinox-p2-compatibility.patch
+++ b/debian/patches/equinox-p2-compatibility.patch
-Description: Fixes the compatibility with Equinox p2 4.8
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: no
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/util/resolution/DependencyCollector.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/util/resolution/DependencyCollector.java
-@@ -105,7 +105,7 @@
-             return true;
-         }
- 
-        return RequiredCapability.isVersionStrict(req.getMatches());
-+        return RequiredCapability.isStrictVersionRequirement(req.getMatches());
-     }
- 
-     private boolean isFeature(IInstallableUnit iu) {
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/src/main/java/org/eclipse/tycho/p2/tools/mirroring/MirrorApplicationServiceImpl.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/src/main/java/org/eclipse/tycho/p2/tools/mirroring/MirrorApplicationServiceImpl.java
-@@ -167,7 +167,7 @@
-                     descriptor.setLocation(destination.getLocation().toURI());
- 
-                     RecreateRepositoryApplication application = new RecreateRepositoryApplication();
-                    application.setArtifactRepository(descriptor);
-+                    application.setArtifactRepository(descriptor.getRepoLocation());
-                     application.run(new NullProgressMonitor());
-                 } catch (ProvisionException e) {
-                     throw new FacadeException(MIRROR_FAILURE_MESSAGE + ": " + StatusTool.collectProblems(e.getStatus()),
--- a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/src/main/java/org/eclipse/tycho/p2/tools/publisher/ExpandedProduct.java
-+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/src/main/java/org/eclipse/tycho/p2/tools/publisher/ExpandedProduct.java
-@@ -249,4 +249,8 @@
-         return defaults.getRepositoryEntries();
-     }
- 
-+    @Override
-+    public String getVM(String os) {
-+        return defaults.getVM(os);
-+    }
- }
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java
-+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java
-@@ -29,7 +29,7 @@
-     private Location anyLocation;
- 
-     public FileLockServiceImpl() {
-        anyLocation = new BasicLocation(null, null, false, null, new ConfigValues(new HashMap<String, String>()),
-+        anyLocation = new BasicLocation(null, null, false, null, new ConfigValues(new HashMap<String, String>(), new HashMap()),
-                 new EquinoxContainer(null), new AtomicBoolean(false));
-     }
- 
--- a/debian/patches/mockito.patch
+++ b/debian/patches/mockito.patch
 This dependency is marked "test" in the parent pom, and not in the child pom.
-Maven-debhelper removes it in the parent, and not in the child, thus resulting in a currupted child pom.
+Maven-debhelper removes it in the parent, and not in the child, thus resulting in a corrupted child pom.
 --- a/tycho-core/pom.xml
 +++ b/tycho-core/pom.xml
 @@ -160,6 +160,7 @@

--- a/debian/patches/plexus-compatibility.patch
+++ b/debian/patches/plexus-compatibility.patch
-From: Markus Koschany <apo@debian.org>
-Date: Sat, 2 Sep 2017 03:18:22 +0200
-Subject: plexus compatibility
-
-Bug-Debian: https://bugs.debian.org/871347
---
- .../main/java/org/eclipse/tycho/packaging/LicenseFeatureHelper.java    | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/LicenseFeatureHelper.java b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/LicenseFeatureHelper.java
-index 4e6f995..534498e 100644
--- a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/LicenseFeatureHelper.java
-+++ b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/LicenseFeatureHelper.java
-@@ -117,8 +117,7 @@ public class LicenseFeatureHelper {
-         // mavenArchiver ignores license feature files that are also present in 'this' feature
-         // i.e. if there is a conflict, files from 'this' feature win
- 
-        DefaultArchivedFileSet result = new DefaultArchivedFileSet();
-        result.setArchive(licenseFeature);
-+        DefaultArchivedFileSet result = new DefaultArchivedFileSet(licenseFeature);
-         result.setIncludes(includes.toArray(new String[includes.size()]));
-         result.setExcludes(excludes.toArray(new String[excludes.size()]));
- 
--- a/debian/patches/series
+++ b/debian/patches/series
 disable-tycho-lock-file-marker.patch
 fix-osgi-runtime.patch
 fix-packaging.patch
-plexus-compatibility.patch
 mockito.patch
 explicit-exception-messages.patch
 aether.patch
-equinox-p2-compatibility.patch
--- a/pom.xml
+++ b/pom.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- - Copyright (c) 2008, 2016 Sonatype Inc. and others.
+ - Copyright (c) 2008, 2017 Sonatype Inc. and others.
 - All rights reserved. This program and the accompanying materials
 - are made available under the terms of the Eclipse Public License v1.0
 - which accompanies this distribution, and is available at
@@ -63,7 +63,7 @@

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

 	<name>Tycho</name>
@@ -76,29 +76,32 @@
 		<!-- copy&paste from maven/pom.xml file. I wish import scope worked in 3.0 -->
 		<classWorldsVersion>2.2.3</classWorldsVersion>
 		<commonsCliVersion>1.2</commonsCliVersion>
+		<commonsCompressVersion>1.15</commonsCompressVersion>
 		<junitVersion>3.8.2</junitVersion>
-		<plexusVersion>1.5.5</plexusVersion>
+		<plexusVersion>1.7.1</plexusVersion>
 		<plexusInterpolationVersion>1.14</plexusInterpolationVersion>
-		<plexusUtilsVersion>3.0.7</plexusUtilsVersion>
+		<plexusUtilsVersion>3.0.24</plexusUtilsVersion>
 		<securityDispatcherVersion>1.3</securityDispatcherVersion>
 		<cipherVersion>1.7</cipherVersion>
 		<modelloVersion>1.4</modelloVersion>
 		<jxpathVersion>1.3</jxpathVersion>
 		<pluginToolsVersion>3.3</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>

 		<!-- dependencies to Eclipse artifacts deployed by tycho-releng/ -->
-		<equinoxVersion>3.11.2.v20161107-1947</equinoxVersion>
+		<equinoxVersion>3.13.0.v20180226-1711</equinoxVersion>
 		<equinoxVersionMaven>${equinoxVersion}</equinoxVersionMaven>
-		<equinoxCompatVersion>1.0.200.v20160504-1419</equinoxCompatVersion>
+		<equinoxCompatVersion>1.1.100.v20180131-1413</equinoxCompatVersion>
 		<equinoxCompatVersionMaven>${equinoxCompatVersion}</equinoxCompatVersionMaven>
-		<jdtVersion>3.12.2.v20161117-1814</jdtVersion>
+		<jdtVersion>3.13.102</jdtVersion>
 		<jdtVersionMaven>${jdtVersion}</jdtVersionMaven>
-		<jdtAptVersion>1.2.100.v20160418-1457</jdtAptVersion>
+		<jdtAptVersion>1.3.110</jdtAptVersion>
 		<jdtAptVersionMaven>${jdtAptVersion}</jdtAptVersionMaven>

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

 	<dependencyManagement>
@@ -165,12 +168,12 @@
 			<dependency>
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-io</artifactId>
-				<version>2.4.1</version>
+				<version>2.7.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-archiver</artifactId>
-				<version>2.9.1</version>
+				<version>3.4</version>
 				<exclusions>
 					<exclusion>
 						<groupId>org.codehaus.plexus</groupId>
@@ -192,6 +195,22 @@
 				<artifactId>plexus-compiler-manager</artifactId>
 				<version>2.2</version>
 			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-compress</artifactId>
+				<version>${commonsCompressVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-compress</artifactId>
+				<classifier>sources</classifier>
+				<version>${commonsCompressVersion}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.commons</groupId>
+				<artifactId>commons-exec</artifactId>
+				<version>1.2</version>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-lang3</artifactId>
@@ -208,12 +227,12 @@
 				<version>${equinoxCompatVersionMaven}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.eclipse.tycho</groupId>
+				<groupId>org.eclipse.jdt</groupId>
 				<artifactId>org.eclipse.jdt.core</artifactId>
 				<version>${jdtVersionMaven}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.eclipse.tycho</groupId>
+				<groupId>org.eclipse.jdt</groupId>
 				<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
 				<version>${jdtAptVersionMaven}</version>
 			</dependency>
@@ -315,7 +334,7 @@
 			<dependency>
 				<groupId>org.apache.maven.shared</groupId>
 				<artifactId>maven-verifier</artifactId>
-				<version>1.3</version>
+				<version>1.6</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
@@ -390,17 +409,17 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>2.17</version>
+					<version>2.19.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-clean-plugin</artifactId>
-					<version>2.4.1</version>
+					<version>3.0.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>2.1</version>
+					<version>3.7.0</version>
 					<configuration>
 						<source>${min.jdk.version}</source>
 						<target>${min.jdk.version}</target>
@@ -409,12 +428,12 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>2.2</version>
+					<version>3.0.2</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-release-plugin</artifactId>
-					<version>2.0-beta-7</version>
+					<version>2.5.3</version>
 					<configuration>
 						<tagBase>https://svn.sonatype.org/m2eclipse/tycho/tags</tagBase>
 					</configuration>
@@ -422,7 +441,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>2.2-beta-2</version>
+					<version>3.1.0</version>
 					<configuration>
 						<tarLongFileMode>gnu</tarLongFileMode>
 					</configuration>
@@ -430,32 +449,32 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>2.1</version>
+					<version>3.0.2</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-resources-plugin</artifactId>
-					<version>2.4.3</version>
+					<version>3.0.2</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>2.1.2</version>
+					<version>3.0.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.felix</groupId>
 					<artifactId>maven-bundle-plugin</artifactId>
-					<version>2.0.1</version>
+					<version>2.5.4</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-install-plugin</artifactId>
-					<version>2.3.1</version>
+					<version>2.5.2</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>3.3</version>
+					<version>3.4</version>
 					<dependencies>
 						<dependency>
 							<groupId>org.apache.maven.doxia</groupId>
@@ -465,7 +484,14 @@
 					</dependencies>
 					<configuration>
 						<relativizeDecorationLinks>false</relativizeDecorationLinks>
-						<reportPlugins>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+
+  <reporting>
+    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-plugin-plugin</artifactId>
@@ -489,12 +515,8 @@
          </reportSet>
        </reportSets>
      </plugin>
-						</reportPlugins>
-					</configuration>
-				</plugin>
    </plugins>
-		</pluginManagement>
-	</build>
+  </reporting>

 	<modules>
 		<module>tycho-bundles</module>
@@ -506,6 +528,7 @@
 		<module>tycho-core</module>
 		<module>tycho-testing-harness</module>
 		<module>tycho-compiler-jdt</module>
+		<module>tycho-lib-detector</module>
 		<module>tycho-compiler-plugin</module>
 		<module>tycho-packaging-plugin</module>
 		<module>tycho-source-plugin</module>
@@ -548,7 +571,7 @@
 					<plugin>
 						<groupId>org.jacoco</groupId>
 						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>0.7.6.201602180812</version>
+						<version>0.7.9</version>
 						<executions>
 							<execution>
 								<goals>
@@ -572,7 +595,7 @@
 						<!-- see https://docs.sonatype.org/display/Repository/How+To+Generate+PGP+Signatures+With+Maven -->
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.4</version>
+						<version>1.6</version>
 						<executions>
 							<execution>
 								<id>sign-artifacts</id>

--- a/setup/README.md
+++ b/setup/README.md
@@ -14,22 +14,17 @@ Tycho.setup is an Eclipse Installer (Oomph) setup file that does
 Usage for contributors:
 -----------------------

-The Tycho.setup file is not part of the Eclipse Installer Project Catalog yet, so the Tycho.setup file must be downloaded and opened by the Eclipse Installer manually. 
+The Tycho.setup file is part of the Eclipse Installer Project Catalog, so the Tycho.setup file doesn't have to be downloaded manually.

  * Download the [Eclipse Installer](https://wiki.eclipse.org/Eclipse_Installer)
-  * Download the Tycho.setup file
  * Run the Eclipse Installer
  * Switch to the Advanced Mode (Menu->"Advanced Mode...")
  * Select "Eclipse IDE for Eclipse Committers"
-  * Select "Latest Release (Mars)" as "Product Version" and select either 32 or 64 bit version.
-  * Choose one of the installed JREs (must be 1.7+) as "Java 1.7+ VM"
+  * Select "Latest Release (Neon)" as "Product Version" and select either 32 or 64 bit version.
+  * Choose one of the installed JREs (must be 1.8+) as "Java 1.8+ VM"
  * Click "Next"
-  * The "Eclipse Projects" and "Github Projects" catalogs are shown. Since the Tycho.setup file is not part of the catalog yet, 
-    you have to Drag and Drop the Tycho.setup file into this view 
-    (Note: It must be dropped either on the folder "Eclipse.org" or the "Github.com")
-  * Now there must be a <User>/Tycho entry in the container where you dropped the Tycho.setup file. 
-  * Double click (Single click is not enough!) on the <User>/Tycho entry will select the Tycho.setup to be executed. Make sure that <User>/Tycho is shown in the table on the bottom.
-  * Click "Next" to get the the Variables page
+  * Find and select "Tycho" under the "Eclipse Projects" catalog. Make sure that Tycho is shown in the table on the bottom.
+  * Click "Next" to get the Variables page
  * You can edit the values used by the setup process (e.g. the "Installation Folder"). If you want to choose the Install Folder and "Root install folder", you have to select "Show all variables" at the bottom of the page. Then you are also able to specify the location where Eclipse will be installed. You do not have to select the Target Platform here, this will be set later automatically.
  * Click "Next"
  * Pressing "Finished" on the "Confirmation" page will start the installation process. 
@@ -44,4 +39,3 @@ Make changes to the Tycho.setup file
   * When the setup process is finished, choose "Navigate"->"Open Setup"->"Open <User> - Tycho - master" in the Eclipse menu. 
   * The Setup Editor will be opened with the Tycho.setup file. 
   * See [Eclipse Oomph Authoring](https://wiki.eclipse.org/Eclipse_Oomph_Authoring) for details.
-   
\ No newline at end of file
--- 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.0.0</version>
+		<version>1.2.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
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+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.source=1.7
+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
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

--- 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.0.0</version>
+		<version>1.2.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
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+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.source=1.7
+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
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

--- 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.0.0</version>
+		<version>1.2.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
 /*******************************************************************************
- * Copyright (c) 2008, 2015 Sonatype Inc. and others.
+ * Copyright (c) 2008, 2018 Sonatype Inc. and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -281,7 +281,6 @@ public class DefaultEquinoxEmbedder extends AbstractLogEnabled
    }

    @Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
    public <T> T getService(Class<T> clazz, String filter) {
        checkStarted();


--- a/sisu-equinox/sisu-equinox-launching/.settings/org.eclipse.jdt.core.prefs
+++ b/sisu-equinox/sisu-equinox-launching/.settings/org.eclipse.jdt.core.prefs
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+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.source=1.7
+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
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

--- 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.0.0</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>sisu-equinox-launching</artifactId>

@@ -38,7 +38,6 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-exec</artifactId>
-			<version>1.2</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

--- 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
 /*******************************************************************************
- * Copyright (c) 2008, 2014 Sonatype Inc. and others.
+ * Copyright (c) 2008, 2017 Sonatype Inc. and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -31,7 +31,6 @@ public class DefaultEquinoxInstallationDescription implements EquinoxInstallatio
        setDefaultStartLevel("org.eclipse.equinox.common", 2);
        setDefaultStartLevel("org.eclipse.core.runtime", 4);
        setDefaultStartLevel("org.eclipse.equinox.simpleconfigurator", 1);
-        setDefaultStartLevel("org.eclipse.update.configurator", 3);
        setDefaultStartLevel("org.eclipse.osgi", -1);
        setDefaultStartLevel("org.eclipse.equinox.ds", 1);
    }

--- a/target-platform-configuration/.settings/org.eclipse.jdt.core.prefs
+++ b/target-platform-configuration/.settings/org.eclipse.jdt.core.prefs
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+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.source=1.7
+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
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0