[eclipse] 02/02: Merge branch 'experimental' of git://anonscm.debian.org/pkg-java/eclipse into experimental

[LUCA VERCELLI]

This is an automated email from the git hooks/post-receive script.

luca-vercelli-guest pushed a commit to branch experimental
in repository eclipse.

commit dbb4baeaaf19916e3f833af4a8b4f5cfece78d25
Merge: d3d0f90 81342ac
Author: Luca Vercelli <luca.vercelli.to at gmail.com>
Date:   Tue Jul 12 22:13:23 2016 +0200

    Merge branch 'experimental' of git://anonscm.debian.org/pkg-java/eclipse into experimental

 debian/maven.ignoreRules |  4 ++++
 debian/patches/pom.patch | 14 ++++++++++++++
 debian/patches/series    |  1 +
 3 files changed, 19 insertions(+)

diff --cc debian/maven.ignoreRules
index c946f01,02d55fc..ce645ea
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@@ -14,7 -14,7 +14,11 @@@ org.eclipse.tycho tycho-surefire-plugi
  org.eclipse.tycho.extras tycho-custom-bundle-plugin * * * *
  org.eclipse.tycho.extras tycho-p2-extras-plugin * * * *
  org.eclipse.tycho.extras tycho-source-feature-plugin * * * *
++<<<<<<< HEAD
 +org.eclipse.tycho.extras tycho-bundles-external * * * * *
++=======
+ org.eclipse.tycho tycho-bundles-external * * * * *
++>>>>>>> 81342ac017c20c39a50f0579e23af59f8caae650
  org.mortbay.jetty jetty-jspc-maven-plugin * * * *
  
  #THESE ARE TO SKIP TESTS
diff --cc debian/patches/pom.patch
index 0000000,c3aa971..1b59a17
mode 000000,100644..100644
--- a/debian/patches/pom.patch
+++ b/debian/patches/pom.patch
@@@ -1,0 -1,14 +1,14 @@@
+ Tycho version is inside a variable, so maven.rules cannot fix it
+ --- a/eclipse-platform-parent/pom.xml
+ +++ b/eclipse-platform-parent/pom.xml
+ @@ -72,8 +72,8 @@
+      -->
+  
+      <!-- For using Tycho 23.1 (currently "staged", removed staged repo below, once released) -->
+ -    <tycho.version>0.23.1</tycho.version>
+ -    <tycho-extras.version>0.23.1</tycho-extras.version>
 -+    <tycho.version>0.25</tycho.version>
 -+    <tycho-extras.version>0.25</tycho-extras.version>
+++    <tycho.version>0.25.0</tycho.version>
+++    <tycho-extras.version>0.25.0</tycho-extras.version>
+  
+      <cbi-plugins.version>1.1.3</cbi-plugins.version>
+  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse.git