diff options
-rw-r--r-- | eclipse-platform-parent/pom.xml | 12 | ||||
-rw-r--r-- | eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target | 52 |
2 files changed, 41 insertions, 23 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index 1a006338e..5a175c8bd 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -136,6 +136,8 @@ <eclipse-repo.url>https://repo.eclipse.org/content/repositories/cbi/</eclipse-repo.url> <cbi-snapshots-repo.url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</cbi-snapshots-repo.url> + <cbi-releases-repo.url>https://repo.eclipse.org/content/repositories/cbi-releases/</cbi-releases-repo.url> + <!-- This eclipse-p2-repo.url is specifically for the build-individual-bundles profile. @@ -206,6 +208,16 @@ </snapshots> </pluginRepository> <pluginRepository> + <id>cbi-releases</id> + <url>${cbi-releases-repo.url}</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + <pluginRepository> <id>eclipse</id> <url>${eclipse-repo.url}</url> <releases> diff --git a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target index 6a11a0589..608985899 100644 --- a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target +++ b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target @@ -99,10 +99,8 @@ <unit id="org.apache.commons.jxpath" version="1.3.0.v200911051830"/> <unit id="org.apache.commons.jxpath.source" version="1.3.0.v200911051830"/> - <unit id="org.apache.commons.fileupload" version="1.3.2.v20170320-2229" /> - <unit id="org.apache.commons.fileupload.source" version="1.3.2.v20170320-2229" /> - <unit id="org.apache.commons.io" version="2.2.0.v201405211200" /> - <unit id="org.apache.commons.io.source" version="2.2.0.v201405211200" /> + <unit id="org.apache.commons.fileupload" version="1.3.2.v20170320-2229"/> + <unit id="org.apache.commons.fileupload.source" version="1.3.2.v20170320-2229"/> <unit id="org.apache.lucene.core" version="6.1.0.v20170814-1820"/> <unit id="org.apache.lucene.analyzers-smartcn" version="6.1.0.v20161115-1612"/> @@ -161,27 +159,35 @@ <repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.13/base/R201706090707/"/> </location> + <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit"> + <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/> + <unit id="org.apache.commons.io.source" version="2.8.0.v20210415-0900"/> + <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository/"/> + </location> + <!-- NOTE: there is a variable in our parent pom, "jetty-version" that signifies what to use when building the help system. It should be updated when ever this pre-req is updated. --> <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit"> - <unit id="org.eclipse.jetty.continuation" version="9.4.11.v20180605"/> - <unit id="org.eclipse.jetty.continuation.source" version="9.4.11.v20180605"/> - <unit id="org.eclipse.jetty.http" version="9.4.11.v20180605"/> - <unit id="org.eclipse.jetty.http.source" version="9.4.11.v20180605"/> - <unit id="org.eclipse.jetty.io" version="9.4.11.v20180605"/> - <unit id="org.eclipse.jetty.io.source" version="9.4.11.v20180605"/> - <unit id="org.eclipse.jetty.security" version="9.4.11.v20180605"/> - <unit id="org.eclipse.jetty.security.source" version="9.4.11.v20180605"/> - <unit id="org.eclipse.jetty.server" version="9.4.11.v20180605"/> - <unit id="org.eclipse.jetty.server.source" version="9.4.11.v20180605"/> - <unit id="org.eclipse.jetty.servlet" version="9.4.11.v20180605"/> - <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/> - <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/> - <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/> - <repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605/" /> + <unit id="org.eclipse.jetty.continuation" version="9.4.43.v20210629"/> + <unit id="org.eclipse.jetty.continuation.source" version="9.4.43.v20210629"/> + <unit id="org.eclipse.jetty.http" version="9.4.43.v20210629"/> + <unit id="org.eclipse.jetty.http.source" version="9.4.43.v20210629"/> + <unit id="org.eclipse.jetty.io" version="9.4.43.v20210629"/> + <unit id="org.eclipse.jetty.io.source" version="9.4.43.v20210629"/> + <unit id="org.eclipse.jetty.security" version="9.4.43.v20210629"/> + <unit id="org.eclipse.jetty.security.source" version="9.4.43.v20210629"/> + <unit id="org.eclipse.jetty.server" version="9.4.43.v20210629"/> + <unit id="org.eclipse.jetty.server.source" version="9.4.43.v20210629"/> + <unit id="org.eclipse.jetty.servlet" version="9.4.43.v20210629"/> + <unit id="org.eclipse.jetty.servlet.source" version="9.4.43.v20210629"/> + <unit id="org.eclipse.jetty.util" version="9.4.43.v20210629"/> + <unit id="org.eclipse.jetty.util.source" version="9.4.43.v20210629"/> + <unit id="org.eclipse.jetty.util.ajax" version="9.4.43.v20210629"/> + <unit id="org.eclipse.jetty.util.ajax.source" version="9.4.43.v20210629"/> + <repository location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.43.v20210629/"/> </location> <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit"> @@ -214,10 +220,10 @@ <!-- For org.eclipse.ui.tools --> <location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit"> - <unit id="org.eclipse.emf.edit" version="2.12.0.v20170504-0807"/> - <unit id="org.eclipse.emf.databinding" version="1.3.0.v20170504-0807"/> - <unit id="org.eclipse.emf.databinding.edit" version="1.3.0.v20170504-0807"/> - <repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.13milestones/core/S201705040807" /> + <unit id="org.eclipse.emf.edit" version="2.12.0.v20170609-0928"/> + <unit id="org.eclipse.emf.databinding" version="1.3.0.v20170609-0928"/> + <unit id="org.eclipse.emf.databinding.edit" version="1.3.0.v20170609-0928"/> + <repository location="https://download.eclipse.org/modeling/emf/emf/updates/2.13/core/R201706090928/" /> </location> <!-- uncomment 'eclipse_home' location, with text editor, for use in Eclipse IDE |