Skip to content

Commit 6f3b0ef

Browse files
mbienmbien
authored
Merge pull request #9695 from mbien/asm911
Update ASM 9.10.1 to 9.11
2 parents 5d25259 + 0ba440d commit 6f3b0ef

9 files changed

Lines changed: 26 additions & 26 deletions

File tree

‎harness/apisupport.harness/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
<pathelement location="${cluster}/tasks.jar"></pathelement>
4040
</classpath>
4141
</taskdef>
42-
<echo file="build/binaries-list">ADA2141C0CC52EE8F5C48CD5FA4CE0E794F22236 org.ow2.asm:asm:9.10.1</echo>
42+
<echo file="build/binaries-list">2A2C870691D2220EB93492C88FDCD3711AB0FADB org.ow2.asm:asm:9.11</echo>
4343
<TestDownload server="${binaries.server}" repos="${binaries.repos}">
4444
<manifest dir="build">
4545
<include name="binaries-list"/>
4646
</manifest>
4747
</TestDownload>
48-
<delete file="build/asm-9.10.1.jar"/>
48+
<delete file="build/asm-9.11.jar"/>
4949
</target>
5050

5151
<target name="compile-jnlp-launcher" depends="init,compile">

‎ide/o.n.agent/nbproject/project.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ javac.compilerargs=-Xlint -Xlint:-serial
2121
agent.src.dir=src-agent
2222
agent.build.classes.dir=${build.dir}/agent/classes/
2323
agent.jar=${cluster}/netbeans-javaagent.jar
24-
agent.asm.lib.1=../../platform/libs.asm/external/asm-commons-9.10.1.jar
25-
agent.asm.lib.2=../../platform/libs.asm/external/asm-tree-9.10.1.jar
26-
agent.asm.lib.3=../../platform/libs.asm/external/asm-9.10.1.jar
24+
agent.asm.lib.1=../../platform/libs.asm/external/asm-commons-9.11.jar
25+
agent.asm.lib.2=../../platform/libs.asm/external/asm-tree-9.11.jar
26+
agent.asm.lib.3=../../platform/libs.asm/external/asm-9.11.jar
2727
agent.cp=${agent.asm.lib.1}:${agent.asm.lib.2}:${agent.asm.lib.3}
2828

2929
extra.module.files=${cluster}/netbeans-javaagent.jar

‎java/lib.jshell.agent/nbproject/project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
2121
extra.module.files=modules/ext/nb-custom-jshell-probe.jar
2222
jnlp.indirect.jars=modules/ext/nb-custom-jshell-probe.jar
2323

24-
agentsrc.asm.cp=${libs.asm.dir}/core/asm-9.10.1.jar
24+
agentsrc.asm.cp=${libs.asm.dir}/core/asm-9.11.jar

‎java/maven/build.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
<!-- we use jarjar to repackage simple json, to avoid clashes with 3rd party maven plugins possibly including it in their dependencies -->
4949
<taskdef name="jarjar" classname="org.pantsbuild.jarjar.JarJarTask" loaderref="lib.path.loader">
5050
<classpath>
51-
<pathelement location="${libs.asm.dir}/core/asm-9.10.1.jar"/>
52-
<pathelement location="${libs.asm.dir}/core/asm-commons-9.10.1.jar"/>
51+
<pathelement location="${libs.asm.dir}/core/asm-9.11.jar"/>
52+
<pathelement location="${libs.asm.dir}/core/asm-commons-9.11.jar"/>
5353
<pathelement location="./external/jarjar-1.7.2.jar"/>
5454
</classpath>
5555
</taskdef>

‎nbbuild/templates/common.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@
8282
<tstamp>
8383
<format property="module.build.started.time" pattern="yyyy-MM-dd'T'HH:mm:ss.SSSZ"/>
8484
</tstamp>
85-
<condition property="asm.jar" value="${nbplatform.active.dir}/platform/core/asm-9.10.1.jar">
86-
<available file="${nbplatform.active.dir}/platform/core/asm-9.10.1.jar"/>
85+
<condition property="asm.jar" value="${nbplatform.active.dir}/platform/core/asm-9.11.jar">
86+
<available file="${nbplatform.active.dir}/platform/core/asm-9.11.jar"/>
8787
</condition>
88-
<property name="asm.jar" location="${platform/libs.asm.dir}/core/asm-9.10.1.jar"/>
88+
<property name="asm.jar" location="${platform/libs.asm.dir}/core/asm-9.11.jar"/>
8989
<property name="tsaurl" value=""/>
9090
<property name="tsacert" value=""/>
9191
</target>

platform/libs.asm/external/asm-9.10.1-license.txt renamed to platform/libs.asm/external/asm-9.11-license.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Name: OW2 ASM
2-
Version: 9.10.1
3-
Files: asm-tree-9.10.1.jar asm-commons-9.10.1.jar asm-9.10.1.jar
2+
Version: 9.11
3+
Files: asm-tree-9.11.jar asm-commons-9.11.jar asm-9.11.jar
44
License: BSD-INRIA
55
Origin: OW2 Consortium
66
URL: https://repository.ow2.org/nexus/content/repositories/releases/org/ow2/asm/

‎platform/libs.asm/external/binaries-list‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
ADA2141C0CC52EE8F5C48CD5FA4CE0E794F22236 org.ow2.asm:asm:9.10.1
18-
E244332A17564C1D1572449399A842DE35881BE2 org.ow2.asm:asm-tree:9.10.1
19-
4229E4C55FD8E01C23F9FE9884075CC628AACC50 org.ow2.asm:asm-commons:9.10.1
17+
2A2C870691D2220EB93492C88FDCD3711AB0FADB org.ow2.asm:asm:9.11
18+
2E0298E7C0986F94E161DE26D108C78D20547935 org.ow2.asm:asm-tree:9.11
19+
07DDFA7D6CEE28F627AF0BD246EF046E24E1B02A org.ow2.asm:asm-commons:9.11

‎platform/libs.asm/nbproject/project.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ javac.compilerargs=-Xlint -Xlint:-serial
1919
javac.release=17
2020
module.jar.dir=core
2121

22-
release.external/asm-9.10.1.jar=core/asm-9.10.1.jar
23-
release.external/asm-tree-9.10.1.jar=core/asm-tree-9.10.1.jar
24-
release.external/asm-commons-9.10.1.jar=core/asm-commons-9.10.1.jar
25-
license.file=../external/asm-9.10.1-license.txt
22+
release.external/asm-9.11.jar=core/asm-9.11.jar
23+
release.external/asm-tree-9.11.jar=core/asm-tree-9.11.jar
24+
release.external/asm-commons-9.11.jar=core/asm-commons-9.11.jar
25+
license.file=../external/asm-9.11-license.txt
2626

‎platform/libs.asm/nbproject/project.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@
2929
<subpackages>org</subpackages>
3030
</public-packages>
3131
<class-path-extension>
32-
<runtime-relative-path>asm-9.10.1.jar</runtime-relative-path>
33-
<binary-origin>external/asm-9.10.1.jar</binary-origin>
32+
<runtime-relative-path>asm-9.11.jar</runtime-relative-path>
33+
<binary-origin>external/asm-9.11.jar</binary-origin>
3434
</class-path-extension>
3535
<class-path-extension>
36-
<runtime-relative-path>asm-tree-9.10.1.jar</runtime-relative-path>
37-
<binary-origin>external/asm-tree-9.10.1.jar</binary-origin>
36+
<runtime-relative-path>asm-tree-9.11.jar</runtime-relative-path>
37+
<binary-origin>external/asm-tree-9.11.jar</binary-origin>
3838
</class-path-extension>
3939
<class-path-extension>
40-
<runtime-relative-path>asm-commons-9.10.1.jar</runtime-relative-path>
41-
<binary-origin>external/asm-commons-9.10.1.jar</binary-origin>
40+
<runtime-relative-path>asm-commons-9.11.jar</runtime-relative-path>
41+
<binary-origin>external/asm-commons-9.11.jar</binary-origin>
4242
</class-path-extension>
4343
</data>
4444
</configuration>

0 commit comments

Comments
 (0)