github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

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>
stable-4.4
Matthias Sohn 9 years ago
parent
125a8959d2
commit
e8705a6e27
6 changed files with 19 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      org.eclipse.jgit.ant/pom.xml
  2. 14
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
  3. 6
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
  4. 12
      org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20160501200945-Neon.tpd
  5. 2
      org.eclipse.jgit.packaging/pom.xml
  6. 2
      pom.xml

2
org.eclipse.jgit.ant/pom.xml
Unescape View File

@ -72,7 +72,7 @@
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId> <artifactId>ant</artifactId>
<version>1.9.2</version> <version>1.9.6</version>
</dependency> </dependency>
</dependencies> </dependencies>

14
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
Unescape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?> <?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform --> <!-- 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> <locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.2.13.v20150730"/> <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/"/> <repository id="jetty-9.2.13" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.2.13.v20150730/"/>
</location> </location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <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" version="1.9.6.v201510161327"/>
<unit id="org.apache.ant.source" version="1.9.4.v201504302020"/> <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" version="1.6.0.v201310281400"/>
<unit id="org.apache.commons.compress.source" 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"/> <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.google.gson" version="2.2.4.v201311231704"/>
<unit id="com.jcraft.jsch" version="0.1.53.v201508180515"/> <unit id="com.jcraft.jsch" version="0.1.53.v201508180515"/>
<unit id="com.jcraft.jsch.source" 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" version="4.12.0.v201504281640"/>
<unit id="org.junit.source" version="4.11.0.v201303080030"/> <unit id="org.junit.source" version="4.12.0.v201504281640"/>
<unit id="javax.servlet" version="3.1.0.v201410161800"/> <unit id="javax.servlet" version="3.1.0.v201410161800"/>
<unit id="javax.servlet.source" 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"/> <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.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" version="1.7.2.v20131105-2200"/>
<unit id="org.slf4j.impl.log4j12.source" 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>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/> <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> </location>
</locations> </locations>
</target> </target>

6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd
Unescape View File

@ -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 "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 org.eclipse.osgi lazy
} }

12
org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20151204220443-Neon.tpd → org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20160501200945-Neon.tpd
Unescape View File

@ -1,9 +1,9 @@
target "S20151204220443-Neon" with source configurePhase target "S20160501200945-Neon" with source configurePhase
// see http://download.eclipse.org/tools/orbit/downloads/ // see http://download.eclipse.org/tools/orbit/downloads/
location "http://download.eclipse.org/tools/orbit/downloads/drops/S20151204220443/repository/" { location "http://download.eclipse.org/tools/orbit/downloads/drops/S20160501200945/repository/" {
org.apache.ant [1.9.4.v201504302020,1.9.4.v201504302020] org.apache.ant [1.9.6.v201510161327,1.9.6.v201510161327]
org.apache.ant.source [1.9.4.v201504302020,1.9.4.v201504302020] 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 [1.6.0.v201310281400,1.6.0.v201310281400]
org.apache.commons.compress.source [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 [1.1.1.v201101211721,1.1.1.v201101211721]
@ -27,8 +27,8 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/S2015120422044
com.google.gson [2.2.4.v201311231704,2.2.4.v201311231704] 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 [0.1.53.v201508180515,0.1.53.v201508180515]
com.jcraft.jsch.source [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 [4.12.0.v201504281640,4.12.0.v201504281640]
org.junit.source [4.11.0.v201303080030,4.11.0.v201303080030] org.junit.source [4.12.0.v201504281640,4.12.0.v201504281640]
javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800] javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800]
javax.servlet.source [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 [1.3.0.v201308270617,1.3.0.v201308270617]

2
org.eclipse.jgit.packaging/pom.xml
Unescape View File

@ -61,7 +61,7 @@
<properties> <properties>
<tycho-version>0.23.0</tycho-version> <tycho-version>0.23.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version> <tycho-extras-version>${tycho-version}</tycho-extras-version>
<target-platform>jgit-4.5</target-platform> <target-platform>jgit-4.6</target-platform>
</properties> </properties>
<pluginRepositories> <pluginRepositories>

2
pom.xml
Unescape View File

@ -195,7 +195,7 @@
<jgit-last-release-version>4.2.0.201601211800-r</jgit-last-release-version> <jgit-last-release-version>4.2.0.201601211800-r</jgit-last-release-version>
<jsch-version>0.1.53</jsch-version> <jsch-version>0.1.53</jsch-version>
<javaewah-version>0.7.9</javaewah-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> <test-fork-count>1C</test-fork-count>
<args4j-version>2.0.15</args4j-version> <args4j-version>2.0.15</args4j-version>
<commons-compress-version>1.6</commons-compress-version> <commons-compress-version>1.6</commons-compress-version>

Write Preview
Loading…
Cancel
Save