Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ASM from 9.5 to 9.6 #6597

Merged
merged 1 commit into from
Oct 21, 2023
+22 −22
Merged

Update ASM from 9.5 to 9.6 #6597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion harness/apisupport.harness/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<pathelement location="${cluster}/tasks.jar"></pathelement>
</classpath>
</taskdef>
<echo file="build/binaries-list">DC6EA1875F4D64FBC85E1691C95B96A3D8569C90 org.ow2.asm:asm:9.5</echo>
<echo file="build/binaries-list">AA205CF0A06DBD8E04ECE91C0B37C3F5D567546A org.ow2.asm:asm:9.6</echo>
<TestDownload>
<manifest dir="build">
<include name="binaries-list"/>
Expand Down
2 changes: 1 addition & 1 deletion java/lib.jshell.agent/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ javac.compilerargs=-Xlint -Xlint:-serial
extra.module.files=modules/ext/nb-custom-jshell-probe.jar,modules/ext/nb-mod-jshell-probe.jar
jnlp.indirect.jars=modules/ext/nb-custom-jshell-probe.jar,modules/ext/nb-mod-jshell-probe.jar

agentsrc.asm.cp=${libs.asm.dir}/core/asm-9.5.jar
agentsrc.asm.cp=${libs.asm.dir}/core/asm-9.6.jar
agentsrc.jshell.cp=${nb_all}/java/libs.jshell.compile/external/jshell-9.jar
4 changes: 2 additions & 2 deletions java/maven/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
<!-- we use jarjar to repackage simple json, to avoid clashes with 3rd party maven plugins possibly including it in their dependencies -->
<taskdef name="jarjar" classname="org.pantsbuild.jarjar.JarJarTask" loaderref="lib.path.loader">
<classpath>
<pathelement location="${libs.asm.dir}/core/asm-9.5.jar"/>
<pathelement location="${libs.asm.dir}/core/asm-commons-9.5.jar"/>
<pathelement location="${libs.asm.dir}/core/asm-9.6.jar"/>
<pathelement location="${libs.asm.dir}/core/asm-commons-9.6.jar"/>
<pathelement location="./external/jarjar-1.7.2.jar"/>
</classpath>
</taskdef>
Expand Down
6 changes: 3 additions & 3 deletions nbbuild/templates/common.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@
<tstamp>
<format property="module.build.started.time" pattern="yyyy-MM-dd'T'HH:mm:ss.SSSZ"/>
</tstamp>
<condition property="asm.jar" value="${nbplatform.active.dir}/platform/core/asm-9.5.jar">
<available file="${nbplatform.active.dir}/platform/core/asm-9.5.jar"/>
<condition property="asm.jar" value="${nbplatform.active.dir}/platform/core/asm-9.6.jar">
<available file="${nbplatform.active.dir}/platform/core/asm-9.6.jar"/>
</condition>
<property name="asm.jar" location="${platform/libs.asm.dir}/core/asm-9.5.jar"/>
<property name="asm.jar" location="${platform/libs.asm.dir}/core/asm-9.6.jar"/>
<property name="tsaurl" value=""/>
<property name="tsacert" value=""/>
</target>
Expand Down
4 changes: 2 additions & 2 deletions ...orm/libs.asm/external/asm-9.5-license.txt → ...orm/libs.asm/external/asm-9.6-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: OW2 ASM
Version: 9.5
Files: asm-tree-9.5.jar asm-commons-9.5.jar asm-9.5.jar
Version: 9.6
Files: asm-tree-9.6.jar asm-commons-9.6.jar asm-9.6.jar
License: BSD-INRIA
Origin: OW2 Consortium
URL: https://repository.ow2.org/nexus/content/repositories/releases/org/ow2/asm/
Expand Down
6 changes: 3 additions & 3 deletions platform/libs.asm/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
DC6EA1875F4D64FBC85E1691C95B96A3D8569C90 org.ow2.asm:asm:9.5
FD33C8B6373ABAA675BE407082FDFDA35021254A org.ow2.asm:asm-tree:9.5
19AB5B5800A3910D30D3A3E64FDB00FD0CB42DE0 org.ow2.asm:asm-commons:9.5
AA205CF0A06DBD8E04ECE91C0B37C3F5D567546A org.ow2.asm:asm:9.6
C0CDDA9D211E965D2A4448AA3FD86110F2F8C2DE org.ow2.asm:asm-tree:9.6
F1A9E5508EFF490744144565C47326C8648BE309 org.ow2.asm:asm-commons:9.6
8 changes: 4 additions & 4 deletions platform/libs.asm/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
module.jar.dir=core

release.external/asm-9.5.jar=core/asm-9.5.jar
release.external/asm-tree-9.5.jar=core/asm-tree-9.5.jar
release.external/asm-commons-9.5.jar=core/asm-commons-9.5.jar
license.file=../external/asm-9.5-license.txt
release.external/asm-9.6.jar=core/asm-9.6.jar
release.external/asm-tree-9.6.jar=core/asm-tree-9.6.jar
release.external/asm-commons-9.6.jar=core/asm-commons-9.6.jar
license.file=../external/asm-9.6-license.txt
12 changes: 6 additions & 6 deletions platform/libs.asm/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@
<subpackages>org</subpackages>
</public-packages>
<class-path-extension>
<runtime-relative-path>asm-9.5.jar</runtime-relative-path>
<binary-origin>external/asm-9.5.jar</binary-origin>
<runtime-relative-path>asm-9.6.jar</runtime-relative-path>
<binary-origin>external/asm-9.6.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>asm-tree-9.5.jar</runtime-relative-path>
<binary-origin>external/asm-tree-9.5.jar</binary-origin>
<runtime-relative-path>asm-tree-9.6.jar</runtime-relative-path>
<binary-origin>external/asm-tree-9.6.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>asm-commons-9.5.jar</runtime-relative-path>
<binary-origin>external/asm-commons-9.5.jar</binary-origin>
<runtime-relative-path>asm-commons-9.6.jar</runtime-relative-path>
<binary-origin>external/asm-commons-9.6.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down