Skip to content

Commit ca2b632

Browse files
author
vsilaev
committed
Make FastClassVerifier upfront compatible with ASM 6.x; reduce log level for skipped Java classes in transformation agents;
1 parent 07d1715 commit ca2b632

File tree

25 files changed

+178
-114
lines changed

25 files changed

+178
-114
lines changed

‎net.tascalate.javaflow.api/.classpath‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
<attribute name="maven.pomderived" value="true"/>
2828
</attributes>
2929
</classpathentry>
30-
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
30+
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar"/>
3131
<classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar" sourcepath="M2_REPO/junit/junit/4.11/junit-4.11-sources.jar"/>
32-
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
32+
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar"/>
3333
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
3434
<attributes>
3535
<attribute name="maven.pomderived" value="true"/>

‎net.tascalate.javaflow.api/.project‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
33
<name>net.tascalate.javaflow.api</name>
4-
<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
4+
<comment>Continuations / CoRoutines library for Java 1.5 - 1.8, incl. build tools &amp; CDI support.
5+
This project is based on completely re-worked Apache Jakarta Commons JavaFlow library. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
56
<projects/>
67
<buildSpec>
78
<buildCommand>

‎net.tascalate.javaflow.providers.asm3/.classpath‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
<attribute name="maven.pomderived" value="true"/>
2828
</attributes>
2929
</classpathentry>
30-
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
30+
<classpathentry kind="src" path="/net.tascalate.javaflow.spi"/>
3131
<classpathentry kind="var" path="M2_REPO/asm/asm-commons/3.3.1/asm-commons-3.3.1.jar"/>
3232
<classpathentry kind="var" path="M2_REPO/asm/asm-tree/3.3.1/asm-tree-3.3.1.jar"/>
3333
<classpathentry kind="var" path="M2_REPO/asm/asm/3.3.1/asm-3.3.1.jar"/>
3434
<classpathentry kind="var" path="M2_REPO/asm/asm-analysis/3.3.1/asm-analysis-3.3.1.jar"/>
3535
<classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar" sourcepath="M2_REPO/junit/junit/4.11/junit-4.11-sources.jar"/>
36-
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
36+
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar"/>
3737
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
3838
<attributes>
3939
<attribute name="maven.pomderived" value="true"/>

‎net.tascalate.javaflow.providers.asm3/.project‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
33
<name>net.tascalate.javaflow.providers.asm3</name>
4-
<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
4+
<comment>Continuations / CoRoutines library for Java 1.5 - 1.8, incl. build tools &amp; CDI support.
5+
This project is based on completely re-worked Apache Jakarta Commons JavaFlow library. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
6+
<projects>
7+
<project>net.tascalate.javaflow.spi</project>
8+
</projects>
59
<buildSpec>
610
<buildCommand>
711
<name>org.eclipse.jdt.core.javabuilder</name>

‎net.tascalate.javaflow.providers.asm4/.classpath‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
<attribute name="maven.pomderived" value="true"/>
2828
</attributes>
2929
</classpathentry>
30-
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
30+
<classpathentry kind="src" path="/net.tascalate.javaflow.spi"/>
3131
<classpathentry kind="var" path="M2_REPO/org/ow2/asm/asm/4.2/asm-4.2.jar"/>
3232
<classpathentry kind="var" path="M2_REPO/org/ow2/asm/asm-analysis/4.2/asm-analysis-4.2.jar"/>
3333
<classpathentry kind="var" path="M2_REPO/org/ow2/asm/asm-tree/4.2/asm-tree-4.2.jar"/>
3434
<classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar" sourcepath="M2_REPO/junit/junit/4.11/junit-4.11-sources.jar"/>
35-
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
35+
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar"/>
3636
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
3737
<attributes>
3838
<attribute name="maven.pomderived" value="true"/>

‎net.tascalate.javaflow.providers.asm4/.project‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
33
<name>net.tascalate.javaflow.providers.asm4</name>
4-
<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
4+
<comment>Continuations / CoRoutines library for Java 1.5 - 1.8, incl. build tools &amp; CDI support.
5+
This project is based on completely re-worked Apache Jakarta Commons JavaFlow library. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
56
<projects>
7+
<project>net.tascalate.javaflow.spi</project>
68
</projects>
79
<buildSpec>
810
<buildCommand>

‎net.tascalate.javaflow.providers.asm5/.classpath‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
<attribute name="maven.pomderived" value="true"/>
2828
</attributes>
2929
</classpathentry>
30-
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2.jar"/>
31-
<classpathentry kind="var" path="M2_REPO/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar"/>
32-
<classpathentry kind="var" path="M2_REPO/org/ow2/asm/asm-analysis/5.0.4/asm-analysis-5.0.4.jar"/>
33-
<classpathentry kind="var" path="M2_REPO/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar"/>
30+
<classpathentry kind="src" path="/net.tascalate.javaflow.spi"/>
31+
<classpathentry kind="var" path="M2_REPO/org/ow2/asm/asm/5.2/asm-5.2.jar"/>
32+
<classpathentry kind="var" path="M2_REPO/org/ow2/asm/asm-analysis/5.2/asm-analysis-5.2.jar"/>
33+
<classpathentry kind="var" path="M2_REPO/org/ow2/asm/asm-tree/5.2/asm-tree-5.2.jar"/>
3434
<classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar" sourcepath="M2_REPO/junit/junit/4.11/junit-4.11-sources.jar"/>
35-
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
35+
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar"/>
3636
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
3737
<attributes>
3838
<attribute name="maven.pomderived" value="true"/>

‎net.tascalate.javaflow.providers.asm5/.project‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
33
<name>net.tascalate.javaflow.providers.asm5</name>
4-
<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
4+
<comment>Continuations / CoRoutines library for Java 1.5 - 1.8, incl. build tools &amp; CDI support.
5+
This project is based on completely re-worked Apache Jakarta Commons JavaFlow library. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
56
<projects>
7+
<project>net.tascalate.javaflow.spi</project>
68
</projects>
79
<buildSpec>
810
<buildCommand>

‎net.tascalate.javaflow.providers.asm5/src/main/java/org/apache/commons/javaflow/providers/asm5/FastClassVerifier.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
*/
2424
package org.apache.commons.javaflow.providers.asm5;
2525

26+
import java.util.Collections;
27+
2628
import org.objectweb.asm.Type;
2729
import org.objectweb.asm.tree.analysis.BasicValue;
2830
import org.objectweb.asm.tree.analysis.SimpleVerifier;
@@ -31,6 +33,7 @@ public class FastClassVerifier extends SimpleVerifier {
3133
private final InheritanceLookup inheritanceLookup;
3234

3335
public FastClassVerifier(InheritanceLookup inheritanceLookup) {
36+
super(ASM5, Type.VOID_TYPE, Type.VOID_TYPE, Collections.emptyList(), false);
3437
this.inheritanceLookup = inheritanceLookup;
3538
}
3639

‎net.tascalate.javaflow.spi/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</attributes>
2929
</classpathentry>
3030
<classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar" sourcepath="M2_REPO/junit/junit/4.11/junit-4.11-sources.jar"/>
31-
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
31+
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar"/>
3232
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
3333
<attributes>
3434
<attribute name="maven.pomderived" value="true"/>

0 commit comments

Comments
 (0)