Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2014-11-05 04:20:55 -0500
committerMatthias Sohn2014-11-07 10:47:31 -0500
commita52b69668a2c535ccd93466985a04d8bb2cbcc37 (patch)
treeddb919e71877cf3e41cedfc96c26f16d93437576
parent65a9fa77d6849a40aea35e116e17e0708b278873 (diff)
downloadegit-a52b69668a2c535ccd93466985a04d8bb2cbcc37.tar.gz
egit-a52b69668a2c535ccd93466985a04d8bb2cbcc37.tar.xz
egit-a52b69668a2c535ccd93466985a04d8bb2cbcc37.zip
Add target platform for Mars using Orbit S-build
updates: - jsch to 0.1.51 (CQ 8889) - ant to 1.9.4 (CQ 8890) CQ: 8889 CQ: 8890 Change-Id: I715add5cad3728fa8f865d9944c7dc82eba07d54 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.target/egit-4.5-staging.target (renamed from org.eclipse.egit.target/egit-4.4-staging.target)12
-rw-r--r--org.eclipse.egit.target/egit-4.5.target90
-rw-r--r--pom.xml22
3 files changed, 113 insertions, 11 deletions
diff --git a/org.eclipse.egit.target/egit-4.4-staging.target b/org.eclipse.egit.target/egit-4.5-staging.target
index e7e69d7fd..e08a13fe5 100644
--- a/org.eclipse.egit.target/egit-4.4-staging.target
+++ b/org.eclipse.egit.target/egit-4.5-staging.target
@@ -21,8 +21,8 @@
<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.14.v20131031/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <unit id="org.apache.ant.source" version="1.9.2.v201404171502"/>
- <unit id="org.apache.ant" version="1.9.2.v201404171502"/>
+ <unit id="org.apache.ant.source" version="1.9.4.v201410062020"/>
+ <unit id="org.apache.ant" version="1.9.4.v201410062020"/>
<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.log4j" version="1.2.15.v201012070815"/>
@@ -46,17 +46,17 @@
<unit id="org.objenesis.source" version="1.0.0.v201105211943"/>
<unit id="org.mockito" version="1.8.4.v201303031500"/>
<unit id="org.mockito.source" version="1.8.4.v201303031500"/>
- <unit id="com.jcraft.jsch" version="0.1.50.v201403120620"/>
- <unit id="com.jcraft.jsch.source" version="0.1.50.v201403120620"/>
+ <unit id="com.jcraft.jsch" version="0.1.51.v201410231640"/>
+ <unit id="com.jcraft.jsch.source" version="0.1.51.v201410231640"/>
<unit id="org.junit" version="4.11.0.v201303080030"/>
<unit id="org.junit.source" version="4.11.0.v201303080030"/>
<unit id="javax.servlet" version="2.5.0.v201103041518"/>
<unit id="javax.servlet.source" version="2.5.0.v201103041518"/>
<unit id="org.tukaani.xz" version="1.3.0.v201308270617"/>
<unit id="org.tukaani.xz.source" version="1.3.0.v201308270617"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20141023165154/repository/"/>
</location>
- <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.egit.target/egit-4.5.target b/org.eclipse.egit.target/egit-4.5.target
new file mode 100644
index 000000000..89d9c57da
--- /dev/null
+++ b/org.eclipse.egit.target/egit-4.5.target
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="egit-4.4.target" sequenceNumber="1">
+<locations>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+ <unit id="org.eclipse.jetty.client" version="7.6.14.v20131031"/>
+ <unit id="org.eclipse.jetty.client.source" version="7.6.14.v20131031"/>
+ <unit id="org.eclipse.jetty.continuation" version="7.6.14.v20131031"/>
+ <unit id="org.eclipse.jetty.continuation.source" version="7.6.14.v20131031"/>
+ <unit id="org.eclipse.jetty.http" version="7.6.14.v20131031"/>
+ <unit id="org.eclipse.jetty.http.source" version="7.6.14.v20131031"/>
+ <unit id="org.eclipse.jetty.io" version="7.6.14.v20131031"/>
+ <unit id="org.eclipse.jetty.io.source" version="7.6.14.v20131031"/>
+ <unit id="org.eclipse.jetty.security" version="7.6.14.v20131031"/>
+ <unit id="org.eclipse.jetty.security.source" version="7.6.14.v20131031"/>
+ <unit id="org.eclipse.jetty.server" version="7.6.14.v20131031"/>
+ <unit id="org.eclipse.jetty.server.source" version="7.6.14.v20131031"/>
+ <unit id="org.eclipse.jetty.servlet" version="7.6.14.v20131031"/>
+ <unit id="org.eclipse.jetty.servlet.source" version="7.6.14.v20131031"/>
+ <unit id="org.eclipse.jetty.util" version="7.6.14.v20131031"/>
+ <unit id="org.eclipse.jetty.util.source" version="7.6.14.v20131031"/>
+ <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.14.v20131031/"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+ <unit id="org.apache.ant.source" version="1.9.4.v201410062020"/>
+ <unit id="org.apache.ant" version="1.9.4.v201410062020"/>
+ <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.log4j" version="1.2.15.v201012070815"/>
+ <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
+ <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
+ <unit id="org.kohsuke.args4j.source" version="2.0.21.v201301150030"/>
+ <unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.core.source" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.generator" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.generator.source" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.integration" version="1.1.0.v201303031500"/>
+ <unit id="org.hamcrest.integration.source" version="1.1.0.v201303031500"/>
+ <unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.library.source" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
+ <unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
+ <unit id="javaewah" version="0.7.9.v201401101600"/>
+ <unit id="javaewah.source" version="0.7.9.v201401101600"/>
+ <unit id="org.objenesis" version="1.0.0.v201105211943"/>
+ <unit id="org.objenesis.source" version="1.0.0.v201105211943"/>
+ <unit id="org.mockito" version="1.8.4.v201303031500"/>
+ <unit id="org.mockito.source" version="1.8.4.v201303031500"/>
+ <unit id="com.jcraft.jsch" version="0.1.51.v201410231640"/>
+ <unit id="com.jcraft.jsch.source" version="0.1.51.v201410231640"/>
+ <unit id="org.junit" version="4.11.0.v201303080030"/>
+ <unit id="org.junit.source" version="4.11.0.v201303080030"/>
+ <unit id="javax.servlet" version="2.5.0.v201103041518"/>
+ <unit id="javax.servlet.source" version="2.5.0.v201103041518"/>
+ <unit id="org.tukaani.xz" version="1.3.0.v201308270617"/>
+ <unit id="org.tukaani.xz.source" version="1.3.0.v201308270617"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20141023165154/repository/"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+ <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/technology/swtbot/releases/2.1.0/"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+ <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.mylyn.team_feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.mylyn.context.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.mylyn_feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.mylyn.context_feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.mylyn.sdk_feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="0.0.0"/>
+ <repository location="http://download.eclipse.org/releases/mars/"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+ <repository location="http://download.eclipse.org/mylyn/releases/latest"/>
+ <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.mylyn.team_feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.mylyn.context.sdk.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.mylyn_feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.mylyn.context_feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.mylyn.sdk_feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="0.0.0"/>
+ </location>
+</locations>
+</target>
diff --git a/pom.xml b/pom.xml
index 51cec0996..55df1ca83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,7 +93,6 @@
<profile>
<id>platform-kepler</id>
<activation>
- <activeByDefault>true</activeByDefault>
<property>
<name>platform-version-name</name>
<value>kepler</value>
@@ -107,6 +106,7 @@
<profile>
<id>platform-luna</id>
<activation>
+ <activeByDefault>true</activeByDefault>
<property>
<name>platform-version-name</name>
<value>luna</value>
@@ -118,15 +118,28 @@
</properties>
</profile>
<profile>
- <id>platform-luna-staging</id>
+ <id>platform-mars</id>
<activation>
<property>
<name>platform-version-name</name>
- <value>luna-staging</value>
+ <value>mars</value>
</property>
</activation>
<properties>
- <target-platform>egit-4.4-staging</target-platform>
+ <target-platform>egit-4.5</target-platform>
+ <platform-version>[3.10,4.0)</platform-version>
+ </properties>
+ </profile>
+ <profile>
+ <id>platform-mars-staging</id>
+ <activation>
+ <property>
+ <name>platform-version-name</name>
+ <value>mars-staging</value>
+ </property>
+ </activation>
+ <properties>
+ <target-platform>egit-4.5-staging</target-platform>
<platform-version>[3.10,4.0)</platform-version>
</properties>
</profile>
@@ -536,4 +549,3 @@
</snapshotRepository>
</distributionManagement>
</project>
-

Back to the top