Skip to content

Commit b001bec

Browse files
akurtakovakurtakov
committed
Adjust for docker-client 11
* Bump all the deps * Stop ignoring them in update rules * Fix category.xml to include new bundles
1 parent 554655a commit b001bec

5 files changed

Lines changed: 27 additions & 63 deletions

File tree

‎containers/org.eclipse.linuxtools.docker.core/META-INF/MANIFEST.MF‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.28.0",
1212
org.eclipse.equinox.security,
1313
org.eclipse.osgi,
1414
org.mandas.docker-client;bundle-version="10.0.0",
15-
org.glassfish.jersey.core.jersey-client;bundle-version="3.1.5",
16-
org.glassfish.jersey.media.jersey-media-json-jackson;bundle-version="3.1.5",
17-
org.glassfish.jersey.core.jersey-common;bundle-version="3.1.5",
18-
org.glassfish.jersey.inject.jersey-hk2;bundle-version="3.1.5",
15+
org.glassfish.jersey.core.jersey-client;bundle-version="4.0.2",
16+
org.glassfish.jersey.media.jersey-media-json-jackson;bundle-version="4.0.2",
17+
org.glassfish.jersey.core.jersey-common;bundle-version="4.0.2",
18+
org.glassfish.jersey.inject.jersey-hk2;bundle-version="4.0.2",
1919
org.eclipse.debug.core;bundle-version="3.21.100"
2020
Bundle-RequiredExecutionEnvironment: JavaSE-21
2121
Bundle-ActivationPolicy: lazy
@@ -26,5 +26,5 @@ Import-Package: com.fasterxml.jackson.annotation;version="2.10.3",
2626
jakarta.ws.rs.client;version="2.0.1",
2727
jakarta.ws.rs.core;version="2.0.1",
2828
org.eclipse.terminal.view.core;version="[1.0.0,2.0.0)",
29-
org.glassfish.jersey.apache.connector
29+
org.glassfish.jersey.apache5.connector
3030
Automatic-Module-Name: org.eclipse.linuxtools.docker.core

‎containers/org.eclipse.linuxtools.docker.ui.tests/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.linuxtools.docker.ui;bundle-version="1.0.0",
2828
org.eclipse.ui.console;bundle-version="3.6.100",
2929
org.eclipse.launchbar.ui;bundle-version="2.0.1",
3030
org.eclipse.launchbar.ui.controls;bundle-version="1.0.0"
31-
Import-Package: org.glassfish.jersey.apache.connector,
31+
Import-Package: org.glassfish.jersey.apache5.connector,
3232
org.slf4j
3333
Bundle-ClassPath: .
3434
Bundle-RequiredExecutionEnvironment: JavaSE-21

‎releng/org.eclipse.linuxtools.docker-site/category.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<iu id="org.glassfish.hk2.utils" version="0.0.0">
9595
<category name="Docker Client Dependencies"/>
9696
</iu>
97-
<iu id="org.glassfish.jersey.connectors.jersey-apache-connector" version="0.0.0">
97+
<iu id="org.glassfish.jersey.connectors.jersey-apache5-connector" version="0.0.0">
9898
<category name="Docker Client Dependencies"/>
9999
</iu>
100100
<iu id="org.glassfish.jersey.core.jersey-client" version="0.0.0">

‎releng/org.eclipse.linuxtools.target/linuxtools-latest.target‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<unit id="org.apache.commons.commons-io" version="0.0.0"/>
3030
<unit id="org.hamcrest" version="0.0.0"/>
3131
<unit id="slf4j.api" version="0.0.0"/>
32-
<unit id="jakarta.annotation-api" version="2.1.1"/>
32+
<unit id="jakarta.annotation-api" version="0.0.0"/>
3333
<unit id="jakarta.activation-api" version="0.0.0"/>
3434
<unit id="jakarta.inject.jakarta.inject-api" version="2.0.1"/>
3535
<unit id="bcprov" version="0.0.0"/>
@@ -68,6 +68,12 @@
6868
</location>
6969
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
7070
<dependencies>
71+
<dependency>
72+
<groupId>jakarta.annotation</groupId>
73+
<artifactId>jakarta.annotation-api</artifactId>
74+
<version>3.0.0</version>
75+
<type>jar</type>
76+
</dependency>
7177
<dependency>
7278
<groupId>com.fasterxml.jackson.core</groupId>
7379
<artifactId>jackson-annotations</artifactId>
@@ -168,31 +174,31 @@
168174
<dependency>
169175
<groupId>org.glassfish.hk2</groupId>
170176
<artifactId>hk2-api</artifactId>
171-
<version>3.1.1</version>
177+
<version>4.0.0</version>
172178
<type>jar</type>
173179
</dependency>
174180
<dependency>
175181
<groupId>org.glassfish.hk2</groupId>
176182
<artifactId>hk2-locator</artifactId>
177-
<version>3.1.1</version>
183+
<version>4.0.0</version>
178184
<type>jar</type>
179185
</dependency>
180186
<dependency>
181187
<groupId>org.glassfish.hk2</groupId>
182188
<artifactId>hk2-utils</artifactId>
183-
<version>3.1.1</version>
189+
<version>4.0.0</version>
184190
<type>jar</type>
185191
</dependency>
186192
<dependency>
187193
<groupId>org.glassfish.hk2</groupId>
188194
<artifactId>osgi-resource-locator</artifactId>
189-
<version>1.0.4</version>
195+
<version>3.0.0</version>
190196
<type>jar</type>
191197
</dependency>
192198
<dependency>
193199
<groupId>jakarta.ws.rs</groupId>
194200
<artifactId>jakarta.ws.rs-api</artifactId>
195-
<version>3.1.0</version>
201+
<version>4.0.0</version>
196202
<type>jar</type>
197203
</dependency>
198204
<dependency>
@@ -203,44 +209,44 @@
203209
</dependency>
204210
<dependency>
205211
<groupId>org.glassfish.jersey.connectors</groupId>
206-
<artifactId>jersey-apache-connector</artifactId>
207-
<version>3.1.11</version>
212+
<artifactId>jersey-apache5-connector</artifactId>
213+
<version>4.0.2</version>
208214
<type>jar</type>
209215
</dependency>
210216
<dependency>
211217
<groupId>org.glassfish.jersey.core</groupId>
212218
<artifactId>jersey-client</artifactId>
213-
<version>3.1.11</version>
219+
<version>4.0.2</version>
214220
<type>jar</type>
215221
</dependency>
216222
<dependency>
217223
<groupId>org.glassfish.jersey.core</groupId>
218224
<artifactId>jersey-common</artifactId>
219-
<version>3.1.11</version>
225+
<version>4.0.2</version>
220226
<type>jar</type>
221227
</dependency>
222228
<dependency>
223229
<groupId>org.glassfish.jersey.core</groupId>
224230
<artifactId>jersey-server</artifactId>
225-
<version>3.1.11</version>
231+
<version>4.0.2</version>
226232
<type>jar</type>
227233
</dependency>
228234
<dependency>
229235
<groupId>org.glassfish.jersey.ext</groupId>
230236
<artifactId>jersey-entity-filtering</artifactId>
231-
<version>3.1.11</version>
237+
<version>4.0.2</version>
232238
<type>jar</type>
233239
</dependency>
234240
<dependency>
235241
<groupId>org.glassfish.jersey.media</groupId>
236242
<artifactId>jersey-media-json-jackson</artifactId>
237-
<version>3.1.11</version>
243+
<version>4.0.2</version>
238244
<type>jar</type>
239245
</dependency>
240246
<dependency>
241247
<groupId>org.glassfish.jersey.inject</groupId>
242248
<artifactId>jersey-hk2</artifactId>
243-
<version>3.1.11</version>
249+
<version>4.0.2</version>
244250
<type>jar</type>
245251
</dependency>
246252
<dependency>

‎releng/org.eclipse.linuxtools.target/update-rules.xml‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -7,47 +7,5 @@
77
<ignoreVersions>
88
<ignoreVersion type="regex">.+[-.](alpha|beta|b|M|RC|rc|pre.1)\d*$</ignoreVersion>
99
</ignoreVersions>
10-
<rules>
11-
<rule artifactId="jakarta.ws.rs-api" comparisonMethod="maven">
12-
<ignoreVersions>
13-
<ignoreVersion>4.0.0</ignoreVersion>
14-
</ignoreVersions>
15-
</rule>
16-
<rule groupId="org.glassfish.jersey.core" comparisonMethod="maven">
17-
<ignoreVersions>
18-
<ignoreVersion>4.0.2</ignoreVersion>
19-
<ignoreVersion>4.0.1</ignoreVersion>
20-
<ignoreVersion>4.0.0</ignoreVersion>
21-
</ignoreVersions>
22-
</rule>
23-
<rule groupId="org.glassfish.jersey.ext" comparisonMethod="maven">
24-
<ignoreVersions>
25-
<ignoreVersion>4.0.2</ignoreVersion>
26-
<ignoreVersion>4.0.1</ignoreVersion>
27-
<ignoreVersion>4.0.0</ignoreVersion>
28-
</ignoreVersions>
29-
</rule>
30-
<rule groupId="org.glassfish.jersey.media" comparisonMethod="maven">
31-
<ignoreVersions>
32-
<ignoreVersion>4.0.2</ignoreVersion>
33-
<ignoreVersion>4.0.1</ignoreVersion>
34-
<ignoreVersion>4.0.0</ignoreVersion>
35-
</ignoreVersions>
36-
</rule>
37-
<rule groupId="org.glassfish.jersey.inject" comparisonMethod="maven">
38-
<ignoreVersions>
39-
<ignoreVersion>4.0.2</ignoreVersion>
40-
<ignoreVersion>4.0.1</ignoreVersion>
41-
<ignoreVersion>4.0.0</ignoreVersion>
42-
</ignoreVersions>
43-
</rule>
44-
<rule groupId="org.glassfish.hk2" comparisonMethod="maven">
45-
<ignoreVersions>
46-
<ignoreVersion>4.0.0</ignoreVersion>
47-
<ignoreVersion>3.0.0</ignoreVersion>
48-
<ignoreVersion>2.4.0</ignoreVersion>
49-
</ignoreVersions>
50-
</rule>
51-
</rules>
5210

5311
</ruleset>

0 commit comments

Comments
 (0)