Skip to content

Commit

Permalink
Update the target platform
Browse files Browse the repository at this point in the history 
Use Orbit m1.
Use EMF m1.
Update batik to 1.17.0.
Update lucene to 9.9.1.
Update to Jetty 12.0.5.
Update jna to 5.14.0.
Update icu4j to 74.2.
Update jsoup to 1.17.2.
Update slf4j to 2.0.10.
Update assertj to 3.25.0.
  • Loading branch information
@merks
merks committed Jan 2, 2024
1 parent 17906cb commit ade1f6f
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 83 deletions.
171 changes: 88 additions & 83 deletions eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
<unit id="org.apache.ant" version="1.10.14.v20230922-1200"/>
<unit id="org.apache.ant.source" version="1.10.14.v20230922-1200"/>

<unit id="org.apache.batik.css" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.util" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.i18n" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.constants" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.css.source" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.util.source" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.i18n.source" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.constants.source" version="1.17.0.v20231009-1000"/>
<unit id="org.apache.batik.css" version="1.17.0.v20231215-1130"/>
<unit id="org.apache.batik.util" version="1.17.0.v20231215-1130"/>
<unit id="org.apache.batik.i18n" version="1.17.0.v20231215-1130"/>
<unit id="org.apache.batik.constants" version="1.17.0.v20231215-1130"/>
<unit id="org.apache.batik.css.source" version="1.17.0.v20231215-1130"/>
<unit id="org.apache.batik.util.source" version="1.17.0.v20231215-1130"/>
<unit id="org.apache.batik.i18n.source" version="1.17.0.v20231215-1130"/>
<unit id="org.apache.batik.constants.source" version="1.17.0.v20231215-1130"/>

<unit id="org.apache.xmlgraphics" version="2.9.0.v20230916-1600"/>
<unit id="org.apache.xmlgraphics.source" version="2.9.0.v20230916-1600"/>
Expand All @@ -26,12 +26,12 @@
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
<unit id="org.junit.source" version="4.13.2.v20230809-1000"/>

<unit id="org.apache.lucene.core" version="9.8.0.v20230929-1030"/>
<unit id="org.apache.lucene.analysis-smartcn" version="9.8.0.v20230929-1030"/>
<unit id="org.apache.lucene.analysis-common" version="9.8.0.v20230929-1030"/>
<unit id="org.apache.lucene.core.source" version="9.8.0.v20230929-1030"/>
<unit id="org.apache.lucene.analysis-smartcn.source" version="9.8.0.v20230929-1030"/>
<unit id="org.apache.lucene.analysis-common.source" version="9.8.0.v20230929-1030"/>
<unit id="org.apache.lucene.core" version="9.9.1.v20231217-0900"/>
<unit id="org.apache.lucene.analysis-smartcn" version="9.9.1.v20231217-0900"/>
<unit id="org.apache.lucene.analysis-common" version="9.9.1.v20231217-0900"/>
<unit id="org.apache.lucene.core.source" version="9.9.1.v20231217-0900"/>
<unit id="org.apache.lucene.analysis-smartcn.source" version="9.9.1.v20231217-0900"/>
<unit id="org.apache.lucene.analysis-common.source" version="9.9.1.v20231217-0900"/>

<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.hamcrest.core.source" version="2.2.0.v20230809-1000"/>
Expand All @@ -41,32 +41,32 @@
<unit id="org.jdom.source" version="1.1.3.v20230812-1600"/>

<!-- This version contains with notarized *.jnilib -->
<unit id="com.sun.jna" version="5.13.0.v20230812-1000"/>
<unit id="com.sun.jna" version="5.14.0.v20231211-1200"/>

<!-- Batik dependnecies -->
<!-- Batik dependencies -->
<unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/>
<unit id="org.eclipse.orbit.xml-apis-ext.source" version="1.0.0.v20230923-0644"/>

<!-- This is the "normal" Orbit repository.
This is the repo that is expected to be updated on milestones and releases based on Orbit deliveries. -->
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/S202401021059"/>
</location>

<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
<!-- Check version in "<EMF>/features" directory -->
<unit id="org.eclipse.emf.common.feature.group" version="2.30.0.v20230916-0637"/>
<unit id="org.eclipse.emf.common.source.feature.group" version="2.30.0.v20230916-0637"/>
<unit id="org.eclipse.emf.ecore.feature.group" version="2.36.0.v20231002-1156"/>
<unit id="org.eclipse.emf.ecore.source.feature.group" version="2.36.0.v20231002-1156"/>
<unit id="org.eclipse.emf.common.feature.group" version="2.31.0.v20231210-0956"/>
<unit id="org.eclipse.emf.common.source.feature.group" version="2.31.0.v20231210-0956"/>
<unit id="org.eclipse.emf.ecore.feature.group" version="2.37.0.v20231210-0956"/>
<unit id="org.eclipse.emf.ecore.source.feature.group" version="2.37.0.v20231210-0956"/>
<!-- For org.eclipse.ui.tools, and PDE's spy dependencies as of Eclipse 4.22 -->
<!-- Check version in "<EMF>/features" directory -->
<unit id="org.eclipse.emf.edit.feature.group" version="2.21.0.v20231107-0612"/>
<unit id="org.eclipse.emf.edit.source.feature.group" version="2.21.0.v20231107-0612"/>
<unit id="org.eclipse.emf.databinding.feature.group" version="1.10.0.v20230211-1150"/>
<unit id="org.eclipse.emf.databinding.source.feature.group" version="1.10.0.v20230211-1150"/>
<unit id="org.eclipse.emf.databinding.edit.feature.group" version="1.10.0.v20230211-1150"/>
<unit id="org.eclipse.emf.databinding.edit.source.feature.group" version="1.10.0.v20230211-1150"/>
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.36.0"/>
<unit id="org.eclipse.emf.edit.feature.group" version="2.22.0.v20231208-1346"/>
<unit id="org.eclipse.emf.edit.source.feature.group" version="2.22.0.v20231208-1346"/>
<unit id="org.eclipse.emf.databinding.feature.group" version="1.11.0.v20231208-1346"/>
<unit id="org.eclipse.emf.databinding.source.feature.group" version="1.11.0.v20231208-1346"/>
<unit id="org.eclipse.emf.databinding.edit.feature.group" version="1.11.0.v20231208-1346"/>
<unit id="org.eclipse.emf.databinding.edit.source.feature.group" version="1.11.0.v20231208-1346"/>
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202401020820"/>
</location>

<location includeAllPlatforms="true" includeMode="slicer" type="InstallableUnit">
Expand Down Expand Up @@ -106,7 +106,7 @@
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>74.1</version>
<version>74.2</version>
<type>jar</type>
</dependency>
<dependency>
Expand Down Expand Up @@ -136,7 +136,7 @@
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
<version>5.13.0</version>
<version>5.14.0</version>
<type>jar</type>
</dependency>
<dependency>
Expand Down Expand Up @@ -172,7 +172,7 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.17.1</version>
<version>1.17.2</version>
<type>jar</type>
</dependency>
<dependency>
Expand All @@ -190,13 +190,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.9</version>
<version>2.0.10</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.9</version>
<version>2.0.10</version>
<type>jar</type>
</dependency>
<dependency>
Expand Down Expand Up @@ -228,74 +228,74 @@
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<version>4.0.6</version>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-apache-jsp</artifactId>
<version>12.0.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-nested</artifactId>
<version>12.0.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-security</artifactId>
<version>12.0.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-servlet</artifactId>
<version>12.0.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>12.0.5</version>
<groupId>org.eclipse.jetty.toolchain</groupId>
<artifactId>jetty-servlet-api</artifactId>
<version>4.0.6</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-session</artifactId>
<artifactId>jetty-http</artifactId>
<version>12.0.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
<artifactId>jetty-io</artifactId>
<version>12.0.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<artifactId>jetty-security</artifactId>
<version>12.0.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-apache-jsp</artifactId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>12.0.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-nested</artifactId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-session</artifactId>
<version>12.0.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-security</artifactId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
<version>12.0.5</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee8</groupId>
<artifactId>jetty-ee8-servlet</artifactId>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<version>12.0.5</version>
<type>jar</type>
</dependency>
Expand All @@ -307,13 +307,13 @@
</dependency>
<dependency>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-jsp</artifactId>
<artifactId>apache-el</artifactId>
<version>9.0.83.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-el</artifactId>
<artifactId>apache-jsp</artifactId>
<version>9.0.83.1</version>
<type>jar</type>
</dependency>
Expand All @@ -336,7 +336,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.24.2</version>
<version>3.25.0</version>
<type>jar</type>
</dependency>
<dependency>
Expand Down Expand Up @@ -568,20 +568,23 @@
<type>jar</type>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.resolve</artifactId>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>org.bndtools</groupId>
<artifactId>org.bndtools.templating</artifactId>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>org.bndtools</groupId>
<artifactId>org.bndtools.templates.template</artifactId>
<version>7.0.0</version>
</dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.resolve</artifactId>
<version>7.0.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bndtools</groupId>
<artifactId>org.bndtools.templates.template</artifactId>
<version>7.0.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bndtools</groupId>
<artifactId>org.bndtools.templating</artifactId>
<version>7.0.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Apache Felix" missingManifest="error" type="Maven">
Expand Down Expand Up @@ -722,8 +725,14 @@
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="none" includeSource="true" label="Jakarta EE" missingManifest="error" type="Maven">
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Jakarta EE" missingManifest="error" type="Maven">
<dependencies>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>2.1.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
Expand All @@ -749,15 +758,11 @@
<type>jar</type>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.1</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>2.1.2</version>
</dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.1</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
Expand Down
1 change: 1 addition & 0 deletions eclipse.platform.releng/features/org.eclipse.test-feature/forceQualifierUpdate.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,4 @@ Update Mockito to 5.7.0
Update org.junit.platform 1.10.1 and org.junit.vintage 5.10.1 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/1512
Update Mockito to 5.8.0 and bytebuddy to 1.14.10
Update bytebuddy to 1.14.11
Update assertj-core to 3.25.0.

0 comments on commit ade1f6f

Please sign in to comment.