Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg · Emmanuel Bourg
--- a/.gitignore
+++ b/.gitignore
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-#quilt
-.pc/
-
+target/
+bin/
+.project
+.classpath
+.settings/
--- a/debian/README.source
+++ b/debian/README.source
-This is not actually full Tycho. Tycho requires Eclipse to build, and both
-Eclipse and Tycho require Tycho itself to build (a previous version of Tycho
-would be enough but we don't have it (yet).
-We started with http://pkgs.fedoraproject.org/cgit/rpms/tycho.git/tree/tycho-bootstrap.sh
-to understand which portions of Tycho may be built without Eclipse.
-
-Tycho uses 4 jars made up of binaries from Eclipse: org.eclipse.*
-Sources are not completely available. We took sources from Eclipse aggregator (the eclipse-bundles/ folder)
-and resources from Maven Central repository.
-
-Fedora packagers added a fedoraproject-p2 module. We do not know exactly what is it needed for.
-
--- a/debian/changelog
+++ b/debian/changelog
-tycho (0.25.0-5) UNRELEASED; urgency=medium
+tycho (1.0.0-1) unstable; urgency=medium

  * Team upload.
+
+  [ Christopher Hoskin ]
  * Add debian/clean 

- -- Christopher Hoskin <mans0954@debian.org>  Tue, 28 Nov 2017 21:46:49 +0000
+  [ Emmanuel Bourg ]
+  * New upstream release
+    - Refreshed the patches
+    - Ignore the new test modules
+    - Removed the dependency on libcommons-httpclient-java
+    - Removed the dependency on libcommons-jxpath-java
+  * Use the Eclipse Aether/Maven Resolver API instead of Sonatype Aether
+  * Replaced the embedded bundles with dependencies on eclipse/equinox packages
+  * Disabled the lock file marker created in /usr/share/maven-repo/
+  * Patched DefaultEquinoxEmbedder to throw explicit exception messages
+  * Simplified the Maven rules
+  * Added a watch file
+  * Standards-Version updated to 4.2.1
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Sun, 28 Oct 2018 10:46:11 +0100

 tycho (0.25.0-4) unstable; urgency=medium


--- a/debian/compat
+++ b/debian/compat
-10
+11
--- a/debian/control
+++ b/debian/control
@@ -7,19 +7,38 @@ Uploaders:
 Markus Koschany <apo@debian.org>
 Build-Depends:
 ant,
- debhelper (>= 10),
+ debhelper (>= 11~),
 default-jdk,
- ecj,
- libaether-java,
 libasm-java (>= 5.0),
 libbcel-java,
 libcommons-compress-java,
 libcommons-exec-java,
- libcommons-httpclient-java,
- libcommons-jxpath-java,
 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,
+ libeclipse-osgi-util-java,
+ libequinox-app-java,
+ libequinox-common-java,
+ libequinox-frameworkadmin-java,
+ libequinox-p2-artifact-repository-java,
+ libequinox-p2-core-java,
+ libequinox-p2-director-app-java,
+ libequinox-p2-director-java,
+ libequinox-p2-metadata-java,
+ libequinox-p2-metadata-repository-java,
+ libequinox-p2-publisher-eclipse-java,
+ libequinox-p2-publisher-java,
+ libequinox-p2-repository-java,
+ libequinox-p2-repository-tools-java,
+ libequinox-p2-updatesite-java,
+ libequinox-preferences-java,
+ libequinox-registry-java,
+ libequinox-security-java,
 libgeronimo-commonj-spec-java,
- libicu4j-java,
 libmaven-archiver-java (>=2.0),
 libmaven-assembly-plugin-java,
 libmaven-bundle-plugin-java (>=2.5.4),
@@ -42,11 +61,10 @@ Build-Depends:
 libxz-java,
 maven-debian-helper,
 rsync,
- sat4j (>= 2.3.5),
 zip
-Standards-Version: 4.1.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/tycho.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/tycho.git
+Standards-Version: 4.2.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/

 Package: libtycho-java

--- a/debian/copyright
+++ b/debian/copyright
--- a/debian/eclipse-bootstrap.sh
+++ b/debian/eclipse-bootstrap.sh
-#!/bin/bash -e
-#with this script we want to build the eclipse jars (bundles) used by tycho
-
-#There are some sources here, however they are not complete:
-#http://central.maven.org/maven2/org/eclipse/tycho/org.eclipse.osgi.compatibility.state/1.0.100.v20150402-1551/org.eclipse.osgi.compatibility.state-1.0.100.v20150402-1551-sources.jar
-#http://central.maven.org/maven2/org/eclipse/tycho/org.eclipse.jdt.compiler.apt/1.2.0.v20150514-0146/org.eclipse.jdt.compiler.apt-1.2.0.v20150514-0146-sources.jar
-#FIXME libequinox-osgi-java ?
-
-BUNDLES="./eclipse-bundles"
-
-BUILD1=$1/org.eclipse.osgi
-BUILD2=$1/org.eclipse.jdt.core
-BUILD3=$1/org.eclipse.osgi.compatibility.state
-BUILD4=$1/org.eclipse.jdt.compiler.apt
-
-cd $BUNDLES
-
-echo "Rearranging eclipse bundles..."
-
-#==========first artifact=================================================================
-mkdir -p $BUILD1/src/main/java
-
-cp -r org.eclipse.core.runtime/src/* $BUILD1/src/main/java
-cp -r org.eclipse.core.contenttype/src/* $BUILD1/src/main/java
-cp -r org.eclipse.core.jobs/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.p2.core/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.p2.metadata/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.p2.publisher/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.p2.publisher.eclipse/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.p2.repository/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.p2.metadata.repository/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.p2.artifact.repository/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.p2.jarprocessor/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.simpleconfigurator/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.simpleconfigurator.manipulator/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.frameworkadmin/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.frameworkadmin.equinox/src/* $BUILD1/src/main/java
-cp -r org.eclipse.osgi.util/src/* $BUILD1/src/main/java
-cp -r org.eclipse.osgi/container/src/* $BUILD1/src/main/java
-cp -r org.eclipse.osgi/supplement/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.preferences/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.preferences/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.common/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.security/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.app/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.registry/src/* $BUILD1/src/main/java
-
-#cp -r org.eclipse.osgi.compatibility.state/src/* $BUILD1/src/main/java	#compat. include osgi.internal...
-cp -r org.eclipse.osgi/felix/src/* $BUILD1/src/main/java
-
-cp -r org.eclipse.equinox.p2.repository.tools/src/* $BUILD1/src/main/java
-cp -r org.eclipse.osgi/osgi/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.app/osgi/* $BUILD1/src/main/java
-cp -r org.eclipse.osgi.services/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.p2.director/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.p2.engine/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.p2.jarprocessor/src_ant/* $BUILD1/src/main/java
-
-#need SteppedTimeoutLexicoHelper from sat4j 2.3.4
-
-cp -r org.eclipse.equinox.p2.touchpoint.eclipse/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.p2.garbagecollector/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.p2.updatesite/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.p2.director.app/src/* $BUILD1/src/main/java
-cp -r org.eclipse.core.net/src/* $BUILD1/src/main/java
-
-cp -r org.eclipse.swt/Eclipse\ SWT/common/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT/cairo/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT/gtk/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT/emulated/taskbar/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT/emulated/bidi/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT/emulated/coolbar/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT/common_j2se/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ Custom\ Widgets/common/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ Printing/common/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ Printing/gtk/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ Drag\ and\ Drop/common/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ Drag\ and\ Drop/gtk/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ PI/common/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ PI/common_j2se/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ PI/cairo/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ PI/gtk/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ Accessibility/common/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ Accessibility/gtk/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ Browser/common/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ Browser/gtk/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ Mozilla/gtk/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ WebKit/gtk/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ Program/common/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ Program/gtk/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ Program/gnome/* $BUILD1/src/main/java
-cp -r org.eclipse.swt/Eclipse\ SWT\ Program/cde/* $BUILD1/src/main/java
-
-cp -r org.eclipse.text/src/* $BUILD1/src/main/java
-cp -r org.eclipse.text/projection/* $BUILD1/src/main/java
-cp -r org.eclipse.jface.text/src/* $BUILD1/src/main/java
-cp -r org.eclipse.jface.text/projection/* $BUILD1/src/main/java
-cp -r org.eclipse.core.commands/src/* $BUILD1/src/main/java
-cp -r org.eclipse.jface/src/* $BUILD1/src/main/java
-cp -r org.eclipse.core.expressions/src/* $BUILD1/src/main/java
-cp -r org.eclipse.equinox.bidi/src/* $BUILD1/src/main/java
-cp -r org.eclipse.core.resources/src/* $BUILD1/src/main/java
-cp -r org.eclipse.core.filesystem/src/* $BUILD1/src/main/java
-
-cp -r org.eclipse.osgi/*.profile $BUILD1/src/main/java
-cp -r org.eclipse.osgi/plugin.xml $BUILD1/src/main/java
-cp -r org.eclipse.osgi/systembundle.properties $BUILD1/src/main/java
-cp -r org.eclipse.osgi/profile.list $BUILD1/src/main/java
-cp -r org.eclipse.osgi/META-INF $BUILD1/src/main/java
-
-cp ../debian/org.eclipse.osgi.pom.xml $BUILD1/pom.xml
-
-#==========second artifact=================================================================
-mkdir -p $BUILD2/src/main/java
-
-cp -r org.eclipse.jdt.core/compiler/* $BUILD2/src/main/java
-cp -r org.eclipse.jdt.core/batch/* $BUILD2/src/main/java
-cp -r org.eclipse.jdt.core/model/* $BUILD2/src/main/java
-cp -r org.eclipse.jdt.core/codeassist/* $BUILD2/src/main/java
-cp -r org.eclipse.jdt.core/search/* $BUILD2/src/main/java
-cp -r org.eclipse.jdt.core/dom/* $BUILD2/src/main/java
-cp -r org.eclipse.jdt.core/formatter/* $BUILD2/src/main/java
-cp -r org.eclipse.jdt.core/eval/* $BUILD2/src/main/java
-
-cp -r org.eclipse.jdt.core/plugin.xml $BUILD2/src/main/java
-cp -r org.eclipse.jdt.core/plugin.properties $BUILD2/src/main/java
-
-cp ../debian/org.eclipse.jdt.core.pom.xml $BUILD2/pom.xml
-
-#==========third artifact=================================================================
-mkdir -p $BUILD3/src/main/java
-
-cp -r org.eclipse.osgi.compatibility.state/src/* $BUILD3/src/main/java
-cp -r org.eclipse.osgi.compatibility.state/OSGI-INF $BUILD3/src/main/java
-
-cp ../debian/org.eclipse.osgi.compatibility.state.pom.xml $BUILD3/pom.xml
-
-#==========fourth artifact=================================================================
-mkdir -p $BUILD4/src/main/java
-
-cp -r org.eclipse.jdt.compiler.apt/src/* $BUILD4/src/main/java
-
-cp ../debian/org.eclipse.jdt.compiler.apt.pom.xml $BUILD4/pom.xml
-
-#==========================================================================================
-#cd $BUILD1
-
-#mvn -o -Dmaven.repo.local=$REPO -Dmaven.test.skip=true install
-
-
--- a/debian/get-eclipse.sh
+++ b/debian/get-eclipse.sh
-#!/bin/bash -e
-AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
-TAG=R4_5_1
-
-rm -rf R4_platform-aggregator-$TAG
-rm -rf R4_platform-aggregator-$TAG.tar.xz
-
-# adding --depth 1 here may result in a quicker clone, but did not work for me
-git clone --depth 1 --branch $TAG  $AGGREGATOR_PATH R4_platform-aggregator-$TAG
-
-pushd R4_platform-aggregator-$TAG
-
-git submodule init
-git submodule update
-
-rm -rf bootstrap devutils streams scripts
-
-# Comment this line to get a shallow clone.
-find . -type d -name ".git" | xargs rm -rf
-
-# Delete pre-built binary artifacts except some test data that cannot be generated
-find . ! -path "*/JCL/*" \
-   -type f -name *.jar -delete
-find . -type f -name *.class -delete
-find . -type f -name *.so -delete
-find . -type f -name *.dll -delete
-find . -type f -name *.jnilib -delete
-find . -type f -name *.exe -delete
-# Remove pre-compiled native launchers
-rm -rf rt.equinox.binaries/org.eclipse.equinox.executable/{bin,contributed}/
-
-#now, we keep only bundles required by Tycho
-BUNDLES="../eclipse-bundles-for-tycho"
-mkdir -p $BUNDLES
-
-mv eclipse.platform.runtime/bundles/org.eclipse.core.runtime/* $BUNDLES
-mv eclipse.platform.runtime/bundles/org.eclipse.core.contenttype/src/* $BUNDLES
-mv eclipse.platform.runtime/bundles/org.eclipse.core.jobs/src/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.p2.core/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.p2.metadata/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher/src/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.p2.publisher.eclipse/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.p2.metadata.repository/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.p2.artifact.repository/src/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.p2.jarprocessor/src/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator/src/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.simpleconfigurator.manipulator/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.frameworkadmin/src/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/* $BUNDLES
-mv rt.equinox.framework/bundles/org.eclipse.osgi.util/src/* $BUNDLES
-mv rt.equinox.framework/bundles/org.eclipse.osgi/container/src/* $BUNDLES
-mv rt.equinox.framework/bundles/org.eclipse.osgi/supplement/src/* $BUNDLES
-mv rt.equinox.bundles/bundles/org.eclipse.equinox.preferences/src/* $BUNDLES
-mv rt.equinox.bundles/bundles/org.eclipse.equinox.preferences/src/* $BUNDLES
-mv rt.equinox.bundles/bundles/org.eclipse.equinox.common/src/* $BUNDLES
-mv rt.equinox.bundles/bundles/org.eclipse.equinox.security/src/* $BUNDLES
-mv rt.equinox.bundles/bundles/org.eclipse.equinox.app/src/* $BUNDLES
-mv rt.equinox.bundles/bundles/org.eclipse.equinox.registry/src/* $BUNDLES
-
-mv rt.equinox.framework/bundles/org.eclipse.osgi.compatibility.state/src/* $BUNDLES
-mv rt.equinox.framework/bundles/org.eclipse.osgi/felix/src/* $BUNDLES
-
-mv rt.equinox.p2/bundles/org.eclipse.equinox.p2.repository.tools/* $BUNDLES
-mv rt.equinox.framework/bundles/org.eclipse.osgi/osgi/src/* $BUNDLES
-mv rt.equinox.bundles/bundles/org.eclipse.equinox.app/osgi/* $BUNDLES
-mv rt.equinox.framework/bundles/org.eclipse.osgi.services/src/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.p2.director/src/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.p2.engine/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.p2.jarprocessor/src_ant/* $BUNDLES
-
-#$MAVEN_BIN compile              #first 1546 files 26sec
-
-#need SteppedTimeoutLexicoHelper from sat4j 2.3.4
-
-mv rt.equinox.p2/bundles/org.eclipse.equinox.p2.touchpoint.eclipse/src/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.p2.garbagecollector/src/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.p2.updatesite/src/* $BUNDLES
-mv rt.equinox.p2/bundles/org.eclipse.equinox.p2.director.app/src/* $BUNDLES
-mv eclipse.platform.team/bundles/org.eclipse.core.net/src/* $BUNDLES
-
-#$MAVEN_BIN compile             #here 1663 files 28sec
-
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT/common/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT/cairo/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT/gtk/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT/emulated/taskbar/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT/emulated/bidi/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT/emulated/coolbar/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT/common_j2se/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ Custom\ Widgets/common/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ Printing/common/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ Printing/gtk/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ Drag\ and\ Drop/common/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ Drag\ and\ Drop/gtk/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ PI/common/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ PI/common_j2se/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ PI/cairo/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ Accessibility/common/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ Accessibility/gtk/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ Browser/common/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ Browser/gtk/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ Mozilla/common/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ Mozilla/gtk/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ WebKit/gtk/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ Program/common/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ Program/gtk/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ Program/gnome/* $BUNDLES
-mv eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse\ SWT\ Program/cde/* $BUNDLES
-
-#$MAVEN_BIN compile             #here 2226 files 35sec
-
-mv eclipse.jdt.core/org.eclipse.jdt.core/compiler/* $BUNDLES
-mv eclipse.jdt.core/org.eclipse.jdt.core/batch/* $BUNDLES
-mv eclipse.jdt.core/org.eclipse.jdt.core/model/* $BUNDLES
-mv eclipse.jdt.core/org.eclipse.jdt.core/codeassist/* $BUNDLES
-mv eclipse.jdt.core/org.eclipse.jdt.core/search/* $BUNDLES
-mv eclipse.jdt.core/org.eclipse.jdt.core/dom/* $BUNDLES
-mv eclipse.jdt.core/org.eclipse.jdt.core/formatter/* $BUNDLES
-mv eclipse.jdt.core/org.eclipse.jdt.core/eval/* $BUNDLES
-mv eclipse.platform.text/org.eclipse.text/src/* $BUNDLES
-mv eclipse.platform.text/org.eclipse.text/projection/* $BUNDLES
-mv eclipse.platform.text/org.eclipse.jface.text/src/* $BUNDLES
-mv eclipse.platform.text/org.eclipse.jface.text/projection/* $BUNDLES
-mv eclipse.platform.ui/bundles/org.eclipse.core.commands/* $BUNDLES
-mv eclipse.platform.ui/bundles/org.eclipse.jface/src/* $BUNDLES
-mv eclipse.platform.runtime/bundles/org.eclipse.core.expressions/src/* $BUNDLES
-mv rt.equinox.bundles/bundles/org.eclipse.equinox.bidi/src/* $BUNDLES
-mv eclipse.platform.resources/bundles/org.eclipse.core.resources/src/* $BUNDLES
-mv eclipse.platform.resources/bundles/org.eclipse.core.filesystem/src/* $BUNDLES
-
-popd
-
-echo "FIXME: here I would delete $(pwd)/R4_platform-aggregator-$TAG" 
-#rm -rf R4_platform-aggregator-$TAG
-
--- a/debian/libtycho-java.poms
+++ b/debian/libtycho-java.poms
@@ -28,66 +28,47 @@

 pom.xml --has-package-version

-org.eclipse.osgi/pom.xml --has-package-version --usj-name=tycho-org.eclipse.osgi
-org.eclipse.jdt.core/pom.xml --has-package-version --usj-name=tycho-org.eclipse.jdt.core
-org.eclipse.osgi.compatibility.state/pom.xml --has-package-version --java-lib --usj-name=tycho-org.eclipse.osgi.compatibility.state
-org.eclipse.jdt.compiler.apt/pom.xml --has-package-version --java-lib --usj-name=tycho-org.eclipse.jdt.compiler.apt
-
+sisu-equinox/pom.xml                                              --has-package-version
+sisu-equinox/sisu-equinox-api/pom.xml                             --has-package-version --java-lib
+sisu-equinox/sisu-equinox-embedder/pom.xml                        --has-package-version --java-lib
+sisu-equinox/sisu-equinox-launching/pom.xml                       --has-package-version --java-lib
+target-platform-configuration/pom.xml                             --has-package-version --java-lib
+tycho-artifactcomparator/pom.xml                                  --has-package-version --java-lib
 tycho-bundles/pom.xml                                             --has-package-version
-tycho-bundles/tycho-bundles-target/pom.xml --has-package-version --ignore
-tycho-bundles/tycho-standalone-p2-director/pom.xml --has-package-version --ignore
-tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml --has-package-version --java-lib
+tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml         --ignore
 tycho-bundles/org.eclipse.tycho.core.shared/pom.xml               --has-package-version --java-lib
-tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml --has-package-version --java-lib
-tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml --has-package-version --java-lib
+tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml           --has-package-version --java-lib
+tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml              --ignore
+tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml --ignore
 tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml       --has-package-version --java-lib
+tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml     --ignore
 tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml          --has-package-version --java-lib
+tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml        --has-package-version --java-lib
+tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/pom.xml  --ignore
 tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml             --has-package-version --java-lib
-
-tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml --has-package-version --ignore
-tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml --has-package-version --ignore
-tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml --has-package-version --ignore
-tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml --has-package-version --ignore
-tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml --has-package-version --ignore
-tycho-bundles/org.eclipse.tycho.test.utils/pom.xml --has-package-version --ignore
-
+tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml           --has-package-version --java-lib
+tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml            --ignore
+tycho-bundles/org.eclipse.tycho.test.utils/pom.xml                --ignore
 tycho-bundles/tycho-bundles-external/pom.xml                      --has-package-version
-fedoraproject-p2/pom.xml --has-package-version
-fedoraproject-p2/org.fedoraproject.p2/pom.xml
-fedoraproject-p2/xmvn-p2-installer-plugin/pom.xml --ignore
-fedoraproject-p2/org.fedoraproject.p2.tests/pom.xml --ignore
-
+tycho-bundles/tycho-bundles-target/pom.xml                        --ignore
+tycho-bundles/tycho-standalone-p2-director/pom.xml                --ignore
+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
 tycho-embedder-api/pom.xml                                        --has-package-version --java-lib
+tycho-its/pom.xml                                                 --ignore
+tycho-maven-plugin/pom.xml                                        --has-package-version --java-lib
 tycho-metadata-model/pom.xml                                      --has-package-version --java-lib
-sisu-equinox/pom.xml --has-package-version
-sisu-equinox/sisu-equinox-api/pom.xml --has-package-version --java-lib
-sisu-equinox/sisu-equinox-embedder/pom.xml --has-package-version --java-lib
-tycho-core/pom.xml --has-package-version --java-lib
-tycho-packaging-plugin/pom.xml --has-package-version --java-lib
 tycho-p2/pom.xml                                                  --has-package-version
+tycho-p2/tycho-p2-director-plugin/pom.xml                         --ignore
 tycho-p2/tycho-p2-facade/pom.xml                                  --has-package-version --java-lib
-tycho-maven-plugin/pom.xml --has-package-version --java-lib
-tycho-p2/tycho-p2-repository-plugin/pom.xml --has-package-version --java-lib
-tycho-p2/tycho-p2-publisher-plugin/pom.xml --has-package-version --java-lib
-target-platform-configuration/pom.xml --has-package-version --java-lib
-tycho-artifactcomparator/pom.xml --has-package-version --java-lib
-sisu-equinox/sisu-equinox-launching/pom.xml --has-package-version --java-lib
 tycho-p2/tycho-p2-plugin/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-testing-harness/pom.xml --has-package-version --ignore
-tycho-source-plugin/pom.xml --has-package-version --ignore
-tycho-pomgenerator-plugin/pom.xml --has-package-version --ignore
-tycho-surefire/pom.xml --has-package-version --ignore
-tycho-surefire/tycho-surefire-plugin/pom.xml --has-package-version --ignore
-tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml --has-package-version --ignore
-tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml --has-package-version --ignore
-tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml --has-package-version --ignore
-tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml --has-package-version --ignore
-tycho-release/pom.xml --has-package-version --ignore
-tycho-release/tycho-versions-plugin/pom.xml --has-package-version --ignore
-tycho-p2/tycho-p2-director-plugin/pom.xml --has-package-version --ignore
-tycho-its/pom.xml --has-package-version --ignore
-tycho-releng/pom.xml --has-package-version --ignore
-
+tycho-p2/tycho-p2-publisher-plugin/pom.xml                        --has-package-version --java-lib
+tycho-p2/tycho-p2-repository-plugin/pom.xml                       --has-package-version --java-lib
+tycho-packaging-plugin/pom.xml                                    --has-package-version --java-lib
+tycho-pomgenerator-plugin/pom.xml                                 --ignore
+tycho-release/pom.xml                                             --ignore
+tycho-releng/pom.xml                                              --ignore
+tycho-source-plugin/pom.xml                                       --ignore
+tycho-surefire/pom.xml                                            --ignore
+tycho-testing-harness/pom.xml                                     --ignore
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -17,9 +17,6 @@ org.eclipse.tycho.extras tycho-p2-extras-plugin * * * *
 org.sonatype.plexus plexus-jetty-testsuite * * * *
 org.sonatype.plugins maven-properties-plugin * * * *

-org.fedoraproject.p2 xmvn-p2-installer-plugin * * * *
-
 #THESE ARE TO SKIP TESTS
 org.eclipse.tycho tycho-testing-harness * * * *
-org.fedoraproject.p2 org.fedoraproject.p2.tests * * * *
 * * * * * test
--- a/debian/maven.rules
+++ b/debian/maven.rules
 # Format of this file is:
 # [group] [artifact] [type] [version] [classifier] [scope]

-#FIXME this is for eclipse-bootstrap
 junit junit jar s/.*/4.x/ * *
-javax.servlet.jsp javax.servlet.jsp-api jar * * *
-org.ow2.sat4j org.ow2.sat4j.core jar s/.*/debian/ * *
-org.ow2.sat4j org.ow2.sat4j.pb jar s/.*/debian/ * *
-org.ow2.sat4j org.ow2.sat4j.maxsat jar s/.*/debian/ * *

-org.eclipse.tycho org.eclipse.osgi.compatibility.state jar * * *
-org.eclipse.tycho org.eclipse.osgi jar * * *
-org.eclipse.tycho org.eclipse.jdt.compiler.apt jar * * *
-org.eclipse.tycho org.eclipse.jdt.core jar * * *
-org.apache.commons commons-lang3 jar s/3\..*/3.x/ * *
 org.apache.maven maven-compat jar s/.*/3.x/ * *
 org.apache.maven maven-core jar s/.*/3.x/ * *
 org.apache.maven maven-model jar s/.*/3.x/ * *
 org.apache.maven maven-plugin-api jar s/.*/3.x/ * *
 org.apache.maven maven-settings jar s/.*/3.x/ * *
-org.apache.maven.shared maven-verifier jar s/.*/debian/ * *
-org.codehaus.plexus plexus-compiler-api jar s/.*/2.x/ * *
-org.codehaus.plexus plexus-compiler-csharp jar s/.*/2.x/ * *
-org.codehaus.plexus plexus-compiler-eclipse jar s/.*/2.x/ * *
-org.codehaus.plexus plexus-compiler-javac jar s/.*/2.x/ * *
-org.codehaus.plexus plexus-compiler-jikes jar s/.*/2.x/ * *
-org.codehaus.plexus plexus-compiler-manager jar s/.*/2.x/ * *
-org.codehaus.plexus plexus-compiler-test jar s/.*/2.x/ * *
-org.codehaus.plexus plexus-component-annotations jar s/.*/1.5.5/ * *
-org.codehaus.plexus plexus-component-metadata maven-plugin * * *
-org.codehaus.plexus plexus-container-default jar s/.*/1.5.5/ * *
+org.codehaus.plexus plexus-compiler-* jar s/.*/2.x/ * *
 org.codehaus.plexus plexus-utils jar s/.*/2.x/ * *
-org.eclipse.tycho org.eclipse.tycho.core.shared eclipse-plugin * * *
-org.eclipse.tycho org.eclipse.tycho.core.shared.tests eclipse-test-plugin * * *
-org.eclipse.tycho org.eclipse.tycho.embedder.shared eclipse-plugin * * *
-org.eclipse.tycho org.eclipse.tycho.noopsecurity eclipse-plugin * * *
-org.eclipse.tycho org.eclipse.tycho.p2.maven.repository eclipse-plugin * * *
-org.eclipse.tycho org.eclipse.tycho.p2.maven.repository.tests eclipse-test-plugin * * *
-org.eclipse.tycho org.eclipse.tycho.p2.resolver.impl eclipse-plugin * * *
-org.eclipse.tycho org.eclipse.tycho.p2.resolver.impl.test eclipse-test-plugin * * *
-org.eclipse.tycho org.eclipse.tycho.p2.resolver.shared eclipse-plugin * * *
-org.eclipse.tycho org.eclipse.tycho.p2.tools.impl eclipse-plugin * * *
-org.eclipse.tycho org.eclipse.tycho.p2.tools.shared eclipse-plugin * * *
-org.eclipse.tycho org.eclipse.tycho.p2.tools.tests eclipse-test-plugin * * *
-org.eclipse.tycho org.eclipse.tycho.surefire.junit47 eclipse-plugin * * *
-org.eclipse.tycho org.eclipse.tycho.surefire.junit4 eclipse-plugin * * *
-org.eclipse.tycho org.eclipse.tycho.surefire.junit eclipse-plugin * * *
-org.eclipse.tycho org.eclipse.tycho.surefire.osgibooter eclipse-plugin * * *
-org.eclipse.tycho org.eclipse.tycho.test.utils eclipse-plugin * * *
-org.eclipse.tycho sisu-equinox-api jar * * *
-org.eclipse.tycho sisu-equinox-embedder jar * * *
-org.eclipse.tycho sisu-equinox-launching jar * * *
-org.eclipse.tycho sisu-equinox pom * * *
-org.eclipse.tycho tycho-artifactcomparator jar * * *
-org.eclipse.tycho tycho-bundles-external eclipse-application * * *
-org.eclipse.tycho tycho-bundles-target eclipse-target-definition * * *
-org.eclipse.tycho tycho-bundles pom * * *
-org.eclipse.tycho tycho-compiler-jdt jar * * *
-org.eclipse.tycho tycho-core jar * * *
-org.eclipse.tycho tycho-embedder-api jar * * *
-org.eclipse.tycho tycho-its jar * * *
-org.eclipse.tycho tycho-metadata-model jar * * *
-org.eclipse.tycho tycho-p2-facade jar * * *
-org.eclipse.tycho tycho-p2 pom * * *
-org.eclipse.tycho tycho-release pom * * *
-org.eclipse.tycho tycho-releng pom * * *
-org.eclipse.tycho tycho-standalone-p2-director eclipse-repository * * *
-org.eclipse.tycho tycho-surefire pom * * *
-org.eclipse.tycho tycho-testing-harness jar * * *
-org.eclipse.tycho tycho pom * * *
-org.sonatype.plexus plexus-cipher jar s/.*/debian/ * *
-s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * *
-s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools * s/.*/debian/ * *
-s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * *
-s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ * *
-org.mockito mockito-core * s/.*/debian/ * *
+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/debian/org.eclipse.jdt.compiler.apt.orig.pom.xml
+++ b/debian/org.eclipse.jdt.compiler.apt.orig.pom.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.eclipse.tycho</groupId>
-  <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-  <version>1.2.0.v20150514-0146</version>
-
-  <name>Tycho org.eclipse.jdt.compiler.apt dependency (Incubation)</name>
-  <description>This is org.eclipse.jdt.compiler.apt jar used by Tycho</description>
-  <url>http://www.eclipse.org/tycho/</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>http://git.eclipse.org/c/tycho/org.eclipse.tycho.git</url>
-  </scm>
-
-  <developers>
-    <developer>
-      <id>tycho-dev@eclipse.org</id>
-      <name>Tycho Development Team</name>
-    </developer>
-  </developers>
-</project>
--- a/debian/org.eclipse.jdt.compiler.apt.pom.xml
+++ b/debian/org.eclipse.jdt.compiler.apt.pom.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-
-  	<parent>
-		<groupId>org.eclipse.tycho</groupId>
-		<artifactId>tycho</artifactId>
-		<version>0.25.0</version>
-	</parent>
-
-  <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
-  <version>1.2.0.v20150514-0146</version>
-
-  <name>Eclipse Bootstrap: JDT compiler apt</name>
-  <description>This is org.eclipse.jdt.compiler.apt jar used by Tycho</description>
-  <url>http://www.eclipse.org/tycho/</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>http://git.eclipse.org/c/tycho/org.eclipse.tycho.git</url>
-  </scm>
-
-  <developers>
-    <developer>
-      <id>tycho-dev@eclipse.org</id>
-      <name>Tycho Development Team</name>
-    </developer>
-  </developers>
-
-        <dependencies>
-        		<dependency>
-                              <groupId>org.eclipse.tycho</groupId>
-                              <artifactId>org.eclipse.jdt.core</artifactId>
-                              <version>3.11.1.v20150902-1521</version>
-			</dependency>
-        </dependencies>
-	<build>
-	<plugins>
-        	<plugin>
-            		<artifactId>maven-compiler-plugin</artifactId>
-			<version>3.2</version>
-            		<configuration>
-                		<source>1.8</source>
-                		<target>1.8</target>
-            		</configuration>
-        	</plugin>
-    	</plugins>
-        <resources>
-                <resource>
-                        <directory>src/main/java</directory>
-                        <excludes>
-                                <exclude>**/*.java</exclude>
-                        </excludes>
-                </resource>
-        </resources>
-	</build>
-
-</project>
--- a/debian/org.eclipse.jdt.core.orig.pom.xml
+++ b/debian/org.eclipse.jdt.core.orig.pom.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.eclipse.tycho</groupId>
-  <artifactId>org.eclipse.jdt.core</artifactId>
-  <version>3.11.1.v20150902-1521</version>
-
-  <name>Tycho org.eclipse.jdt.core dependency (Incubation)</name>
-  <description>This is org.eclipse.jdt.core jar used by Tycho</description>
-  <url>http://www.eclipse.org/tycho/</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>http://git.eclipse.org/c/tycho/org.eclipse.tycho.git</url>
-  </scm>
-
-  <developers>
-    <developer>
-      <id>tycho-dev@eclipse.org</id>
-      <name>Tycho Development Team</name>
-    </developer>
-  </developers>
-</project>
--- a/debian/org.eclipse.jdt.core.pom.xml
+++ b/debian/org.eclipse.jdt.core.pom.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.tycho</groupId>
-		<artifactId>tycho</artifactId>
-		<version>0.25.0</version>
-	</parent>
-	<artifactId>org.eclipse.jdt.core</artifactId>
-	<version>3.11.1.v20150902-1521</version>
-
-	<name>Eclipse Bootstrap: JDT core</name>
-	<description>Eclipse bundles required to build Tycho. Tycho is not required to build these.</description>
-	
-        <dependencies>
-			<dependency>
-				<groupId>org.codehaus.plexus</groupId>
-				<artifactId>plexus-io</artifactId>
-				<version>1.0-alpha-5</version> <!-- was 2.6 -->
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.plexus</groupId>
-				<artifactId>plexus-archiver</artifactId>
-				<version>2.2</version> <!-- was 2.10.1 -->
-				<exclusions>
-					<exclusion>
-						<groupId>org.codehaus.plexus</groupId>
-						<artifactId>plexus-container-default</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.plexus</groupId>
-				<artifactId>plexus-compiler-api</artifactId>
-				<version>2.x</version> <!--was 2.2-->
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.plexus</groupId>
-				<artifactId>plexus-compiler-manager</artifactId>
-				<version>2.x</version> <!-- was 2.2 -->
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-lang3</artifactId>
-				<version>3.x</version> <!-- was 3.1-->
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.x</version> <!-- was 4.11 -->
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.mockito</groupId>
-				<artifactId>mockito-core</artifactId>
-				<version>debian</version> <!-- was 1.8.4 -->
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.hamcrest</groupId>
-				<artifactId>hamcrest-core</artifactId>
-				<version>1.3</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>de.pdark</groupId>
-				<artifactId>decentxml</artifactId>
-				<version>debian</version> <!-- was 1.3 -->
-			</dependency>
-			<dependency>
-				<!--groupId>bcel</groupId-->
-				<groupId>org.apache.bcel</groupId>
-				<artifactId>bcel</artifactId>
-				<version>5.x</version> <!-- was 5.1 -->
-			</dependency>
-
-<!--for following artifacts, versions are the ones available in Debian -->
-			<dependency>
-				<groupId>org.osgi</groupId>
-				<artifactId>org.osgi.annotation</artifactId>
-				<version>debian</version>
-			</dependency>
-			<dependency>
-				<groupId>org.w3c.css</groupId>
-				<artifactId>sac</artifactId>
-				<version>debian</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.servlet.jsp</groupId>
-				<artifactId>javax.servlet.jsp-api</artifactId>
-				<version>2.3</version>
-			</dependency>
-			<dependency>
-				<groupId>com.ibm.icu</groupId>
-				<artifactId>icu4j</artifactId>
-				<version>debian</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.inject</groupId>
-				<artifactId>javax.inject</artifactId>
-				<version>debian</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>ant</artifactId>
-				<version>debian</version>
-			</dependency>
-			<dependency>
-				<groupId>org.tukaani</groupId>
-				<artifactId>xz</artifactId>
-				<version>debian</version>
-			</dependency>
-			<dependency>
-                              <groupId>org.ow2.sat4j</groupId>
-                              <artifactId>org.ow2.sat4j.core</artifactId>
-                              <version>2.3.5</version>
-			</dependency>
-			<dependency>
-                              <groupId>org.ow2.sat4j</groupId>
-                              <artifactId>org.ow2.sat4j.pb</artifactId>
-                              <version>2.3.5</version>
-			</dependency>
-			<dependency>
-                              <groupId>org.ow2.sat4j</groupId>
-                              <artifactId>org.ow2.sat4j.maxsat</artifactId>
-                              <version>2.3.5</version>
-			</dependency>
-        		<dependency>
-                              <groupId>org.eclipse.tycho</groupId>
-                              <artifactId>org.eclipse.osgi</artifactId>
-                              <version>3.10.101.v20150820-1432</version>
-			</dependency>
-        </dependencies>
-	<build>
-	<plugins>
-        	<plugin>
-            		<artifactId>maven-compiler-plugin</artifactId>
-			<version>3.2</version>
-            		<configuration>
-                		<source>1.8</source>
-                		<target>1.8</target>
-            			<!-- DONT WORK compilerArgs>
-            	  			<arg>-Xmaxerrs 10</arg>
-            			</compilerArgs-->
-            		</configuration>
-        	</plugin>
-    	</plugins>
-        <resources>
-                <resource>
-                        <directory>src/main/java</directory>
-                        <excludes>
-                                <exclude>**/*.java</exclude>
-                        </excludes>
-                </resource>
-        </resources>
-	</build>
-
-<properties>
-    <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
-</properties>
-
-</project>
--- a/debian/org.eclipse.osgi.compatibility.state.orig.pom.xml
+++ b/debian/org.eclipse.osgi.compatibility.state.orig.pom.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>org.eclipse.tycho</groupId>
-  <artifactId>org.eclipse.osgi.compatibility.state</artifactId>
-  <version>1.0.100.v20150402-1551</version>
-
-  <name>Tycho org.eclipse.osgi.compatibility.state dependency (Incubation)</name>
-  <description>This is org.eclipse.osgi.compatibility.state jar used by Tycho</description>
-  <url>http://www.eclipse.org/tycho/</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>http://git.eclipse.org/c/tycho/org.eclipse.tycho.git</url>
-  </scm>
-
-  <developers>
-    <developer>
-      <id>tycho-dev@eclipse.org</id>
-      <name>Tycho Development Team</name>
-    </developer>
-  </developers>
-</project>
--- a/debian/org.eclipse.osgi.compatibility.state.pom.xml
+++ b/debian/org.eclipse.osgi.compatibility.state.pom.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-
-  	<parent>
-		<groupId>org.eclipse.tycho</groupId>
-		<artifactId>tycho</artifactId>
-		<version>0.25.0</version>
-	</parent>
-
-  <artifactId>org.eclipse.osgi.compatibility.state</artifactId>
-  <version>1.0.100.v20150402-1551</version>
-
-  <name>Eclipse Bootstrap: OSGI compatibility state</name>
-  <description>This is org.eclipse.osgi.compatibility.state jar used by Tycho</description>
-  <url>http://www.eclipse.org/tycho/</url>
-
-  <licenses>
-    <license>
-      <name>Eclipse Public License</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>http://git.eclipse.org/c/tycho/org.eclipse.tycho.git</url>
-  </scm>
-
-  <developers>
-    <developer>
-      <id>tycho-dev@eclipse.org</id>
-      <name>Tycho Development Team</name>
-    </developer>
-  </developers>
-
-        <dependencies>
-        		<dependency>
-                              <groupId>org.eclipse.tycho</groupId>
-                              <artifactId>org.eclipse.osgi</artifactId>
-                              <version>3.10.101.v20150820-1432</version>
-			</dependency>
-        </dependencies>
-	<build>
-	<plugins>
-        	<plugin>
-            		<artifactId>maven-compiler-plugin</artifactId>
-			<version>3.2</version>
-            		<configuration>
-                		<source>1.8</source>
-                		<target>1.8</target>
-            		</configuration>
-        	</plugin>
-    	</plugins>
-        <resources>
-                <resource>
-                        <directory>src/main/java</directory>
-                        <excludes>
-                                <exclude>**/*.java</exclude>
-                        </excludes>
-                </resource>
-        </resources>
-	</build>
-
-</project>
--- a/debian/org.eclipse.osgi.orig.pom.xml
+++ b/debian/org.eclipse.osgi.orig.pom.xml
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-<modelVersion>4.0.0</modelVersion>
-<groupId>org.eclipse.tycho</groupId>
-<artifactId>org.eclipse.osgi</artifactId>
-<version>3.10.100.v20150529-1857</version>
-<name>Tycho org.eclipse.osgi dependency (Incubation)</name>
-<description>This is org.eclipse.osgi jar used by Tycho</description>
-<url>http://www.eclipse.org/tycho/</url>
-<licenses>
-<license>
-<name>Eclipse Public License</name>
-<url>http://www.eclipse.org/legal/epl-v10.html</url>
-<distribution>repo</distribution>
-</license>
-</licenses>
-<scm>
-<url>
-http://git.eclipse.org/c/tycho/org.eclipse.tycho.git
-</url>
-</scm>
-<developers>
-<developer>
-<id>tycho-dev@eclipse.org</id>
-<name>Tycho Development Team</name>
-</developer>
-</developers>
-</project>
--- a/debian/org.eclipse.osgi.pom.xml
+++ b/debian/org.eclipse.osgi.pom.xml
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.tycho</groupId>
-		<artifactId>tycho</artifactId>
-		<version>0.25.0</version>
-	</parent>
-	<artifactId>org.eclipse.osgi</artifactId>
-	<version>3.10.101.v20150820-1432</version>
-
-	<name>Eclipse Bootstrap: OSGI</name>
-	<description>Eclipse bundles required to build Tycho. Tycho is not required to build these.</description>
-	
-        <dependencies>
-			<dependency>
-				<groupId>org.codehaus.plexus</groupId>
-				<artifactId>plexus-io</artifactId>
-				<version>1.0-alpha-5</version> <!-- was 2.6 -->
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.plexus</groupId>
-				<artifactId>plexus-archiver</artifactId>
-				<version>2.2</version> <!-- was 2.10.1 -->
-				<exclusions>
-					<exclusion>
-						<groupId>org.codehaus.plexus</groupId>
-						<artifactId>plexus-container-default</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.plexus</groupId>
-				<artifactId>plexus-compiler-api</artifactId>
-				<version>2.x</version> <!--was 2.2-->
-			</dependency>
-			<dependency>
-				<groupId>org.codehaus.plexus</groupId>
-				<artifactId>plexus-compiler-manager</artifactId>
-				<version>2.x</version> <!-- was 2.2 -->
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-lang3</artifactId>
-				<version>3.x</version> <!-- was 3.1-->
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.x</version> <!-- was 4.11 -->
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.mockito</groupId>
-				<artifactId>mockito-core</artifactId>
-				<version>debian</version> <!-- was 1.8.4 -->
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.hamcrest</groupId>
-				<artifactId>hamcrest-core</artifactId>
-				<version>1.3</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>de.pdark</groupId>
-				<artifactId>decentxml</artifactId>
-				<version>debian</version> <!-- was 1.3 -->
-			</dependency>
-			<dependency>
-				<!--groupId>bcel</groupId-->
-				<groupId>org.apache.bcel</groupId>
-				<artifactId>bcel</artifactId>
-				<version>5.x</version> <!-- was 5.1 -->
-			</dependency>
-
-<!--for following artifacts, versions are the ones available in Debian -->
-			<dependency>
-				<groupId>org.osgi</groupId>
-				<artifactId>org.osgi.annotation</artifactId>
-				<version>debian</version>
-			</dependency>
-			<dependency>
-				<groupId>org.w3c.css</groupId>
-				<artifactId>sac</artifactId>
-				<version>debian</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.servlet.jsp</groupId>
-				<artifactId>javax.servlet.jsp-api</artifactId>
-				<version>2.3</version>
-			</dependency>
-			<dependency>
-				<groupId>com.ibm.icu</groupId>
-				<artifactId>icu4j</artifactId>
-				<version>debian</version>
-			</dependency>
-			<dependency>
-				<groupId>javax.inject</groupId>
-				<artifactId>javax.inject</artifactId>
-				<version>debian</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.ant</groupId>
-				<artifactId>ant</artifactId>
-				<version>debian</version>
-			</dependency>
-			<dependency>
-				<groupId>org.tukaani</groupId>
-				<artifactId>xz</artifactId>
-				<version>debian</version>
-			</dependency>
-			<dependency>
-                              <groupId>org.ow2.sat4j</groupId>
-                              <artifactId>org.ow2.sat4j.core</artifactId>
-                              <version>2.3.5</version>
-			</dependency>
-			<dependency>
-                              <groupId>org.ow2.sat4j</groupId>
-                              <artifactId>org.ow2.sat4j.pb</artifactId>
-                              <version>2.3.5</version>
-			</dependency>
-			<dependency>
-                              <groupId>org.ow2.sat4j</groupId>
-                              <artifactId>org.ow2.sat4j.maxsat</artifactId>
-                              <version>2.3.5</version>
-			</dependency>
-        </dependencies>
-	<build>
-	<plugins>
-        	<plugin>
-            		<artifactId>maven-compiler-plugin</artifactId>
-			<version>3.2</version>
-            		<configuration>
-                		<source>1.8</source>
-                		<target>1.8</target>
-            			<!-- DONT WORK compilerArgs>
-            	  			<arg>-Xmaxerrs 10</arg>
-            			</compilerArgs-->
-            		</configuration>
-        	</plugin>
-    	</plugins>
-        <resources>
-                <resource>
-                        <directory>src/main/java</directory>
-                        <excludes>
-                                <exclude>**/*.java</exclude>
-                        </excludes>
-                </resource>
-        </resources>
-	</build>
-
-<properties>
-    <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
-</properties>
-
-</project>
--- a/debian/patches/aether.patch
+++ b/debian/patches/aether.patch
+Description: Use Eclipse Aether (now Maven Resolver) instead of Sonatype Aether
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/tycho-core/src/main/java/org/eclipse/tycho/core/p2/P2RepositoryConnector.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/p2/P2RepositoryConnector.java
+@@ -12,14 +12,14 @@
+ 
+ import java.util.Collection;
+ 
+-import org.sonatype.aether.repository.RemoteRepository;
+-import org.sonatype.aether.spi.connector.ArtifactDownload;
+-import org.sonatype.aether.spi.connector.ArtifactUpload;
+-import org.sonatype.aether.spi.connector.MetadataDownload;
+-import org.sonatype.aether.spi.connector.MetadataUpload;
+-import org.sonatype.aether.spi.connector.RepositoryConnector;
+-import org.sonatype.aether.transfer.ArtifactNotFoundException;
+-import org.sonatype.aether.transfer.MetadataNotFoundException;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.spi.connector.ArtifactDownload;
+import org.eclipse.aether.spi.connector.ArtifactUpload;
+import org.eclipse.aether.spi.connector.MetadataDownload;
+import org.eclipse.aether.spi.connector.MetadataUpload;
+import org.eclipse.aether.spi.connector.RepositoryConnector;
+import org.eclipse.aether.transfer.ArtifactNotFoundException;
+import org.eclipse.aether.transfer.MetadataNotFoundException;
+ 
+ public class P2RepositoryConnector implements RepositoryConnector {
+ 
+--- a/tycho-core/src/main/java/org/eclipse/tycho/core/p2/P2RepositoryConnectorFactory.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/p2/P2RepositoryConnectorFactory.java
+@@ -11,17 +11,17 @@
+ package org.eclipse.tycho.core.p2;
+ 
+ import org.codehaus.plexus.component.annotations.Component;
+-import org.sonatype.aether.RepositorySystemSession;
+-import org.sonatype.aether.repository.RemoteRepository;
+-import org.sonatype.aether.spi.connector.RepositoryConnector;
+-import org.sonatype.aether.spi.connector.RepositoryConnectorFactory;
+-import org.sonatype.aether.transfer.NoRepositoryConnectorException;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.spi.connector.RepositoryConnector;
+import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
+import org.eclipse.aether.transfer.NoRepositoryConnectorException;
+ 
+ @Component(role = RepositoryConnectorFactory.class, hint = "p2")
+ public class P2RepositoryConnectorFactory implements RepositoryConnectorFactory {
+ 
+     @Override
+-    public int getPriority() {
+    public float getPriority() {
+         return 0;
+     }
+