Releng: adjust asm dependency to latest in orbit: 8.0.1
diff --git a/features/org.eclipse.objectteams.otequinox.feature/feature.xml b/features/org.eclipse.objectteams.otequinox.feature/feature.xml
index 5624717..da68eec 100644
--- a/features/org.eclipse.objectteams.otequinox.feature/feature.xml
+++ b/features/org.eclipse.objectteams.otequinox.feature/feature.xml
@@ -57,35 +57,35 @@
id="org.objectweb.asm"
download-size="0"
install-size="0"
- version="7.2.0.v20191010-1910"
+ version="8.0.1.v20200420-1007"
unpack="false"/>
<plugin
id="org.objectweb.asm.tree"
download-size="0"
install-size="0"
- version="7.2.0.v20191010-1910"
+ version="8.0.1.v20200420-1007"
unpack="false"/>
<plugin
id="org.objectweb.asm.commons"
download-size="0"
install-size="0"
- version="7.2.0.v20191010-1910"
+ version="8.0.1.v20200420-1007"
unpack="false"/>
<plugin
id="org.objectweb.asm.util"
download-size="0"
install-size="0"
- version="7.2.0.v20191010-1910"
+ version="8.0.1.v20200420-1007"
unpack="false"/>
<plugin
id="org.objectweb.asm.analysis"
download-size="0"
install-size="0"
- version="7.2.0.v20191010-1910"
+ version="8.0.1.v20200420-1007"
unpack="false"/>
<plugin
diff --git a/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
index d54572d..b49e95f 100644
--- a/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otequinox/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.objectteams.otequinox;singleton:=true
Automatic-Module-Name: org.eclipse.objectteams.otequinox
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.8.1.qualifier
Bundle-Activator: org.eclipse.objectteams.otequinox.TransformerPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -13,7 +13,7 @@
org.eclipse.objectteams.otredyn;bundle-version="[1.4.0,2.0.0)",
org.eclipse.osgi;bundle-version="[3.10.0,4.0.0)",
org.eclipse.jdt.annotation;bundle-version="[2.2.0,3.0.0)";resolution:=optional,
- org.objectweb.asm;bundle-version="[7.0.0,8.0.0)"
+ org.objectweb.asm;bundle-version="[8.0.1,9.0.0)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.objectteams.otequinox
diff --git a/plugins/org.eclipse.objectteams.otequinox/META-INF/p2.inf b/plugins/org.eclipse.objectteams.otequinox/META-INF/p2.inf
index ece15c7..8420c70 100644
--- a/plugins/org.eclipse.objectteams.otequinox/META-INF/p2.inf
+++ b/plugins/org.eclipse.objectteams.otequinox/META-INF/p2.inf
@@ -4,11 +4,11 @@
units.0.id = org.eclipse.objectteams.otequinox.configuration
-units.0.version = 2.8.0.$qualifier$
+units.0.version = 2.8.1.$qualifier$
units.0.hostRequirements.0.namespace=osgi.bundle
units.0.hostRequirements.0.name=org.eclipse.objectteams.otequinox
-units.0.hostRequirements.0.range=[2.8.0,3.0.0)
+units.0.hostRequirements.0.range=[2.8.1,3.0.0)
units.0.hostRequirements.1.namespace = org.eclipse.equinox.p2.eclipse.type
units.0.hostRequirements.1.name = bundle
units.0.hostRequirements.1.range = [1.0.0,2.0.0)
@@ -17,7 +17,7 @@
units.0.properties.0.value = true
units.0.requires.0.namespace = osgi.bundle
units.0.requires.0.name = org.eclipse.objectteams.otequinox
-units.0.requires.0.range = [2.8.0,3.0.0)
+units.0.requires.0.range = [2.8.1,3.0.0)
units.0.requires.1.namespace = org.eclipse.equinox.p2.eclipse.type
units.0.requires.1.name = bundle
@@ -26,7 +26,7 @@
units.0.provides.0.namespace = org.eclipse.equinox.p2.iu
units.0.provides.0.name = org.eclipse.objectteams.otequinox.configuration
-units.0.provides.0.version = 2.8.0.$qualifier$
+units.0.provides.0.version = 2.8.1.$qualifier$
units.0.instructions.install=\
installBundle(bundle:${artifact})
diff --git a/plugins/org.eclipse.objectteams.otequinox/about.ini b/plugins/org.eclipse.objectteams.otequinox/about.ini
index e4f7cae..e899049 100644
--- a/plugins/org.eclipse.objectteams.otequinox/about.ini
+++ b/plugins/org.eclipse.objectteams.otequinox/about.ini
@@ -1,8 +1,8 @@
aboutText=Object Teams -- Equinox integration (OT/Equinox)\n\
\n\
-Version: 2.8.0\n\
+Version: 2.8.1\n\
\n\
-Part of Eclipse SimRel 2020-03\n\
+Part of Eclipse SimRel 2020-06\n\
\n\
(c) Copyright Technical University Berlin and others, 2005, 2020\n\
Visit http://www.eclipse.org/objectteams\n\
diff --git a/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF b/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF
index 1f04c7f..54d46c7 100644
--- a/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.objectteams.otredyn/META-INF/MANIFEST.MF
@@ -15,9 +15,9 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ClassPath: .
Require-Bundle: org.eclipse.objectteams.runtime;bundle-version="[2.8.0,3.0.0)",
- org.objectweb.asm;bundle-version="[7.1.0,8.0.0)",
- org.objectweb.asm.tree;bundle-version="[7.1.0,8.0.0)",
- org.objectweb.asm.commons;bundle-version="[7.1.0,8.0.0)",
- org.objectweb.asm.util;bundle-version="[7.1.0,8.9.0)",
- org.objectweb.asm.analysis;bundle-version="[7.1.0,8.0.0)",
+ org.objectweb.asm;bundle-version="[8.0.1,9.0.0)",
+ org.objectweb.asm.tree;bundle-version="[8.0.1,9.0.0)",
+ org.objectweb.asm.commons;bundle-version="[8.0.1,9.0.0)",
+ org.objectweb.asm.util;bundle-version="[8.0.1,9.0.0)",
+ org.objectweb.asm.analysis;bundle-version="[8.0.1,9.0.0)",
org.eclipse.jdt.annotation;bundle-version="2.2.400";resolution:=optional
diff --git a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/AsmBoundClass.java b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/AsmBoundClass.java
index c7859e3..5581c65 100644
--- a/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/AsmBoundClass.java
+++ b/plugins/org.eclipse.objectteams.otredyn/src/org/eclipse/objectteams/otredyn/bytecode/asm/AsmBoundClass.java
@@ -40,7 +40,7 @@
*/
public abstract class AsmBoundClass extends AbstractTeam {
- public static final int ASM_API = Opcodes.ASM7;
+ public static final int ASM_API = Opcodes.ASM8;
private static final int DEFAULT_BUFFER_SIZE = 8192;
private static final int MAX_BUFFER_SIZE = Integer.MAX_VALUE - 8;
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index 18fcdd3..bb8f5f7 100644
--- a/releng/map/otdt.map.in
+++ b/releng/map/otdt.map.in
@@ -24,7 +24,7 @@
plugin@org.eclipse.objectteams.otre=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otre,tag=builds/201806120901
plugin@org.eclipse.objectteams.otredyn=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otredyn
!the following is also referenced in otdt.doc/buildDoc.xml (plugin-name without version):
-plugin@org.eclipse.objectteams.otequinox=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox,tag=builds/202003100937
+plugin@org.eclipse.objectteams.otequinox=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox
fragment@org.eclipse.objectteams.otequinox.turbo=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.turbo,tag=builds/201506091717
plugin@org.eclipse.objectteams.eclipse.monitor=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.eclipse.monitor,tag=builds/201606070956
@@ -47,11 +47,11 @@
!** Consume BCEL from Orbit: **!
plugin@org.apache.bcel,5.2.0=p2IU,id=org.apache.bcel,version=5.2.0.v201005080400,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository
!** ASM from Orbit: **!
-plugin@org.objectweb.asm,7.2.0=p2IU,id=org.objectweb.asm,version=7.2.0.v20191010-1910,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/
-plugin@org.objectweb.asm.tree,7.2.0=p2IU,id=org.objectweb.asm.tree,version=7.2.0.v20191010-1910,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/
-plugin@org.objectweb.asm.commons,7.2.0=p2IU,id=org.objectweb.asm.commons,version=7.2.0.v20191010-1910,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/
-plugin@org.objectweb.asm.util,7.2.0=p2IU,id=org.objectweb.asm.util,version=7.2.0.v20191010-1910,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/
-plugin@org.objectweb.asm.analysis,7.2.0=p2IU,id=org.objectweb.asm.analysis,version=7.2.0.v20191010-1910,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/
+plugin@org.objectweb.asm,7.2.0=p2IU,id=org.objectweb.asm,version=8.0.1.v20200420-1007,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/
+plugin@org.objectweb.asm.tree,7.2.0=p2IU,id=org.objectweb.asm.tree,version=8.0.1.v20200420-1007,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/
+plugin@org.objectweb.asm.commons,7.2.0=p2IU,id=org.objectweb.asm.commons,version=8.0.1.v20200420-1007,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/
+plugin@org.objectweb.asm.util,7.2.0=p2IU,id=org.objectweb.asm.util,version=8.0.1.v20200420-1007,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/
+plugin@org.objectweb.asm.analysis,7.2.0=p2IU,id=org.objectweb.asm.analysis,version=8.0.1.v20200420-1007,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/
plugin@org.mockito,1.9.5=p2IU,id=org.mockito,version=1.9.5.v201605172210,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/
plugin@org.hamcrest.core,1.3.0=p2IU,id=org.hamcrest.core,version=1.3.0.v20180420-1519,repository=https://download.eclipse.org/tools/orbit/downloads/drops/S20200406151314/repository/