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.7 to 9.7.1 #7886

Merged
merged 1 commit into from
Oct 20, 2024
Merged

Update ASM from 9.7 to 9.7.1 #7886

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
4 changes: 2 additions & 2 deletions harness/apisupport.harness/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
<pathelement location="${cluster}/tasks.jar"></pathelement>
</classpath>
</taskdef>
<echo file="build/binaries-list">073D7B3086E14BEB604CED229C302FEFF6449723 org.ow2.asm:asm:9.7</echo>
<echo file="build/binaries-list">F0ED132A49244B042CD0E15702AB9F2CE3CC8436 org.ow2.asm:asm:9.7.1</echo>
<TestDownload>
<manifest dir="build">
<include name="binaries-list"/>
</manifest>
</TestDownload>
<delete file="build/asm-9.7.jar"/>
<delete file="build/asm-9.7.1.jar"/>
</target>

<target name="compile-jnlp-launcher" depends="init,compile">
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.7.jar
agentsrc.asm.cp=${libs.asm.dir}/core/asm-9.7.1.jar
agentsrc.jshell.cp=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 @@ -55,8 +55,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.7.jar"/>
<pathelement location="${libs.asm.dir}/core/asm-commons-9.7.jar"/>
<pathelement location="${libs.asm.dir}/core/asm-9.7.1.jar"/>
<pathelement location="${libs.asm.dir}/core/asm-commons-9.7.1.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 @@ -80,10 +80,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.7.jar">
<available file="${nbplatform.active.dir}/platform/core/asm-9.7.jar"/>
<condition property="asm.jar" value="${nbplatform.active.dir}/platform/core/asm-9.7.1.jar">
<available file="${nbplatform.active.dir}/platform/core/asm-9.7.1.jar"/>
</condition>
<property name="asm.jar" location="${platform/libs.asm.dir}/core/asm-9.7.jar"/>
<property name="asm.jar" location="${platform/libs.asm.dir}/core/asm-9.7.1.jar"/>
<property name="tsaurl" value=""/>
<property name="tsacert" value=""/>
</target>
Expand Down
4 changes: 2 additions & 2 deletions ...orm/libs.asm/external/asm-9.7-license.txt → ...m/libs.asm/external/asm-9.7.1-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.7
Files: asm-tree-9.7.jar asm-commons-9.7.jar asm-9.7.jar
Version: 9.7.1
Files: asm-tree-9.7.1.jar asm-commons-9.7.1.jar asm-9.7.1.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.
073D7B3086E14BEB604CED229C302FEFF6449723 org.ow2.asm:asm:9.7
E446A17B175BFB733B87C5C2560CCB4E57D69F1A org.ow2.asm:asm-tree:9.7
E86DDA4696D3C185FCC95D8D311904E7CE38A53F org.ow2.asm:asm-commons:9.7
F0ED132A49244B042CD0E15702AB9F2CE3CC8436 org.ow2.asm:asm:9.7.1
3A53139787663B139DE76B627FCA0084AB60D32C org.ow2.asm:asm-tree:9.7.1
406C6A2225CFE1819F102A161E54CC16A5C24F75 org.ow2.asm:asm-commons:9.7.1
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,8 +19,8 @@ javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.8
module.jar.dir=core

release.external/asm-9.7.jar=core/asm-9.7.jar
release.external/asm-tree-9.7.jar=core/asm-tree-9.7.jar
release.external/asm-commons-9.7.jar=core/asm-commons-9.7.jar
license.file=../external/asm-9.7-license.txt
release.external/asm-9.7.1.jar=core/asm-9.7.1.jar
release.external/asm-tree-9.7.1.jar=core/asm-tree-9.7.1.jar
release.external/asm-commons-9.7.1.jar=core/asm-commons-9.7.1.jar
license.file=../external/asm-9.7.1-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.7.jar</runtime-relative-path>
<binary-origin>external/asm-9.7.jar</binary-origin>
<runtime-relative-path>asm-9.7.1.jar</runtime-relative-path>
<binary-origin>external/asm-9.7.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>asm-tree-9.7.jar</runtime-relative-path>
<binary-origin>external/asm-tree-9.7.jar</binary-origin>
<runtime-relative-path>asm-tree-9.7.1.jar</runtime-relative-path>
<binary-origin>external/asm-tree-9.7.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>asm-commons-9.7.jar</runtime-relative-path>
<binary-origin>external/asm-commons-9.7.jar</binary-origin>
<runtime-relative-path>asm-commons-9.7.1.jar</runtime-relative-path>
<binary-origin>external/asm-commons-9.7.1.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
Loading