Skip to content

Commit

Permalink
ASM version switch to 9.4 to be ready for JDK 20.
Browse files Browse the repository at this point in the history
There are changes in module-info.java as *analysis* directory was removed plus change in the pom.xml as SourceValue.java was removed too.
Parent pom org.eclipse.ee4j:project was upgraded to 1.0.7.

Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
  • Loading branch information
rfelcman authored and lukasj committed Oct 5, 2022
1 parent 3bbb1da commit 0e6253a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
14 changes: 4 additions & 10 deletions org.eclipse.persistence.asm/pom.xml
Expand Up @@ -21,13 +21,13 @@
<parent>
<groupId>org.eclipse.ee4j</groupId>
<artifactId>project</artifactId>
<version>1.0.6</version>
<version>1.0.7</version>
<relativePath/>
</parent>

<groupId>org.eclipse.persistence</groupId>
<artifactId>org.eclipse.persistence.asm</artifactId>
<version>9.3.0-SNAPSHOT</version>
<version>9.4.0-SNAPSHOT</version>

<name>EclipseLink ASM</name>
<description>EclipseLink extension for Java bytecode manipulation and analysis framework</description>
Expand Down Expand Up @@ -85,8 +85,8 @@
<!-- 2.6.x has Java SE 7 as min supported JDK -->
<base.java.level>7</base.java.level>
<upper.java.level>9</upper.java.level>
<!-- CQ #24052 -->
<asm.version>9.3</asm.version>
<!-- CQ #24269 -->
<asm.version>9.4</asm.version>
<junit.version>4.13.2</junit.version>
</properties>

Expand Down Expand Up @@ -350,12 +350,6 @@
<replacevalue><![CDATA[new ArrayList<T>(1)]]></replacevalue>
</replacefilter>
</replace>
<replace file="${project.build.directory}/generated-sources/asm-src/org/eclipse/persistence/internal/libraries/asm/tree/analysis/SourceValue.java">
<replacefilter>
<replacetoken><![CDATA[new SmallSet<>()]]></replacetoken>
<replacevalue><![CDATA[new SmallSet<AbstractInsnNode>()]]></replacevalue>
</replacefilter>
</replace>
</target>
</configuration>
</execution>
Expand Down
3 changes: 1 addition & 2 deletions org.eclipse.persistence.asm/src/main/java/module-info.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Oracle, IBM Corporation, and/or their affiliates. All rights reserved.
* Copyright (c) 2021, 2022 Oracle, IBM Corporation, and/or their 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
Expand All @@ -20,5 +20,4 @@
exports org.eclipse.persistence.internal.libraries.asm.commons;
exports org.eclipse.persistence.internal.libraries.asm.signature;
exports org.eclipse.persistence.internal.libraries.asm.tree;
exports org.eclipse.persistence.internal.libraries.asm.tree.analysis;
}

0 comments on commit 0e6253a

Please sign in to comment.