[master] ASM (org.eclipse.persistence.asm implementation) removal

bundles/eclipselink/pom.xml

@@ -146,26 +146,18 @@
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-commons</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-tree</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm-util</artifactId>
-            <scope>provided</scope>
-            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.ant</groupId>
@@ -226,11 +218,6 @@
             <classifier>common-license</classifier>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>org.eclipse.persistence.asm</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.core</artifactId>
@@ -399,7 +386,6 @@
                             <includeScope>provided</includeScope>
                             <classifier>sources</classifier>
                             <includeArtifactIds>
-                                org.eclipse.persistence.asm,
                                 org.eclipse.persistence.core,
                                 org.eclipse.persistence.corba,
                                 org.eclipse.persistence.dbws,
@@ -440,7 +426,6 @@
                             <includeGroupIds>${project.groupId}</includeGroupIds>
                             <includeScope>provided</includeScope>
                             <includeArtifactIds>
-                                org.eclipse.persistence.asm,
                                 org.eclipse.persistence.core,
                                 org.eclipse.persistence.corba,
                                 org.eclipse.persistence.dbws,

bundles/eclipselink/src/main/assembly/eclipselink.zip.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2019, 2021 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2019, 2023 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,17 @@
                 <include>${project.groupId}:eclipselink</include>
             </includes>
         </dependencySet>
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>eclipselink/jlib/asm/</outputDirectory>
+            <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+            <includes>
+                <include>org.ow2.asm:asm</include>
+                <include>org.ow2.asm:asm-commons</include>
+                <include>org.ow2.asm:asm-tree</include>
+                <include>org.ow2.asm:asm-util</include>
+            </includes>
+        </dependencySet>
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
             <scope>provided</scope>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -45,6 +45,11 @@
 
     requires static com.sun.xml.bind.core;
 
+    requires static org.objectweb.asm;
+    requires static org.objectweb.asm.commons;
+    requires static org.objectweb.asm.tree;
+    requires static org.objectweb.asm.util;
+
     exports org.eclipse.persistence.jpa.jpql;
     exports org.eclipse.persistence.jpa.jpql.parser;
     exports org.eclipse.persistence.jpa.jpql.utility.iterable;
@@ -221,7 +226,6 @@
     exports org.eclipse.persistence.internal.jpa.metadata.xml;
     exports org.eclipse.persistence.internal.jpa.rs.metadata.model;
     exports org.eclipse.persistence.internal.jpa.rs.metadata.model.v2;
-    exports org.eclipse.persistence.internal.libraries.asm;
     exports org.eclipse.persistence.internal.localization;
     exports org.eclipse.persistence.internal.oxm;
     exports org.eclipse.persistence.internal.oxm.mappings;

bundles/eclipselink/src/main/scripts/bin/sdo-compiler.cmd

@@ -1,5 +1,5 @@
 @REM
-@REM Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
+@REM Copyright (c) 2018, 2023 Oracle and/or its affiliates. All rights reserved.
 @REM
 @REM This program and the accompanying materials are made available under the
 @REM terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,10 +28,15 @@ set THIS=%_FIXPATH:~1%
 set MODULEPATH=%THIS%..\jlib\moxy
 set MODULEPATH=%MODULEPATH%;%THIS%..\jlib\eclipselink.jar
 set MODULEPATH=%MODULEPATH%;%THIS%..\jlib\jpa\jakarta.persistence-api.jar
+set MODULEPATH=%MODULEPATH%;%THIS%..\jlib\asm\asm.jar
+set MODULEPATH=%MODULEPATH%;%THIS%..\jlib\asm\asm-commons.jar
+set MODULEPATH=%MODULEPATH%;%THIS%..\jlib\asm\asm-tree.jar
+set MODULEPATH=%MODULEPATH%;%THIS%..\jlib\asm\asm-util.jar
+
 set MAIN_CLASS=org.eclipse.persistence.sdo.helper.SDOClassGenerator
 set JAVA_ARGS=%*
 
-%JAVA_HOME%\bin\java.exe %JVM_ARGS% -p %MODULEPATH% -m eclipselink/%MAIN_CLASS% %JAVA_ARGS%
+%JAVA_HOME%\bin\java.exe %JVM_ARGS% --add-modules eclipselink,org.objectweb.asm -p %MODULEPATH% -m eclipselink/%MAIN_CLASS% %JAVA_ARGS%
 
 @endlocal
 goto :EOF

bundles/eclipselink/src/main/scripts/bin/sdo-compiler.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2023 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0 which is available at
@@ -22,8 +22,12 @@ JVM_ARGS=-Xmx256m
 # Please do not change any of the following lines:
 MODULEPATH=`dirname $0`/../jlib/moxy:\
 `dirname $0`/../jlib/eclipselink.jar:\
-`dirname $0`/../jlib/jpa/jakarta.persistence-api.jar
+`dirname $0`/../jlib/jpa/jakarta.persistence-api.jar:\
+`dirname $0`/../jlib/asm/asm.jar:\
+`dirname $0`/../jlib/asm/asm-commons.jar:\
+`dirname $0`/../jlib/asm/asm-tree.jar:\
+`dirname $0`/../jlib/asm/asm-util.jar
 MAIN_CLASS=org.eclipse.persistence.sdo.helper.SDOClassGenerator
 JAVA_ARGS="$@"
 
-${JAVA_HOME}/bin/java ${JVM_ARGS} -p "${MODULEPATH}" -m eclipselink/${MAIN_CLASS} ${JAVA_ARGS}
+${JAVA_HOME}/bin/java ${JVM_ARGS} --add-modules eclipselink,org.objectweb.asm -p "${MODULEPATH}" -m eclipselink/${MAIN_CLASS} ${JAVA_ARGS}

bundles/others/pom.xml

@@ -61,10 +61,6 @@
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>eclipselink</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>org.eclipse.persistence.asm</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.core</artifactId>
@@ -284,11 +280,6 @@
         </dependency>
         <!--Source dependencies-->
         <!--Sources main dependencies-->
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>org.eclipse.persistence.asm</artifactId>
-            <classifier>sources</classifier>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.jpa.jpql</artifactId>

bundles/p2site/pom.xml

@@ -37,10 +37,6 @@
     <dependencies>
         <!--Binary dependencies-->
         <!--Other modules-->
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>org.eclipse.persistence.asm</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.core</artifactId>
@@ -273,11 +269,6 @@
         </dependency>
         <!--Source dependencies-->
         <!--Sources main dependencies-->
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>org.eclipse.persistence.asm</artifactId>
-            <classifier>sources</classifier>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.jpa.jpql</artifactId>
@@ -388,10 +379,6 @@
                             <artifacts>
                                 <!-- specify your depencies here -->
                                 <!-- groupId:artifactId:version -->
-                                <artifact>
-                                    <id>org.eclipse.persistence:org.eclipse.persistence.asm:${project.version}</id>
-                                    <source>true</source>
-                                </artifact>
                                 <artifact>
                                     <id>org.eclipse.persistence:org.eclipse.persistence.core:${project.version}</id>
                                     <source>true</source>
@@ -449,10 +436,6 @@
                                             <transitive>false</transitive>
                                             <source>true</source>
                                         </artifact>
-                                        <artifact>
-                                            <id>org.eclipse.persistence:org.eclipse.persistence.asm:${project.version}</id>
-                                            <source>true</source>
-                                        </artifact>
                                         <artifact>
                                             <id>org.eclipse.persistence:org.eclipse.persistence.core:${project.version}</id>
                                             <source>true</source>

bundles/tests/pom.xml

@@ -50,11 +50,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>org.eclipse.persistence.asm</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.core</artifactId>

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

@@ -38,7 +38,6 @@ public class OSGITestHelper {
     private static final String JAXB_API_JAR = System.getProperty("jaxb-api.jar", "jakarta.xml.bind-api.jar");
     private static final String JAXB_OSGI = System.getProperty("jaxb-osgi.jar", "jaxb-xjc.jar");
     private static final String JAXRS_JAR = System.getProperty("jaxrs.jar", "jakarta.ws.rs-api.jar");
-    private static final String ASM_JAR = System.getProperty("asm.jar", "org.eclipse.persistence.asm.jar");
 
     public static Option[] getDefaultOptions() {
 
@@ -60,7 +59,6 @@ public static Option[] getDefaultOptions() {
                 // EclipseLink bundles
                 bundle(pathToUrl(PLUGINS_DIR + "org.eclipse.persistence.moxy.jar")),
                 bundle(pathToUrl(PLUGINS_DIR + "org.eclipse.persistence.core.jar")),
-                bundle(pathToUrl(PLUGINS_DIR + ASM_JAR)),
 
                 cleanCaches(),
                 junitBundles());
@@ -78,7 +76,6 @@ public static Option[] getOptionsWithBeanValidation() {
                 // EclipseLink bundles
                 bundle(pathToUrl(PLUGINS_DIR + "org.eclipse.persistence.moxy.jar")),
                 bundle(pathToUrl(PLUGINS_DIR + "org.eclipse.persistence.core.jar")),
-                bundle(pathToUrl(PLUGINS_DIR + ASM_JAR)),
 
                 bundle(pathToUrl(PLUGINS_DIR + "jakarta.validation-api.jar")),
                 bundle(pathToUrl(PLUGINS_DIR + "hibernate-validator.jar")),

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

@@ -64,12 +64,6 @@ public static Option[] config() {
         return OSGITestHelper.getDefaultOptions();
     }
 
-    @Test
-    public void testAsmELVersion() {
-        Class<?> c = loadClass(CORE_BUNDLE_NAME, "org.eclipse.persistence.internal.libraries.asm.AnnotationVisitor");
-        assertClassLoadedByBundle(c, ASM_BUNDLE_NAME);
-    }
-
     @Test
     public void testAsmCoreVersion() {
         Class<?> c = loadClass(CORE_BUNDLE_NAME, "org.eclipse.persistence.asm.AnnotationVisitor");

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

@@ -87,12 +87,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <!--EclipseLink ASM Implementation-->
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>org.eclipse.persistence.asm</artifactId>
-            <scope>test</scope>
-        </dependency>
         <!--JDBC driver (test dependency)-->
         <dependency>
             <groupId>${db.driver.groupId}</groupId>
@@ -121,10 +115,6 @@
                                     org.eclipse.persistence.internal.xr.sxf,
                                     *
                                 </Export-Package>
-                                <Import-Package>
-                                    org.eclipse.persistence.internal.libraries.asm*;version="${version;==;${@}}",
-                                    *
-                                </Import-Package>
                             </instructions>
                         </configuration>
                     </execution>

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

@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-    Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2022, 2023 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -93,7 +93,6 @@ directory.
       .
       .
       o org.eclipse.persistence.antlr.jar
-      o org.eclipse.persistence.asm.jar
       o org.eclipse.persistence.core.jar
       o org.eclipse.persistence.jpa.jar
       o org.eclipse.persistence.jpa.modelgen.jar

foundation/eclipselink.core.test/pom.xml

@@ -89,36 +89,6 @@
             <artifactId>org.eclipse.persistence.core.test.framework</artifactId>
             <scope>test</scope>
         </dependency>
-        <!--ASM Implementations-->
-        <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>org.eclipse.persistence.asm</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>${asm.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-commons</artifactId>
-            <version>${asm.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-tree</artifactId>
-            <version>${asm.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm-util</artifactId>
-            <version>${asm.version}</version>
-            <scope>test</scope>
-        </dependency>
         <!--For Oracle DB driver see Oracle proprietary dependencies part. It's not limited to tests only-->
         <!--JDBC driver (test dependency)-->
         <dependency>
@@ -176,26 +146,6 @@
                             </includes>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>asm-eclipselink-test</id>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <classpathDependencyExcludes>
-                                <classpathDependencyExclude>org.ow2.asm:asm</classpathDependencyExclude>
-                                <classpathDependencyExclude>org.ow2.asm:asm-commons</classpathDependencyExclude>
-                                <classpathDependencyExclude>org.ow2.asm:asm-tree</classpathDependencyExclude>
-                                <classpathDependencyExclude>org.ow2.asm:asm-util</classpathDependencyExclude>
-                            </classpathDependencyExcludes>
-                            <systemPropertyVariables>
-                                <eclipselink.asm.service>eclipselink</eclipselink.asm.service>
-                            </systemPropertyVariables>
-                            <includes>
-                                <include>org/eclipse/persistence/testing/tests/junit/asm/**/*Test</include>
-                            </includes>
-                        </configuration>
-                    </execution>
                     <execution>
                         <id>asm-ow2-test</id>
                         <goals>
@@ -205,9 +155,6 @@
                             <systemPropertyVariables>
                                 <eclipselink.asm.service>ow2</eclipselink.asm.service>
                             </systemPropertyVariables>
-                            <classpathDependencyExcludes>
-                                <classpathDependencyExclude>org.eclipse.persistence.asm</classpathDependencyExclude>
-                            </classpathDependencyExcludes>
                             <includes>
                                 <include>org/eclipse/persistence/testing/tests/junit/asm/**/*Test</include>
                             </includes>