Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2018-11-23 11:46:37 -0500
committerGerrit Code Review @ Eclipse.org2018-11-23 11:46:37 -0500
commita6c390df5a301b6cd63e6e3a41884e45a0bddd61 (patch)
treeeffc042cfea58d5eb69ffbdd209478e1782c5f2c
parentb16b49081a8aeb839470f5feef60fa8e8c3b086d (diff)
parent811a5c7fa3c24ff131cdcd479278572f86d0bf4c (diff)
downloadegit-a6c390df5a301b6cd63e6e3a41884e45a0bddd61.tar.gz
egit-a6c390df5a301b6cd63e6e3a41884e45a0bddd61.tar.xz
egit-a6c390df5a301b6cd63e6e3a41884e45a0bddd61.zip
Merge changes I081b5a8a,If541e934
* changes: Update Ant to 1.10.5 Update Orbit to S20181120221132 for 2018-12
-rw-r--r--org.eclipse.egit.target/egit-4.10-staging.target8
-rw-r--r--org.eclipse.egit.target/egit-4.10-staging.tpd2
-rw-r--r--org.eclipse.egit.target/egit-4.5.target8
-rw-r--r--org.eclipse.egit.target/egit-4.5.tpd2
-rw-r--r--org.eclipse.egit.target/egit-4.6.target8
-rw-r--r--org.eclipse.egit.target/egit-4.6.tpd2
-rw-r--r--org.eclipse.egit.target/egit-4.7.target8
-rw-r--r--org.eclipse.egit.target/egit-4.7.tpd2
-rw-r--r--org.eclipse.egit.target/egit-4.8.target8
-rw-r--r--org.eclipse.egit.target/egit-4.8.tpd2
-rw-r--r--org.eclipse.egit.target/egit-4.9.target8
-rw-r--r--org.eclipse.egit.target/egit-4.9.tpd2
-rw-r--r--org.eclipse.egit.target/orbit/S20181120221132-2018-12.tpd (renamed from org.eclipse.egit.target/orbit/I20181102163257-2018-12.tpd)8
13 files changed, 34 insertions, 34 deletions
diff --git a/org.eclipse.egit.target/egit-4.10-staging.target b/org.eclipse.egit.target/egit-4.10-staging.target
index 204836062..b21a31ff8 100644
--- a/org.eclipse.egit.target/egit-4.10-staging.target
+++ b/org.eclipse.egit.target/egit-4.10-staging.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="egit-4.10-staging" sequenceNumber="1542817010">
+<target name="egit-4.10-staging" sequenceNumber="1542844252">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
@@ -40,8 +40,8 @@
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
- <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.ant" version="1.10.5.v20180808-0324"/>
+ <unit id="org.apache.ant.source" version="1.10.5.v20180808-0324"/>
<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
<unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/>
<unit id="org.apache.commons.compress" version="1.15.0.v20180119-1613"/>
@@ -91,7 +91,7 @@
<unit id="org.apache.sshd.core.source" version="2.0.0.v20181102-1323"/>
<unit id="org.apache.sshd.sftp" version="2.0.0.v20181102-1323"/>
<unit id="org.apache.sshd.sftp.source" version="2.0.0.v20181102-1323"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20181102163257/repository"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20181120221132/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
diff --git a/org.eclipse.egit.target/egit-4.10-staging.tpd b/org.eclipse.egit.target/egit-4.10-staging.tpd
index e20d24944..28f9d6697 100644
--- a/org.eclipse.egit.target/egit-4.10-staging.tpd
+++ b/org.eclipse.egit.target/egit-4.10-staging.tpd
@@ -2,5 +2,5 @@ target "egit-4.10-staging" with source configurePhase
include "projects/jetty-9.4.11.tpd"
include "projects/swtbot-snapshot.tpd"
-include "orbit/I20181102163257-2018-12.tpd"
+include "orbit/S20181120221132-2018-12.tpd"
include "releasetrain/staging.tpd"
diff --git a/org.eclipse.egit.target/egit-4.5.target b/org.eclipse.egit.target/egit-4.5.target
index 09e00299e..570d49a08 100644
--- a/org.eclipse.egit.target/egit-4.5.target
+++ b/org.eclipse.egit.target/egit-4.5.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="egit-4.5" sequenceNumber="1542816990">
+<target name="egit-4.5" sequenceNumber="1542844248">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
@@ -40,8 +40,8 @@
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
- <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.ant" version="1.10.5.v20180808-0324"/>
+ <unit id="org.apache.ant.source" version="1.10.5.v20180808-0324"/>
<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
<unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/>
<unit id="org.apache.commons.compress" version="1.15.0.v20180119-1613"/>
@@ -91,7 +91,7 @@
<unit id="org.apache.sshd.core.source" version="2.0.0.v20181102-1323"/>
<unit id="org.apache.sshd.sftp" version="2.0.0.v20181102-1323"/>
<unit id="org.apache.sshd.sftp.source" version="2.0.0.v20181102-1323"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20181102163257/repository"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20181120221132/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
diff --git a/org.eclipse.egit.target/egit-4.5.tpd b/org.eclipse.egit.target/egit-4.5.tpd
index 21d074503..e5aa16ba4 100644
--- a/org.eclipse.egit.target/egit-4.5.tpd
+++ b/org.eclipse.egit.target/egit-4.5.tpd
@@ -2,5 +2,5 @@ target "egit-4.5" with source configurePhase
include "projects/jetty-9.4.11.tpd"
include "projects/swtbot-snapshot.tpd"
-include "orbit/I20181102163257-2018-12.tpd"
+include "orbit/S20181120221132-2018-12.tpd"
include "releasetrain/4.5-mars.tpd"
diff --git a/org.eclipse.egit.target/egit-4.6.target b/org.eclipse.egit.target/egit-4.6.target
index 2b963fc9d..049529fff 100644
--- a/org.eclipse.egit.target/egit-4.6.target
+++ b/org.eclipse.egit.target/egit-4.6.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="egit-4.6" sequenceNumber="1542816978">
+<target name="egit-4.6" sequenceNumber="1542844244">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
@@ -40,8 +40,8 @@
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
- <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.ant" version="1.10.5.v20180808-0324"/>
+ <unit id="org.apache.ant.source" version="1.10.5.v20180808-0324"/>
<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
<unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/>
<unit id="org.apache.commons.compress" version="1.15.0.v20180119-1613"/>
@@ -91,7 +91,7 @@
<unit id="org.apache.sshd.core.source" version="2.0.0.v20181102-1323"/>
<unit id="org.apache.sshd.sftp" version="2.0.0.v20181102-1323"/>
<unit id="org.apache.sshd.sftp.source" version="2.0.0.v20181102-1323"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20181102163257/repository"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20181120221132/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
diff --git a/org.eclipse.egit.target/egit-4.6.tpd b/org.eclipse.egit.target/egit-4.6.tpd
index 2f1dfec04..40606b9f8 100644
--- a/org.eclipse.egit.target/egit-4.6.tpd
+++ b/org.eclipse.egit.target/egit-4.6.tpd
@@ -2,5 +2,5 @@ target "egit-4.6" with source configurePhase
include "projects/jetty-9.4.11.tpd"
include "projects/swtbot-snapshot.tpd"
-include "orbit/I20181102163257-2018-12.tpd"
+include "orbit/S20181120221132-2018-12.tpd"
include "releasetrain/4.6-neon.tpd"
diff --git a/org.eclipse.egit.target/egit-4.7.target b/org.eclipse.egit.target/egit-4.7.target
index c8094a6cc..b2ac1e66a 100644
--- a/org.eclipse.egit.target/egit-4.7.target
+++ b/org.eclipse.egit.target/egit-4.7.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="egit-4.7" sequenceNumber="1542816960">
+<target name="egit-4.7" sequenceNumber="1542844239">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
@@ -40,8 +40,8 @@
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
- <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.ant" version="1.10.5.v20180808-0324"/>
+ <unit id="org.apache.ant.source" version="1.10.5.v20180808-0324"/>
<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
<unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/>
<unit id="org.apache.commons.compress" version="1.15.0.v20180119-1613"/>
@@ -91,7 +91,7 @@
<unit id="org.apache.sshd.core.source" version="2.0.0.v20181102-1323"/>
<unit id="org.apache.sshd.sftp" version="2.0.0.v20181102-1323"/>
<unit id="org.apache.sshd.sftp.source" version="2.0.0.v20181102-1323"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20181102163257/repository"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20181120221132/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
diff --git a/org.eclipse.egit.target/egit-4.7.tpd b/org.eclipse.egit.target/egit-4.7.tpd
index f678d461d..9825a5d25 100644
--- a/org.eclipse.egit.target/egit-4.7.tpd
+++ b/org.eclipse.egit.target/egit-4.7.tpd
@@ -2,5 +2,5 @@ target "egit-4.7" with source configurePhase
include "projects/jetty-9.4.11.tpd"
include "projects/swtbot-snapshot.tpd"
-include "orbit/I20181102163257-2018-12.tpd"
+include "orbit/S20181120221132-2018-12.tpd"
include "releasetrain/4.7-oxygen.tpd"
diff --git a/org.eclipse.egit.target/egit-4.8.target b/org.eclipse.egit.target/egit-4.8.target
index fff7c29c0..02b4c5048 100644
--- a/org.eclipse.egit.target/egit-4.8.target
+++ b/org.eclipse.egit.target/egit-4.8.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="egit-4.8" sequenceNumber="1542816946">
+<target name="egit-4.8" sequenceNumber="1542844235">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
@@ -40,8 +40,8 @@
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
- <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.ant" version="1.10.5.v20180808-0324"/>
+ <unit id="org.apache.ant.source" version="1.10.5.v20180808-0324"/>
<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
<unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/>
<unit id="org.apache.commons.compress" version="1.15.0.v20180119-1613"/>
@@ -91,7 +91,7 @@
<unit id="org.apache.sshd.core.source" version="2.0.0.v20181102-1323"/>
<unit id="org.apache.sshd.sftp" version="2.0.0.v20181102-1323"/>
<unit id="org.apache.sshd.sftp.source" version="2.0.0.v20181102-1323"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20181102163257/repository"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20181120221132/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
diff --git a/org.eclipse.egit.target/egit-4.8.tpd b/org.eclipse.egit.target/egit-4.8.tpd
index 9fe24dbdc..a79479fc2 100644
--- a/org.eclipse.egit.target/egit-4.8.tpd
+++ b/org.eclipse.egit.target/egit-4.8.tpd
@@ -2,5 +2,5 @@ target "egit-4.8" with source configurePhase
include "projects/jetty-9.4.11.tpd"
include "projects/swtbot-snapshot.tpd"
-include "orbit/I20181102163257-2018-12.tpd"
+include "orbit/S20181120221132-2018-12.tpd"
include "releasetrain/4.8-photon.tpd"
diff --git a/org.eclipse.egit.target/egit-4.9.target b/org.eclipse.egit.target/egit-4.9.target
index bc7ede468..26759c815 100644
--- a/org.eclipse.egit.target/egit-4.9.target
+++ b/org.eclipse.egit.target/egit-4.9.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="egit-4.9" sequenceNumber="1542816930">
+<target name="egit-4.9" sequenceNumber="1542844230">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/>
@@ -40,8 +40,8 @@
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
- <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.ant" version="1.10.5.v20180808-0324"/>
+ <unit id="org.apache.ant.source" version="1.10.5.v20180808-0324"/>
<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
<unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/>
<unit id="org.apache.commons.compress" version="1.15.0.v20180119-1613"/>
@@ -91,7 +91,7 @@
<unit id="org.apache.sshd.core.source" version="2.0.0.v20181102-1323"/>
<unit id="org.apache.sshd.sftp" version="2.0.0.v20181102-1323"/>
<unit id="org.apache.sshd.sftp.source" version="2.0.0.v20181102-1323"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20181102163257/repository"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20181120221132/repository"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
diff --git a/org.eclipse.egit.target/egit-4.9.tpd b/org.eclipse.egit.target/egit-4.9.tpd
index 9a5691b0f..84732cbe4 100644
--- a/org.eclipse.egit.target/egit-4.9.tpd
+++ b/org.eclipse.egit.target/egit-4.9.tpd
@@ -2,5 +2,5 @@ target "egit-4.9" with source configurePhase
include "projects/jetty-9.4.11.tpd"
include "projects/swtbot-snapshot.tpd"
-include "orbit/I20181102163257-2018-12.tpd"
+include "orbit/S20181120221132-2018-12.tpd"
include "releasetrain/4.9-2018-09.tpd"
diff --git a/org.eclipse.egit.target/orbit/I20181102163257-2018-12.tpd b/org.eclipse.egit.target/orbit/S20181120221132-2018-12.tpd
index 87e513890..196432611 100644
--- a/org.eclipse.egit.target/orbit/I20181102163257-2018-12.tpd
+++ b/org.eclipse.egit.target/orbit/S20181120221132-2018-12.tpd
@@ -1,7 +1,7 @@
-target "I20181102163257-2018-12" with source configurePhase
+target "S20181120221132-2018-12" with source configurePhase
// see http://download.eclipse.org/tools/orbit/downloads/
-location "http://download.eclipse.org/tools/orbit/downloads/drops/I20181102163257/repository" {
+location "http://download.eclipse.org/tools/orbit/downloads/drops/S20181120221132/repository" {
com.google.gson [2.8.2.v20180104-1110,2.8.2.v20180104-1110]
com.google.gson.source [2.8.2.v20180104-1110,2.8.2.v20180104-1110]
com.jcraft.jsch [0.1.54.v20170116-1932,0.1.54.v20170116-1932]
@@ -13,8 +13,8 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/I2018110216325
javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800]
javax.xml.bind [2.2.0.v201105210648,2.2.0.v201105210648]
javax.xml.stream [1.0.1.v201004272200,1.0.1.v201004272200]
- 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.ant [1.10.5.v20180808-0324,1.10.5.v20180808-0324]
+ org.apache.ant.source [1.10.5.v20180808-0324,1.10.5.v20180808-0324]
org.apache.commons.codec [1.10.0.v20180409-1845,1.10.0.v20180409-1845]
org.apache.commons.codec.source [1.10.0.v20180409-1845,1.10.0.v20180409-1845]
org.apache.commons.compress [1.15.0.v20180119-1613,1.15.0.v20180119-1613]

Back to the top