Prepare Neon target platform

also use the Neon target platform as the default target platform.

Neon Eclipse platform requires BREE 8 so we have to use Java 8 at least
for the JGit packaging build (for the compiler settings we still stick
to source and target 1.7 since we want to still support Java 7)
otherwise unpacking platform pack200 archives will fail since they are
built using Java 8 and hence cannot be unpacked using Java 7's
unpack200.

Update org.junit from 4.11 to 4.11 and org.apache.ant from from 1.9.2 to
1.9.6 since the older versions are not available in Neon orbit version

Ignore a couple of tests in ResourceUtilTest which now fail [1] since
bug 476585 was fixed in Neon M6.

CQ: 10694
CQ: 11308
Change-Id: I1a99a3ac2148693e21c57df5aeb848035b52b97b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml
index edab1cec484241fa8409ede62336f355ead659e8..6a603d07a00955215240aa23e36dbf7d64f30980 100644 (file)
--- a/org.eclipse.jgit.ant/pom.xml
+++ b/org.eclipse.jgit.ant/pom.xml
@@ -72,7 +72,7 @@
                <dependency>
                        <groupId>org.apache.ant</groupId>
                        <artifactId>ant</artifactId>
-                       <version>1.9.2</version>
+                       <version>1.9.6</version>
                </dependency>
        </dependencies>
 

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
index e506aec37d22c654ce644f5449eb4135c54da1ab..d8cacb4c68ebeeed2567b3f80a6861657b9e73ac 100644 (file)
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="jgit-4.5" sequenceNumber="1455835295">
+<target name="jgit-4.6" sequenceNumber="1462141948">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.jetty.client" version="9.2.13.v20150730"/>
@@ -23,8 +23,8 @@
       <repository id="jetty-9.2.13" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.13.v20150730/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.apache.ant" version="1.9.4.v201504302020"/>
-      <unit id="org.apache.ant.source" version="1.9.4.v201504302020"/>
+      <unit id="org.apache.ant" version="1.9.6.v201510161327"/>
+      <unit id="org.apache.ant.source" version="1.9.6.v201510161327"/>
       <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
       <unit id="org.apache.commons.compress.source" version="1.6.0.v201310281400"/>
       <unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
@@ -48,8 +48,8 @@
       <unit id="com.google.gson" version="2.2.4.v201311231704"/>
       <unit id="com.jcraft.jsch" version="0.1.53.v201508180515"/>
       <unit id="com.jcraft.jsch.source" version="0.1.53.v201508180515"/>
-      <unit id="org.junit" version="4.11.0.v201303080030"/>
-      <unit id="org.junit.source" version="4.11.0.v201303080030"/>
+      <unit id="org.junit" version="4.12.0.v201504281640"/>
+      <unit id="org.junit.source" version="4.12.0.v201504281640"/>
       <unit id="javax.servlet" version="3.1.0.v201410161800"/>
       <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
       <unit id="org.tukaani.xz" version="1.3.0.v201308270617"/>
@@ -58,11 +58,11 @@
       <unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
       <unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
       <unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20151204220443/repository/"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20160501200945/repository/"/>
     </location>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.osgi" version="0.0.0"/>
-      <repository location="http://download.eclipse.org/releases/mars/"/>
+      <repository location="http://download.eclipse.org/releases/neon/"/>
     </location>
   </locations>
 </target>

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
index 3963361f6c375e8ab609983fda867aca24200df4..83a68ddc5646fcc6f79b5c6a4fb8cc081e5ceb52 100644 (file)
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
@@ -1,8 +1,8 @@
-target "jgit-4.5" with source configurePhase
+target "jgit-4.6" with source configurePhase
 
 include "projects/jetty-9.2.13.tpd"
-include "orbit/S20151204220443-Neon.tpd"
+include "orbit/S20160501200945-Neon.tpd"
 
-location "http://download.eclipse.org/releases/mars/" {
+location "http://download.eclipse.org/releases/neon/" {
        org.eclipse.osgi lazy
 }
\ No newline at end of file

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20151204220443-Neon.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20151204220443-Neon.tpd
deleted file mode 100644 (file)
index 3afdbaa..0000000
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20151204220443-Neon.tpd
+++ /dev/null
@@ -1,40 +0,0 @@
-target "S20151204220443-Neon" with source configurePhase
-// see http://download.eclipse.org/tools/orbit/downloads/
-
-location "http://download.eclipse.org/tools/orbit/downloads/drops/S20151204220443/repository/" {
-       org.apache.ant [1.9.4.v201504302020,1.9.4.v201504302020]
-       org.apache.ant.source [1.9.4.v201504302020,1.9.4.v201504302020]
-       org.apache.commons.compress [1.6.0.v201310281400,1.6.0.v201310281400]
-       org.apache.commons.compress.source [1.6.0.v201310281400,1.6.0.v201310281400]
-       org.apache.commons.logging [1.1.1.v201101211721,1.1.1.v201101211721]
-       org.apache.commons.logging.source [1.1.1.v201101211721,1.1.1.v201101211721]
-       org.apache.httpcomponents.httpcore [4.3.3.v201411290715,4.3.3.v201411290715]
-       org.apache.httpcomponents.httpcore.source [4.3.3.v201411290715,4.3.3.v201411290715]
-       org.apache.httpcomponents.httpclient [4.3.6.v201511171540,4.3.6.v201511171540]
-       org.apache.httpcomponents.httpclient.source [4.3.6.v201511171540,4.3.6.v201511171540]
-       org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815]
-       org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815]
-       org.kohsuke.args4j [2.0.21.v201301150030,2.0.21.v201301150030]
-       org.kohsuke.args4j.source [2.0.21.v201301150030,2.0.21.v201301150030]
-       org.hamcrest.core [1.3.0.v201303031735,1.3.0.v201303031735]
-       org.hamcrest.core.source [1.3.0.v201303031735,1.3.0.v201303031735]
-       javaewah [0.7.9.v201401101600,0.7.9.v201401101600]
-       javaewah.source [0.7.9.v201401101600,0.7.9.v201401101600]
-       org.objenesis [1.0.0.v201505121915,1.0.0.v201505121915]
-       org.objenesis.source [1.0.0.v201505121915,1.0.0.v201505121915]
-       org.mockito [1.8.4.v201303031500,1.8.4.v201303031500]
-       org.mockito.source [1.8.4.v201303031500,1.8.4.v201303031500]
-       com.google.gson [2.2.4.v201311231704,2.2.4.v201311231704]
-       com.jcraft.jsch [0.1.53.v201508180515,0.1.53.v201508180515]
-       com.jcraft.jsch.source [0.1.53.v201508180515,0.1.53.v201508180515]
-       org.junit [4.11.0.v201303080030,4.11.0.v201303080030]
-       org.junit.source [4.11.0.v201303080030,4.11.0.v201303080030]
-       javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800]
-       javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800]
-       org.tukaani.xz [1.3.0.v201308270617,1.3.0.v201308270617]
-       org.tukaani.xz.source [1.3.0.v201308270617,1.3.0.v201308270617]
-       org.slf4j.api [1.7.2.v20121108-1250,1.7.2.v20121108-1250]
-       org.slf4j.api.source [1.7.2.v20121108-1250,1.7.2.v20121108-1250]
-       org.slf4j.impl.log4j12 [1.7.2.v20131105-2200,1.7.2.v20131105-2200]
-       org.slf4j.impl.log4j12.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200]
-}
\ No newline at end of file

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20160501200945-Neon.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20160501200945-Neon.tpd
new file mode 100644 (file)
index 0000000..a5d87e9
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20160501200945-Neon.tpd
@@ -0,0 +1,40 @@
+target "S20160501200945-Neon" with source configurePhase
+// see http://download.eclipse.org/tools/orbit/downloads/
+
+location "http://download.eclipse.org/tools/orbit/downloads/drops/S20160501200945/repository/" {
+       org.apache.ant [1.9.6.v201510161327,1.9.6.v201510161327]
+       org.apache.ant.source [1.9.6.v201510161327,1.9.6.v201510161327]
+       org.apache.commons.compress [1.6.0.v201310281400,1.6.0.v201310281400]
+       org.apache.commons.compress.source [1.6.0.v201310281400,1.6.0.v201310281400]
+       org.apache.commons.logging [1.1.1.v201101211721,1.1.1.v201101211721]
+       org.apache.commons.logging.source [1.1.1.v201101211721,1.1.1.v201101211721]
+       org.apache.httpcomponents.httpcore [4.3.3.v201411290715,4.3.3.v201411290715]
+       org.apache.httpcomponents.httpcore.source [4.3.3.v201411290715,4.3.3.v201411290715]
+       org.apache.httpcomponents.httpclient [4.3.6.v201511171540,4.3.6.v201511171540]
+       org.apache.httpcomponents.httpclient.source [4.3.6.v201511171540,4.3.6.v201511171540]
+       org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815]
+       org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815]
+       org.kohsuke.args4j [2.0.21.v201301150030,2.0.21.v201301150030]
+       org.kohsuke.args4j.source [2.0.21.v201301150030,2.0.21.v201301150030]
+       org.hamcrest.core [1.3.0.v201303031735,1.3.0.v201303031735]
+       org.hamcrest.core.source [1.3.0.v201303031735,1.3.0.v201303031735]
+       javaewah [0.7.9.v201401101600,0.7.9.v201401101600]
+       javaewah.source [0.7.9.v201401101600,0.7.9.v201401101600]
+       org.objenesis [1.0.0.v201505121915,1.0.0.v201505121915]
+       org.objenesis.source [1.0.0.v201505121915,1.0.0.v201505121915]
+       org.mockito [1.8.4.v201303031500,1.8.4.v201303031500]
+       org.mockito.source [1.8.4.v201303031500,1.8.4.v201303031500]
+       com.google.gson [2.2.4.v201311231704,2.2.4.v201311231704]
+       com.jcraft.jsch [0.1.53.v201508180515,0.1.53.v201508180515]
+       com.jcraft.jsch.source [0.1.53.v201508180515,0.1.53.v201508180515]
+       org.junit [4.12.0.v201504281640,4.12.0.v201504281640]
+       org.junit.source [4.12.0.v201504281640,4.12.0.v201504281640]
+       javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800]
+       javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800]
+       org.tukaani.xz [1.3.0.v201308270617,1.3.0.v201308270617]
+       org.tukaani.xz.source [1.3.0.v201308270617,1.3.0.v201308270617]
+       org.slf4j.api [1.7.2.v20121108-1250,1.7.2.v20121108-1250]
+       org.slf4j.api.source [1.7.2.v20121108-1250,1.7.2.v20121108-1250]
+       org.slf4j.impl.log4j12 [1.7.2.v20131105-2200,1.7.2.v20131105-2200]
+       org.slf4j.impl.log4j12.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200]
+}
\ No newline at end of file

diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index e9dd1b6ec860a0bb19235437f9916124b3d567ee..21d79dd668881d3c84b1fb78bdc2ca6b0ff80e69 100644 (file)
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -61,7 +61,7 @@
   <properties>
     <tycho-version>0.23.0</tycho-version>
     <tycho-extras-version>${tycho-version}</tycho-extras-version>
-    <target-platform>jgit-4.5</target-platform>
+    <target-platform>jgit-4.6</target-platform>
   </properties>
 
   <pluginRepositories>

diff --git a/pom.xml b/pom.xml
index e80d4fb1fe19aa94779e2715f740787720362f8a..0b9f4f1c698536ea3c338595327e9a00104626ac 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -195,7 +195,7 @@
     <jgit-last-release-version>4.2.0.201601211800-r</jgit-last-release-version>
     <jsch-version>0.1.53</jsch-version>
     <javaewah-version>0.7.9</javaewah-version>
-    <junit-version>4.11</junit-version>
+    <junit-version>4.12</junit-version>
     <test-fork-count>1C</test-fork-count>
     <args4j-version>2.0.15</args4j-version>
     <commons-compress-version>1.6</commons-compress-version>