Skip to content

Commit f6b8dc3

Browse files
committed
Switch to build against Eclipse 4.25
Also removed old 4.23 target.
1 parent b8789ca commit f6b8dc3

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<mirror-docker-repo-name>updates-docker-nightly</mirror-docker-repo-name>
5353
<mirror-mylyn-repo-name>updates-mylyn-nightly</mirror-mylyn-repo-name>
5454
<tycho-version>2.7.3</tycho-version>
55-
<target-platform>linuxtools-e4.24</target-platform>
55+
<target-platform>linuxtools-e4.25</target-platform>
5656
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
5757
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
5858
<sonar.jacoco.reportPath>${project.basedir}/../../target/jacoco.exec</sonar.jacoco.reportPath>

releng/org.eclipse.linuxtools.target/linuxtools-e4.23.target renamed to releng/org.eclipse.linuxtools.target/linuxtools-e4.25.target

+28-28
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde version="3.8"?>
3-
<target name="linuxtools-e4.23" sequenceNumber="2">
3+
<target name="linuxtools-e4.25" sequenceNumber="1">
44
<locations>
55
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
6-
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.12.1.v20210128-1726"/>
7-
<unit id="com.fasterxml.jackson.core.jackson-core" version="2.12.1.v20210128-1726"/>
8-
<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.12.1.v20210128-1726"/>
9-
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.12.1.v20210128-1726"/>
10-
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.12.1.v20210128-1726"/>
11-
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.12.1.v20210128-1726"/>
6+
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.13.2.v20220426-1653"/>
7+
<unit id="com.fasterxml.jackson.core.jackson-core" version="2.13.2.v20220426-1653"/>
8+
<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.13.2.v20220426-1653"/>
9+
<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="2.13.2.v20220426-1653"/>
10+
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="2.13.2.v20220426-1653"/>
11+
<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" version="2.13.2.v20220426-1653"/>
1212
<unit id="com.github.jnr.constants" version="0.9.15.v20200501-1917"/>
1313
<unit id="com.github.jnr.enxio" version="0.25.0.v20200501-1917"/>
1414
<unit id="com.github.jnr.ffi" version="2.1.12.v20200513-1859"/>
@@ -20,23 +20,12 @@
2020
<unit id="com.google.guava" version="30.1.0.v20210127-2300"/>
2121
<unit id="org.mandas.docker-client" version="3.2.1.v20200519-1937"/>
2222
<unit id="org.mandas.docker-client.source" version="3.2.1.v20200519-1937"/>
23-
<unit id="javassist" version="3.13.0.GA_v201209210905"/>
2423
<unit id="javax.ws.rs" version="2.1.6.v20200505-2127"/>
2524
<unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/>
26-
<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
2725
<unit id="com.github.jnr.x86asm" version="1.0.2.v20200501-1917"/>
28-
<unit id="org.aopalliance" version="1.0.0.v201105210816"/>
2926
<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
3027
<unit id="org.apache.commons.compress" version="1.21.0.v20211103-2100"/>
31-
<unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
32-
<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
33-
<unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
34-
<unit id="org.apache.httpcomponents.httpcore" version="4.4.14.v20210128-2225"/>
3528
<unit id="org.apache.xerces" version="2.12.2.v20220131-0835"/>
36-
<unit id="org.assertj" version="3.20.2.v20210706-1104"/>
37-
<unit id="org.bouncycastle.bcpkix" version="1.70.0.v20220105-1522"/>
38-
<unit id="org.bouncycastle.bcprov" version="1.70.0.v20220105-1522"/>
39-
<unit id="org.cyberneko.html" version="1.9.14.v201105210654"/>
4029
<unit id="org.glassfish.hk2.api" version="2.6.1.v20200513-1859"/>
4130
<unit id="org.glassfish.hk2.locator" version="2.6.1.v20200513-1859"/>
4231
<unit id="org.glassfish.hk2.osgi-resource-locator" version="2.5.0.v20161103-1916"/>
@@ -50,14 +39,18 @@
5039
<unit id="org.glassfish.jersey.ext.entityfiltering" version="2.30.1.v20200513-1859"/>
5140
<unit id="org.glassfish.jersey.inject.jersey-hk2" version="2.30.1.v20200512-1802"/>
5241
<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.30.1.v20200513-1859"/>
53-
<unit id="org.mockito" version="2.23.0.v20200310-1642"/>
54-
<unit id="org.objectweb.asm" version="9.2.0.v20210813-1119"/>
55-
<unit id="org.objectweb.asm.analysis" version="9.2.0.v20210813-1119"/>
56-
<unit id="org.objectweb.asm.tree" version="9.2.0.v20210813-1119"/>
57-
<unit id="org.objectweb.asm.util" version="9.2.0.v20210813-1119"/>
5842
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
59-
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>>
60-
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20220131095416/repository"/>
43+
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
44+
<unit id="org.bouncycastle.bcpkix" version="1.70.0.v20220105-1522"/>
45+
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/"/>
46+
</location>
47+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
48+
<unit id="javassist" version="3.13.0.GA_v201209210905"/>
49+
<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
50+
<unit id="org.aopalliance" version="1.0.0.v201105210816"/>
51+
<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
52+
<unit id="org.cyberneko.html" version="1.9.14.v201105210654"/>
53+
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20201118194144/repository/"/>
6154
</location>
6255
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
6356
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
@@ -69,7 +62,14 @@
6962
<unit id="org.eclipse.platform.ide" version="0.0.0"/>
7063
<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
7164
<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
72-
<repository location="https://download.eclipse.org/eclipse/updates/4.23-I-builds/"/>
65+
<unit id="org.objectweb.asm" version="0.0.0"/>
66+
<unit id="org.objectweb.asm.tree" version="0.0.0"/>
67+
<unit id="org.mockito.mockito-core" version="0.0.0"/>
68+
<unit id="assertj-core" version="0.0.0"/>
69+
<unit id="org.hamcrest.core" version="0.0.0"/>
70+
<unit id="org.apache.commons.io" version="0.0.0"/>
71+
<unit id="org.bouncycastle.bcprov" version="0.0.0"/>
72+
<repository location="https://download.eclipse.org/eclipse/updates/4.25-I-builds/"/>
7373
</location>
7474
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
7575
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -93,7 +93,7 @@
9393
<unit id="org.eclipse.lsp4e" version="0.0.0"/>
9494
<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
9595
<unit id="org.eclipse.wildwebdeveloper.embedder.node.feature.feature.group" version="0.0.0"/>
96-
<repository location="https://download.eclipse.org/releases/2021-12/"/>
96+
<repository location="https://download.eclipse.org/releases/2022-06/"/>
9797
</location>
9898
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
9999
<unit id="org.eclipse.reddeer.eclipse.feature.feature.group" version="0.0.0"/>
@@ -112,4 +112,4 @@
112112
-Xmx512M</vmArgs>
113113
<programArgs>-consolelog</programArgs>
114114
</launcherArgs>
115-
</target>
115+
</target>

releng/org.eclipse.linuxtools.target/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
<configuration>
3232
<artifacts>
3333
<artifact>
34-
<file>linuxtools-e4.24.target</file>
34+
<file>linuxtools-e4.25.target</file>
3535
<type>target</type>
36-
<classifier>linuxtools-e4.24</classifier>
36+
<classifier>linuxtools-e4.25</classifier>
3737
</artifact>
3838
<!-- More targets could be added here -->
3939
</artifacts>

0 commit comments

Comments
 (0)