Skip to content

Commit f5a6a3f

Browse files
rfelcmanrfelcman
committed
ASM (org.eclipse.persistence.asm implementation) removal
Signed-off-by: Radek Felcman <[email protected]>
1 parent 149e9ce commit f5a6a3f

File tree

58 files changed

+299
-1754
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+299
-1754
lines changed

‎bundles/eclipselink/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,6 @@
226226
<classifier>common-license</classifier>
227227
<scope>provided</scope>
228228
</dependency>
229-
<dependency>
230-
<groupId>org.eclipse.persistence</groupId>
231-
<artifactId>org.eclipse.persistence.asm</artifactId>
232-
<scope>provided</scope>
233-
</dependency>
234229
<dependency>
235230
<groupId>org.eclipse.persistence</groupId>
236231
<artifactId>org.eclipse.persistence.core</artifactId>
@@ -399,7 +394,6 @@
399394
<includeScope>provided</includeScope>
400395
<classifier>sources</classifier>
401396
<includeArtifactIds>
402-
org.eclipse.persistence.asm,
403397
org.eclipse.persistence.core,
404398
org.eclipse.persistence.corba,
405399
org.eclipse.persistence.dbws,
@@ -440,7 +434,6 @@
440434
<includeGroupIds>${project.groupId}</includeGroupIds>
441435
<includeScope>provided</includeScope>
442436
<includeArtifactIds>
443-
org.eclipse.persistence.asm,
444437
org.eclipse.persistence.core,
445438
org.eclipse.persistence.corba,
446439
org.eclipse.persistence.dbws,

‎bundles/eclipselink/src/main/java/module-info.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2021, 2023 Oracle and/or its affiliates. All rights reserved.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0 which is available at
@@ -221,7 +221,6 @@
221221
exports org.eclipse.persistence.internal.jpa.metadata.xml;
222222
exports org.eclipse.persistence.internal.jpa.rs.metadata.model;
223223
exports org.eclipse.persistence.internal.jpa.rs.metadata.model.v2;
224-
exports org.eclipse.persistence.internal.libraries.asm;
225224
exports org.eclipse.persistence.internal.localization;
226225
exports org.eclipse.persistence.internal.oxm;
227226
exports org.eclipse.persistence.internal.oxm.mappings;

‎bundles/others/pom.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@
6161
<groupId>org.eclipse.persistence</groupId>
6262
<artifactId>eclipselink</artifactId>
6363
</dependency>
64-
<dependency>
65-
<groupId>org.eclipse.persistence</groupId>
66-
<artifactId>org.eclipse.persistence.asm</artifactId>
67-
</dependency>
6864
<dependency>
6965
<groupId>org.eclipse.persistence</groupId>
7066
<artifactId>org.eclipse.persistence.core</artifactId>
@@ -284,11 +280,6 @@
284280
</dependency>
285281
<!--Source dependencies-->
286282
<!--Sources main dependencies-->
287-
<dependency>
288-
<groupId>org.eclipse.persistence</groupId>
289-
<artifactId>org.eclipse.persistence.asm</artifactId>
290-
<classifier>sources</classifier>
291-
</dependency>
292283
<dependency>
293284
<groupId>org.eclipse.persistence</groupId>
294285
<artifactId>org.eclipse.persistence.jpa.jpql</artifactId>

‎bundles/p2site/pom.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@
3737
<dependencies>
3838
<!--Binary dependencies-->
3939
<!--Other modules-->
40-
<dependency>
41-
<groupId>org.eclipse.persistence</groupId>
42-
<artifactId>org.eclipse.persistence.asm</artifactId>
43-
</dependency>
4440
<dependency>
4541
<groupId>org.eclipse.persistence</groupId>
4642
<artifactId>org.eclipse.persistence.core</artifactId>
@@ -273,11 +269,6 @@
273269
</dependency>
274270
<!--Source dependencies-->
275271
<!--Sources main dependencies-->
276-
<dependency>
277-
<groupId>org.eclipse.persistence</groupId>
278-
<artifactId>org.eclipse.persistence.asm</artifactId>
279-
<classifier>sources</classifier>
280-
</dependency>
281272
<dependency>
282273
<groupId>org.eclipse.persistence</groupId>
283274
<artifactId>org.eclipse.persistence.jpa.jpql</artifactId>
@@ -388,10 +379,6 @@
388379
<artifacts>
389380
<!-- specify your depencies here -->
390381
<!-- groupId:artifactId:version -->
391-
<artifact>
392-
<id>org.eclipse.persistence:org.eclipse.persistence.asm:${project.version}</id>
393-
<source>true</source>
394-
</artifact>
395382
<artifact>
396383
<id>org.eclipse.persistence:org.eclipse.persistence.core:${project.version}</id>
397384
<source>true</source>
@@ -449,10 +436,6 @@
449436
<transitive>false</transitive>
450437
<source>true</source>
451438
</artifact>
452-
<artifact>
453-
<id>org.eclipse.persistence:org.eclipse.persistence.asm:${project.version}</id>
454-
<source>true</source>
455-
</artifact>
456439
<artifact>
457440
<id>org.eclipse.persistence:org.eclipse.persistence.core:${project.version}</id>
458441
<source>true</source>

‎bundles/tests/pom.xml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@
5050
<version>${project.version}</version>
5151
</dependency>
5252

53-
<dependency>
54-
<groupId>org.eclipse.persistence</groupId>
55-
<artifactId>org.eclipse.persistence.asm</artifactId>
56-
<scope>test</scope>
57-
</dependency>
5853
<dependency>
5954
<groupId>org.eclipse.persistence</groupId>
6055
<artifactId>org.eclipse.persistence.core</artifactId>
@@ -90,6 +85,27 @@
9085
<artifactId>parsson</artifactId>
9186
<scope>test</scope>
9287
</dependency>
88+
<!--ASM Implementation-->
89+
<dependency>
90+
<groupId>org.ow2.asm</groupId>
91+
<artifactId>asm</artifactId>
92+
<scope>test</scope>
93+
</dependency>
94+
<dependency>
95+
<groupId>org.ow2.asm</groupId>
96+
<artifactId>asm-commons</artifactId>
97+
<scope>test</scope>
98+
</dependency>
99+
<dependency>
100+
<groupId>org.ow2.asm</groupId>
101+
<artifactId>asm-tree</artifactId>
102+
<scope>test</scope>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.ow2.asm</groupId>
106+
<artifactId>asm-util</artifactId>
107+
<scope>test</scope>
108+
</dependency>
93109
<!-- <dependency>-->
94110
<!-- <groupId>org.glassfish.corba</groupId>-->
95111
<!-- <artifactId>glassfish-corba-omgapi</artifactId>-->

‎bundles/tests/src/test/java/org/eclipse/persistence/testing/osgi/OSGITestHelper.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public class OSGITestHelper {
3838
private static final String JAXB_API_JAR = System.getProperty("jaxb-api.jar", "jakarta.xml.bind-api.jar");
3939
private static final String JAXB_OSGI = System.getProperty("jaxb-osgi.jar", "jaxb-xjc.jar");
4040
private static final String JAXRS_JAR = System.getProperty("jaxrs.jar", "jakarta.ws.rs-api.jar");
41-
private static final String ASM_JAR = System.getProperty("asm.jar", "org.eclipse.persistence.asm.jar");
4241

4342
public static Option[] getDefaultOptions() {
4443

@@ -60,7 +59,6 @@ public static Option[] getDefaultOptions() {
6059
// EclipseLink bundles
6160
bundle(pathToUrl(PLUGINS_DIR + "org.eclipse.persistence.moxy.jar")),
6261
bundle(pathToUrl(PLUGINS_DIR + "org.eclipse.persistence.core.jar")),
63-
bundle(pathToUrl(PLUGINS_DIR + ASM_JAR)),
6462

6563
cleanCaches(),
6664
junitBundles());
@@ -78,7 +76,6 @@ public static Option[] getOptionsWithBeanValidation() {
7876
// EclipseLink bundles
7977
bundle(pathToUrl(PLUGINS_DIR + "org.eclipse.persistence.moxy.jar")),
8078
bundle(pathToUrl(PLUGINS_DIR + "org.eclipse.persistence.core.jar")),
81-
bundle(pathToUrl(PLUGINS_DIR + ASM_JAR)),
8279

8380
bundle(pathToUrl(PLUGINS_DIR + "jakarta.validation-api.jar")),
8481
bundle(pathToUrl(PLUGINS_DIR + "hibernate-validator.jar")),

‎bundles/tests/src/test/java/org/eclipse/persistence/testing/osgi/OSGiBundleTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,6 @@ public static Option[] config() {
6464
return OSGITestHelper.getDefaultOptions();
6565
}
6666

67-
@Test
68-
public void testAsmELVersion() {
69-
Class<?> c = loadClass(CORE_BUNDLE_NAME, "org.eclipse.persistence.internal.libraries.asm.AnnotationVisitor");
70-
assertClassLoadedByBundle(c, ASM_BUNDLE_NAME);
71-
}
72-
7367
@Test
7468
public void testAsmCoreVersion() {
7569
Class<?> c = loadClass(CORE_BUNDLE_NAME, "org.eclipse.persistence.asm.AnnotationVisitor");

‎dbws/org.eclipse.persistence.dbws/pom.xml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,25 @@
8787
<artifactId>junit</artifactId>
8888
<scope>test</scope>
8989
</dependency>
90-
<!--EclipseLink ASM Implementation-->
90+
<!--ASM Implementations-->
9191
<dependency>
92-
<groupId>org.eclipse.persistence</groupId>
93-
<artifactId>org.eclipse.persistence.asm</artifactId>
92+
<groupId>org.ow2.asm</groupId>
93+
<artifactId>asm</artifactId>
94+
<scope>test</scope>
95+
</dependency>
96+
<dependency>
97+
<groupId>org.ow2.asm</groupId>
98+
<artifactId>asm-commons</artifactId>
99+
<scope>test</scope>
100+
</dependency>
101+
<dependency>
102+
<groupId>org.ow2.asm</groupId>
103+
<artifactId>asm-tree</artifactId>
104+
<scope>test</scope>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.ow2.asm</groupId>
108+
<artifactId>asm-util</artifactId>
94109
<scope>test</scope>
95110
</dependency>
96111
<!--JDBC driver (test dependency)-->
@@ -121,10 +136,6 @@
121136
org.eclipse.persistence.internal.xr.sxf,
122137
*
123138
</Export-Package>
124-
<Import-Package>
125-
org.eclipse.persistence.internal.libraries.asm*;version="${version;==;${@}}",
126-
*
127-
</Import-Package>
128139
</instructions>
129140
</configuration>
130141
</execution>

‎docs/docs.solutions/src/main/asciidoc/tlandgs002.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
///////////////////////////////////////////////////////////////////////////////
22

3-
Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
3+
Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved.
44

55
This program and the accompanying materials are made available under the
66
terms of the Eclipse Public License v. 2.0, which is available at
@@ -93,7 +93,6 @@ directory.
9393
.
9494
.
9595
o org.eclipse.persistence.antlr.jar
96-
o org.eclipse.persistence.asm.jar
9796
o org.eclipse.persistence.core.jar
9897
o org.eclipse.persistence.jpa.jar
9998
o org.eclipse.persistence.jpa.modelgen.jar

‎foundation/eclipselink.core.test/pom.xml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -90,33 +90,24 @@
9090
<scope>test</scope>
9191
</dependency>
9292
<!--ASM Implementations-->
93-
<dependency>
94-
<groupId>org.eclipse.persistence</groupId>
95-
<artifactId>org.eclipse.persistence.asm</artifactId>
96-
<scope>test</scope>
97-
</dependency>
9893
<dependency>
9994
<groupId>org.ow2.asm</groupId>
10095
<artifactId>asm</artifactId>
101-
<version>${asm.version}</version>
10296
<scope>test</scope>
10397
</dependency>
10498
<dependency>
10599
<groupId>org.ow2.asm</groupId>
106100
<artifactId>asm-commons</artifactId>
107-
<version>${asm.version}</version>
108101
<scope>test</scope>
109102
</dependency>
110103
<dependency>
111104
<groupId>org.ow2.asm</groupId>
112105
<artifactId>asm-tree</artifactId>
113-
<version>${asm.version}</version>
114106
<scope>test</scope>
115107
</dependency>
116108
<dependency>
117109
<groupId>org.ow2.asm</groupId>
118110
<artifactId>asm-util</artifactId>
119-
<version>${asm.version}</version>
120111
<scope>test</scope>
121112
</dependency>
122113
<!--For Oracle DB driver see Oracle proprietary dependencies part. It's not limited to tests only-->
@@ -176,26 +167,6 @@
176167
</includes>
177168
</configuration>
178169
</execution>
179-
<execution>
180-
<id>asm-eclipselink-test</id>
181-
<goals>
182-
<goal>test</goal>
183-
</goals>
184-
<configuration>
185-
<classpathDependencyExcludes>
186-
<classpathDependencyExclude>org.ow2.asm:asm</classpathDependencyExclude>
187-
<classpathDependencyExclude>org.ow2.asm:asm-commons</classpathDependencyExclude>
188-
<classpathDependencyExclude>org.ow2.asm:asm-tree</classpathDependencyExclude>
189-
<classpathDependencyExclude>org.ow2.asm:asm-util</classpathDependencyExclude>
190-
</classpathDependencyExcludes>
191-
<systemPropertyVariables>
192-
<eclipselink.asm.service>eclipselink</eclipselink.asm.service>
193-
</systemPropertyVariables>
194-
<includes>
195-
<include>org/eclipse/persistence/testing/tests/junit/asm/**/*Test</include>
196-
</includes>
197-
</configuration>
198-
</execution>
199170
<execution>
200171
<id>asm-ow2-test</id>
201172
<goals>
@@ -205,9 +176,6 @@
205176
<systemPropertyVariables>
206177
<eclipselink.asm.service>ow2</eclipselink.asm.service>
207178
</systemPropertyVariables>
208-
<classpathDependencyExcludes>
209-
<classpathDependencyExclude>org.eclipse.persistence.asm</classpathDependencyExclude>
210-
</classpathDependencyExcludes>
211179
<includes>
212180
<include>org/eclipse/persistence/testing/tests/junit/asm/**/*Test</include>
213181
</includes>

‎foundation/eclipselink.core.test/src/test/java/org/eclipse/persistence/testing/tests/junit/asm/ASMFactoryTest.java

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,13 @@ public class ASMFactoryTest {
2727
public void getAsmServiceTest() {
2828
String asmServiceSysProperty = System.getProperty(SystemProperties.ASM_SERVICE, "");
2929
String asmService = ASMFactory.getAsmService();
30-
switch (asmServiceSysProperty) {
31-
case ASMFactory.ASM_SERVICE_OW2:
32-
assertEquals(ASMFactory.ASM_SERVICE_OW2, asmService);
33-
break;
34-
case ASMFactory.ASM_SERVICE_ECLIPSELINK:
35-
default:
36-
assertEquals(ASMFactory.ASM_SERVICE_ECLIPSELINK, asmService);
37-
}
30+
assertEquals(ASMFactory.ASM_SERVICE_OW2, asmService);
3831
}
3932

4033
@Test
4134
public void createClassVisitorTest() {
4235
String asmServiceSysProperty = System.getProperty(SystemProperties.ASM_SERVICE, "");
4336
ClassVisitor classVisitor = ASMFactory.createClassVisitor(ASMFactory.ASM_API_SELECTED);
44-
switch (asmServiceSysProperty) {
45-
case ASMFactory.ASM_SERVICE_OW2:
46-
assertEquals(org.eclipse.persistence.asm.internal.platform.ow2.ClassVisitorImpl.class, classVisitor.getClass());
47-
break;
48-
case ASMFactory.ASM_SERVICE_ECLIPSELINK:
49-
default:
50-
assertEquals(org.eclipse.persistence.asm.internal.platform.eclipselink.ClassVisitorImpl.class, classVisitor.getClass());
51-
}
37+
assertEquals(org.eclipse.persistence.asm.internal.platform.ow2.ClassVisitorImpl.class, classVisitor.getClass());
5238
}
5339
}

‎foundation/org.eclipse.persistence.core/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@
4444

4545
<dependencies>
4646
<!--Other modules-->
47-
<dependency>
48-
<groupId>org.eclipse.persistence</groupId>
49-
<artifactId>org.eclipse.persistence.asm</artifactId>
50-
<scope>provided</scope>
51-
<optional>true</optional>
52-
</dependency>
5347
<dependency>
5448
<groupId>org.eclipse.persistence</groupId>
5549
<artifactId>org.eclipse.persistence.jpa.jpql</artifactId>
@@ -300,14 +294,12 @@
300294
*
301295
</Export-Package>
302296
<Import-Package>
303-
org.eclipse.persistence.internal.libraries.asm*;version=!;resolution:=optional,
304297
org.objectweb.asm*;version=!;resolution:=optional,
305298
javax.rmi;version=!;resolution:=optional,
306299
javax.rmi.CORBA;version=!;resolution:=optional,
307300
org.omg.CORBA;version=!;resolution:=optional,
308301
org.omg.CORBA.portable;version=!;resolution:=optional,
309302
org.omg.CORBA_2_3.portable;version=!;resolution:=optional,
310-
org.eclipse.persistence.internal.libraries.asm*;version="${version;==;${@}}",
311303
org.eclipse.persistence.eis.adapters.xmlfile;resolution:=optional,
312304
org.eclipse.persistence.sessions.coordination.rmi.iiop;resolution:=optional,
313305
org.eclipse.persistence.sessions.coordination.corba.sun;resolution:=optional,

‎foundation/org.eclipse.persistence.core/src/main/java/module-info.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
requires static jakarta.persistence;
2727
requires static jakarta.xml.bind;
2828

29-
requires org.eclipse.persistence.asm;
3029
requires static org.eclipse.persistence.jpa.jpql;
3130

3231
requires static jakarta.cdi;

0 commit comments

Comments
 (0)