Skip to content

Commit

Permalink
[Releng] Work around USSSDK's strict Jetty range.
Browse files Browse the repository at this point in the history
  • Loading branch information
merks committed Mar 29, 2021
1 parent 3394227 commit 3889000
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
Expand Up @@ -12,7 +12,7 @@
<feature
id="org.eclipse.oomph.setup.installer"
label="%featureName"
version="1.20.0.qualifier"
version="1.21.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.oomph.license"
license-feature-version="0.0.0">
Expand Down
2 changes: 1 addition & 1 deletion features/org.eclipse.oomph.setup.installer-feature/pom.xml
Expand Up @@ -22,7 +22,7 @@ Eike Stepper - initial API and implementation

<groupId>org.eclipse.oomph.features</groupId>
<artifactId>org.eclipse.oomph.setup.installer</artifactId>
<version>1.20.0-SNAPSHOT</version>
<version>1.21.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>

<build>
Expand Down
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Eclipse Installer" uid="org.eclipse.oomph.setup.installer.product" id="org.eclipse.oomph.setup.installer.product" application="org.eclipse.oomph.setup.installer.application" version="1.20.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Eclipse Installer" uid="org.eclipse.oomph.setup.installer.product" id="org.eclipse.oomph.setup.installer.product" application="org.eclipse.oomph.setup.installer.application" version="1.21.0.qualifier" useFeatures="true" includeLaunchers="true">

<configIni use="">
</configIni>
Expand Down
2 changes: 1 addition & 1 deletion products/org.eclipse.oomph.setup.installer.product/pom.xml
Expand Up @@ -15,7 +15,7 @@

<groupId>org.eclipse.oomph</groupId>
<artifactId>org.eclipse.oomph.setup.installer.product</artifactId>
<version>1.20.0-SNAPSHOT</version>
<version>1.21.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>

<parent>
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="Generated from Oomph" sequenceNumber="70">
<target name="Generated from Oomph" sequenceNumber="71">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="javaewah" version="0.0.0"/>
Expand All @@ -13,6 +13,8 @@
<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jetty.security" version="0.0.0"/>
<unit id="org.eclipse.jetty.util.ajax" version="0.0.0"/>
<unit id="org.eclipse.justj.openjdk.hotspot.jre.minimal.stripped.feature.group" version="0.0.0"/>
<unit id="org.eclipse.m2e.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.mylyn.builds.sdk.feature.group" version="0.0.0"/>
Expand All @@ -23,9 +25,10 @@
<unit id="org.eclipse.swtbot.generator" version="0.0.0"/>
<unit id="org.eclipse.userstorage.oauth" version="0.0.0"/>
<unit id="org.eclipse.userstorage.tests" version="0.0.0"/>
<unit id="org.json" version="0.0.0"/>
<unit id="org.slf4j.api" version="0.0.0"/>
<unit id="slf4j.api" version="0.0.0"/>
<repository location="http://download.eclipse.org/usssdk/updates/latest"/>
<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.37.v20210219"/>
<repository location="http://download.eclipse.org/egit/updates"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R"/>
<repository location="http://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/>
Expand All @@ -36,7 +39,7 @@
<repository location="http://download.eclipse.org/technology/swtbot/snapshots"/>
<repository location="http://download.eclipse.org/webtools/repository/latest"/>
<repository location="http://download.eclipse.org/justj/jres/15/updates/release/15.0.2"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.19/R-4.19-202103031800"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.20-I-builds"/>
</location>
</locations>
</target>

0 comments on commit 3889000

Please sign in to comment.