Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2013-11-22 04:23:08 +0000
committerDavid Williams2013-11-22 04:23:08 +0000
commita70f767b51f15d9c5396391562af970d88846755 (patch)
tree68761b4bea756c7a5a14515326e9ba565cf4ea9c
parent28f3edb6e57a6e82e39821c1efa553e7f64e285c (diff)
downloadeclipse.platform.releng.aggregator-a70f767b51f15d9c5396391562af970d88846755.tar.gz
eclipse.platform.releng.aggregator-a70f767b51f15d9c5396391562af970d88846755.tar.xz
eclipse.platform.releng.aggregator-a70f767b51f15d9c5396391562af970d88846755.zip
Bug 400518 - [CBI] CBI build pulls in "latest" version of 3rd party
bundles from Orbit second version to match what was in "released" version of 4.2.2. (Once that's confirmed, we'll update to new version of jsch).
-rw-r--r--eclipse-platform-parent/pom.xml14
-rw-r--r--eclipse.platform.releng.prereqs.sdk/.gitignore5
-rw-r--r--eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target84
-rw-r--r--eclipse.platform.releng.prereqs.sdk/pom.xml19
-rw-r--r--pom.xml4
5 files changed, 119 insertions, 7 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index e861501a7..53322137b 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -23,7 +23,7 @@
<comparator.repo>http://download.eclipse.org/eclipse/updates/4.2-M-builds</comparator.repo>
<tycho.version>0.17.0</tycho.version>
<tycho-extras.version>0.17.0</tycho-extras.version>
- <orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/</orbit-repo.url>
+
<jetty-repo.url>http://www.eclipse.org/external/jetty/updates/jetty-bundles-8.x/8.1.3.v20120522/</jetty-repo.url>
<ecf-repo.url>http://archive.eclipse.org/rt/ecf/3.5.6/site.p2</ecf-repo.url>
<emf-repo.url>http://download.eclipse.org/modeling/emf/emf/updates/2.8.x/</emf-repo.url>
@@ -39,11 +39,6 @@
</properties>
<repositories>
<repository>
- <id>orbit</id>
- <url>${orbit-repo.url}</url>
- <layout>p2</layout>
- </repository>
- <repository>
<id>ecf</id>
<url>${ecf-repo.url}</url>
<layout>p2</layout>
@@ -149,6 +144,13 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<configuration>
+ <target>
+ <artifact>
+ <groupId>org.eclipse</groupId>
+ <artifactId>eclipse-sdk-prereqs</artifactId>
+ <version>4.2.2-SNAPSHOT</version>
+ </artifact>
+ </target>
<environments>
<environment>
<os>linux</os>
diff --git a/eclipse.platform.releng.prereqs.sdk/.gitignore b/eclipse.platform.releng.prereqs.sdk/.gitignore
new file mode 100644
index 000000000..bc9597050
--- /dev/null
+++ b/eclipse.platform.releng.prereqs.sdk/.gitignore
@@ -0,0 +1,5 @@
+/target
+/.settings
+/.classpath
+/.project
+/workspace \ No newline at end of file
diff --git a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
new file mode 100644
index 000000000..bf87fea37
--- /dev/null
+++ b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?><?pde version="3.8"?><target name="eclipse-sdk-prereqs" sequenceNumber="17">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
+<unit id="com.ibm.icu" version="4.4.2.v20110823"/>
+<unit id="com.ibm.icu.source" version="4.4.2.v20110823"/>
+<unit id="com.ibm.icu.base" version="4.4.2.v20110831"/>
+<unit id="com.ibm.icu.base.source" version="4.4.2.v20110831"/>
+<unit id="com.jcraft.jsch" version="0.1.46.v201205102330"/>
+<unit id="com.jcraft.jsch.source" version="0.1.46.v201205102330"/>
+<unit id="com.sun.el" version="2.2.0.v201108011116"/>
+<unit id="com.sun.el.source" version="2.2.0.v201108011116"/>
+<unit id="javax.annotation" version="1.0.0.v20101115-0725"/>
+<unit id="javax.annotation" version="1.1.0.v201108011116"/>
+<unit id="javax.el" version="2.2.0.v201108011116"/>
+<unit id="javax.el.source" version="2.2.0.v201108011116"/>
+<unit id="javax.inject" version="1.0.0.v20091030"/>
+<unit id="javax.servlet" version="3.0.0.v201112011016"/>
+<unit id="javax.servlet.jsp" version="2.2.0.v201112011158"/>
+<unit id="javax.servlet.jsp.source" version="2.2.0.v201112011158"/>
+<unit id="javax.servlet.source" version="3.0.0.v201112011016"/>
+<unit id="javax.xml" version="1.3.4.v201005080400"/>
+<unit id="org.apache.ant" version="1.8.3.v201301120609"/>
+<unit id="org.apache.ant.source" version="1.8.3.v201301120609"/>
+<unit id="org.apache.batik.css" version="1.6.0.v201011041432"/>
+<unit id="org.apache.batik.css" version="1.7.0.v201011041433"/>
+<unit id="org.apache.batik.util" version="1.6.0.v201011041432"/>
+<unit id="org.apache.batik.util" version="1.7.0.v201011041433"/>
+<unit id="org.apache.batik.util.gui" version="1.6.0.v201011041432"/>
+<unit id="org.apache.batik.util.gui" version="1.7.0.v200903091627"/>
+<unit id="org.apache.commons.codec" version="1.3.0.v201101211617"/>
+<unit id="org.apache.commons.codec.source" version="1.3.0.v201101211617"/>
+<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+<unit id="org.apache.commons.httpclient.source" version="3.1.0.v201012070820"/>
+<unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
+<unit id="org.apache.commons.logging.source" version="1.1.1.v201101211721"/>
+<unit id="org.apache.felix.gogo.command" version="0.8.0.v201108120515"/>
+<unit id="org.apache.felix.gogo.command.source" version="0.8.0.v201108120515"/>
+<unit id="org.apache.felix.gogo.runtime" version="0.8.0.v201108120515"/>
+<unit id="org.apache.felix.gogo.runtime.source" version="0.8.0.v201108120515"/>
+<unit id="org.apache.felix.gogo.shell" version="0.8.0.v201110170705"/>
+<unit id="org.apache.felix.gogo.shell.source" version="0.8.0.v201110170705"/>
+<unit id="org.apache.jasper.glassfish" version="2.2.2.v201205150955"/>
+<unit id="org.apache.jasper.glassfish.source" version="2.2.2.v201205150955"/>
+<unit id="org.apache.lucene" version="3.5.0.v20120319-2345"/>
+<unit id="org.apache.lucene.analysis" version="3.5.0.v20120319-2345"/>
+<unit id="org.apache.lucene.analysis.source" version="3.5.0.v20120319-2345"/>
+<unit id="org.apache.lucene.core" version="3.5.0.v20120319-2345"/>
+<unit id="org.apache.lucene.core.source" version="3.5.0.v20120319-2345"/>
+<unit id="org.apache.lucene.source" version="3.5.0.v20120319-2345"/>
+<unit id="org.apache.lucene.misc" version="3.5.0.v20120319-2345"/>
+<unit id="org.apache.lucene.analysis" version="3.5.0.v20120319-2345"/>
+<unit id="org.apache.lucene.queries" version="3.5.0.v20120319-2345"/>
+<unit id="org.apache.mina.core" version="2.0.2.v201108120515"/>
+<unit id="org.apache.mina.core.source" version="2.0.2.v201108120515"/>
+<unit id="org.apache.sshd.core" version="0.5.0.v201108120515"/>
+<unit id="org.apache.sshd.core.source" version="0.5.0.v201108120515"/>
+<unit id="org.easymock" version="2.4.0.v20090202-0900"/>
+<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
+<unit id="org.hamcrest.core.source" version="1.1.0.v20090501071000"/>
+<unit id="org.junit" version="3.8.2.v3_8_2_v20100427-1100"/>
+<unit id="org.junit" version="4.10.0.v4_10_0_v20120426-0900"/>
+<unit id="org.junit.source" version="3.8.2.v3_8_2_v20100427-1100"/>
+<unit id="org.junit.source" version="4.10.0.v4_10_0_v20120426-0900"/>
+<unit id="org.objectweb.asm" version="3.3.1.v201105211655"/>
+<unit id="org.objectweb.asm.source" version="3.3.1.v201105211655"/>
+<unit id="org.sat4j.core" version="2.3.0.v20110329"/>
+<unit id="org.sat4j.pb" version="2.3.0.v20110329"/>
+<unit id="org.slf4j.api" version="1.6.4.v20120130-2120"/>
+<unit id="org.w3c.css.sac" version="1.3.1.v200903091627"/>
+<unit id="org.w3c.dom.smil" version="1.0.0.v200806040011"/>
+<unit id="org.w3c.dom.smil" version="1.0.1.v200903091627"/>
+<unit id="org.w3c.dom.svg" version="1.1.0.v201011041433"/>
+<unit id="org.w3c.dom.events" version="3.0.0.draft20060413_v201105210656"/>
+<unit id="org.apache.commons.jxpath" version="1.3.0.v200911051830"/>
+<unit id="org.apache.lucene" version="2.9.1.v201101211721"/>
+<unit id="org.apache.lucene.analysis" version="2.9.1.v201101211721"/>
+<unit id="org.apache.lucene.core" version="2.9.1.v201101211721"/>
+<unit id="javax.servlet" version="2.5.0.v201103041518"/>
+<unit id="org.apache.commons.logging" version="1.0.4.v201101211617"/>
+<unit id="org.apache.commons.logging.source" version="1.0.4.v201101211617"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/"/>
+</location>
+</locations>
+</target> \ No newline at end of file
diff --git a/eclipse.platform.releng.prereqs.sdk/pom.xml b/eclipse.platform.releng.prereqs.sdk/pom.xml
new file mode 100644
index 000000000..6c12db6f4
--- /dev/null
+++ b/eclipse.platform.releng.prereqs.sdk/pom.xml
@@ -0,0 +1,19 @@
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.eclipse</groupId>
+ <artifactId>eclipse-sdk-prereqs</artifactId>
+ <version>4.2.2-SNAPSHOT</version>
+ <packaging>eclipse-target-definition</packaging>
+ <name>eclipse-sdk-prereqs</name>
+
+ <parent>
+ <groupId>org.eclipse</groupId>
+ <artifactId>eclipse-platform-parent</artifactId>
+ <version>4.2.2-SNAPSHOT</version>
+ <relativePath>../eclipse-platform-parent</relativePath>
+ </parent>
+
+</project> \ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4cc7affb7..6e637ea6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,9 @@
<modules>
<module>eclipse-platform-parent</module>
-
+
+ <module>eclipse.platform.releng.prereqs.sdk</module>
+
<module>eclipse.jdt/</module>
<module>eclipse.jdt.core</module>
<module>eclipse.jdt.core.binaries</module>

Back to the top