Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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">ADA2141C0CC52EE8F5C48CD5FA4CE0E794F22236 org.ow2.asm:asm:9.10.1</echo>
<echo file="build/binaries-list">2A2C870691D2220EB93492C88FDCD3711AB0FADB org.ow2.asm:asm:9.11</echo>
<TestDownload server="${binaries.server}" repos="${binaries.repos}">
<manifest dir="build">
<include name="binaries-list"/>
</manifest>
</TestDownload>
<delete file="build/asm-9.10.1.jar"/>
<delete file="build/asm-9.11.jar"/>
</target>

<target name="compile-jnlp-launcher" depends="init,compile">
Expand Down
6 changes: 3 additions & 3 deletions ide/o.n.agent/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ javac.compilerargs=-Xlint -Xlint:-serial
agent.src.dir=src-agent
agent.build.classes.dir=${build.dir}/agent/classes/
agent.jar=${cluster}/netbeans-javaagent.jar
agent.asm.lib.1=../../platform/libs.asm/external/asm-commons-9.10.1.jar
agent.asm.lib.2=../../platform/libs.asm/external/asm-tree-9.10.1.jar
agent.asm.lib.3=../../platform/libs.asm/external/asm-9.10.1.jar
agent.asm.lib.1=../../platform/libs.asm/external/asm-commons-9.11.jar
agent.asm.lib.2=../../platform/libs.asm/external/asm-tree-9.11.jar
agent.asm.lib.3=../../platform/libs.asm/external/asm-9.11.jar
agent.cp=${agent.asm.lib.1}:${agent.asm.lib.2}:${agent.asm.lib.3}

extra.module.files=${cluster}/netbeans-javaagent.jar
2 changes: 1 addition & 1 deletion java/lib.jshell.agent/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ javac.compilerargs=-Xlint -Xlint:-serial
extra.module.files=modules/ext/nb-custom-jshell-probe.jar
jnlp.indirect.jars=modules/ext/nb-custom-jshell-probe.jar

agentsrc.asm.cp=${libs.asm.dir}/core/asm-9.10.1.jar
agentsrc.asm.cp=${libs.asm.dir}/core/asm-9.11.jar
4 changes: 2 additions & 2 deletions java/maven/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,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.10.1.jar"/>
<pathelement location="${libs.asm.dir}/core/asm-commons-9.10.1.jar"/>
<pathelement location="${libs.asm.dir}/core/asm-9.11.jar"/>
<pathelement location="${libs.asm.dir}/core/asm-commons-9.11.jar"/>
<pathelement location="./external/jarjar-1.7.2.jar"/>
</classpath>
</taskdef>
Expand Down
6 changes: 3 additions & 3 deletions nbbuild/templates/common.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,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.10.1.jar">
<available file="${nbplatform.active.dir}/platform/core/asm-9.10.1.jar"/>
<condition property="asm.jar" value="${nbplatform.active.dir}/platform/core/asm-9.11.jar">
<available file="${nbplatform.active.dir}/platform/core/asm-9.11.jar"/>
</condition>
<property name="asm.jar" location="${platform/libs.asm.dir}/core/asm-9.10.1.jar"/>
<property name="asm.jar" location="${platform/libs.asm.dir}/core/asm-9.11.jar"/>
<property name="tsaurl" value=""/>
<property name="tsacert" value=""/>
</target>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: OW2 ASM
Version: 9.10.1
Files: asm-tree-9.10.1.jar asm-commons-9.10.1.jar asm-9.10.1.jar
Version: 9.11
Files: asm-tree-9.11.jar asm-commons-9.11.jar asm-9.11.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
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.
ADA2141C0CC52EE8F5C48CD5FA4CE0E794F22236 org.ow2.asm:asm:9.10.1
E244332A17564C1D1572449399A842DE35881BE2 org.ow2.asm:asm-tree:9.10.1
4229E4C55FD8E01C23F9FE9884075CC628AACC50 org.ow2.asm:asm-commons:9.10.1
2A2C870691D2220EB93492C88FDCD3711AB0FADB org.ow2.asm:asm:9.11
2E0298E7C0986F94E161DE26D108C78D20547935 org.ow2.asm:asm-tree:9.11
07DDFA7D6CEE28F627AF0BD246EF046E24E1B02A org.ow2.asm:asm-commons:9.11
8 changes: 4 additions & 4 deletions platform/libs.asm/nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ javac.compilerargs=-Xlint -Xlint:-serial
javac.release=17
module.jar.dir=core

release.external/asm-9.10.1.jar=core/asm-9.10.1.jar
release.external/asm-tree-9.10.1.jar=core/asm-tree-9.10.1.jar
release.external/asm-commons-9.10.1.jar=core/asm-commons-9.10.1.jar
license.file=../external/asm-9.10.1-license.txt
release.external/asm-9.11.jar=core/asm-9.11.jar
release.external/asm-tree-9.11.jar=core/asm-tree-9.11.jar
release.external/asm-commons-9.11.jar=core/asm-commons-9.11.jar
license.file=../external/asm-9.11-license.txt

12 changes: 6 additions & 6 deletions platform/libs.asm/nbproject/project.xml
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.10.1.jar</runtime-relative-path>
<binary-origin>external/asm-9.10.1.jar</binary-origin>
<runtime-relative-path>asm-9.11.jar</runtime-relative-path>
<binary-origin>external/asm-9.11.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>asm-tree-9.10.1.jar</runtime-relative-path>
<binary-origin>external/asm-tree-9.10.1.jar</binary-origin>
<runtime-relative-path>asm-tree-9.11.jar</runtime-relative-path>
<binary-origin>external/asm-tree-9.11.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>asm-commons-9.10.1.jar</runtime-relative-path>
<binary-origin>external/asm-commons-9.10.1.jar</binary-origin>
<runtime-relative-path>asm-commons-9.11.jar</runtime-relative-path>
<binary-origin>external/asm-commons-9.11.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
Loading