diff --git a/README.md b/README.md index 22dc66d..5408667 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Maven Central](https://img.shields.io/maven-central/v/net.tascalate.javaflow/net.tascalate.javaflow.parent.svg)](https://search.maven.org/artifact/net.tascalate.javaflow/net.tascalate.javaflow.parent/2.6.3/pom) [![GitHub release](https://img.shields.io/github/release/vsilaev/tascalate-javaflow.svg)](https://github.com/vsilaev/tascalate-javaflow/releases/tag/2.6.3) [![license](https://img.shields.io/github/license/vsilaev/tascalate-javaflow.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt) +[![Maven Central](https://img.shields.io/maven-central/v/net.tascalate.javaflow/net.tascalate.javaflow.parent.svg)](https://search.maven.org/artifact/net.tascalate.javaflow/net.tascalate.javaflow.parent/2.6.4/pom) [![GitHub release](https://img.shields.io/github/release/vsilaev/tascalate-javaflow.svg)](https://github.com/vsilaev/tascalate-javaflow/releases/tag/2.6.4) [![license](https://img.shields.io/github/license/vsilaev/tascalate-javaflow.svg)](http://www.apache.org/licenses/LICENSE-2.0.txt) # IMPORTANT NOTICE FOR RELEASE 2.5.0!!! Java 9+ is fully supported now, all artefacts are modular multi-release JAR-s that works correctly with Java versions 1.6 to 11. The library code was tested with JDK 11, and all features of the Java 11 bytecode (including nest of inner classes) works correctly. @@ -29,7 +29,7 @@ You have to add the following configuration to enable build-time instrumentation net.tascalate.javaflow net.tascalate.javaflow.api - 2.6.3 + 2.6.4 @@ -54,7 +54,7 @@ You have to add the following configuration to enable build-time instrumentation net.tascalate.javaflow net.tascalate.javaflow.tools.maven - 2.6.3 + 2.6.4 process-classes @@ -67,7 +67,7 @@ You have to add the following configuration to enable build-time instrumentation ``` -Note that if you are using continuations with Java 1.8 lambdas then you need to add [Tascalate JavaFlow instrumentation agent](https://github.com/vsilaev/tascalate-javaflow/releases/download/2.6.3/javaflow.instrument-continuations.jar) at run-time as command-line option, while lambda-related classes are generated by JVM on the fly and there is no other way to instrument them. If this is not an option, then you can de-sugar all lambdas with [RetroLambda](https://github.com/luontola/retrolambda) Maven plugin at build-time (RetroLambda output is supported by Tascalate JavaFlow 2.3.2 or higher). +Note that if you are using continuations with Java 1.8 lambdas then you need to add [Tascalate JavaFlow instrumentation agent](https://github.com/vsilaev/tascalate-javaflow/releases/download/2.6.4/javaflow.instrument-continuations.jar) at run-time as command-line option, while lambda-related classes are generated by JVM on the fly and there is no other way to instrument them. If this is not an option, then you can de-sugar all lambdas with [RetroLambda](https://github.com/luontola/retrolambda) Maven plugin at build-time (RetroLambda output is supported by Tascalate JavaFlow 2.3.2 or higher). Please refer to [pom.xml](https://github.com/vsilaev/tascalate-javaflow-examples/blob/master/net.tascalate.javaflow.examples.common/pom.xml) in examples project for typical Maven configuration @@ -93,10 +93,10 @@ It's possibe to instrument compiled Java classes as below: ``` -You may download a complete [examples project setup](https://github.com/vsilaev/tascalate-javaflow-examples/releases/download/1.0.9/tascalate-javaflow-ant-project-setup1.zip) from [the latest release](https://github.com/vsilaev/tascalate-javaflow-examples/releases/tag/1.0.9) for complete configuration template. Please pay attention to ant-lib folder with Ant TaskDef and lib folders with compile-/runtime-dependencies. +You may download a complete [examples project setup](https://github.com/vsilaev/tascalate-javaflow-examples/releases/download/1.0.10/tascalate-javaflow-ant-project-setup1.zip) from [the latest release](https://github.com/vsilaev/tascalate-javaflow-examples/releases/tag/1.0.10) for complete configuration template. Please pay attention to ant-lib folder with Ant TaskDef and lib folders with compile-/runtime-dependencies. # Java Instrumentation Agent (Runt-time Instrumentation) -As an alternative to compile-time bytecode instrumentation, you MAY use [Tascalate JavaFlow Instrumentation Agent](https://github.com/vsilaev/tascalate-javaflow/releases/download/2.6.3/javaflow.instrument-continuations.jar) from [the latest release](https://github.com/vsilaev/tascalate-javaflow/releases/tag/2.6.3) to enable continuations support at class-loading time. Please note, that if you are using Java 8 and creating continuable lambda functions (either anonymous or/and as method references), and you don't replace them with tools like [RetroLambda](https://github.com/luontola/retrolambda) as mentioned above, then you SHOULD use this instrumentation agent always: as long as Java run-time generates implementation of functional interfaces on the fly there is no other option to instrument them. To enable Tascalate JavaFlow Instrumentation Agent please add the following arguments to Java command line: +As an alternative to compile-time bytecode instrumentation, you MAY use [Tascalate JavaFlow Instrumentation Agent](https://github.com/vsilaev/tascalate-javaflow/releases/download/2.6.4/javaflow.instrument-continuations.jar) from [the latest release](https://github.com/vsilaev/tascalate-javaflow/releases/tag/2.6.4) to enable continuations support at class-loading time. Please note, that if you are using Java 8 and creating continuable lambda functions (either anonymous or/and as method references), and you don't replace them with tools like [RetroLambda](https://github.com/luontola/retrolambda) as mentioned above, then you SHOULD use this instrumentation agent always: as long as Java run-time generates implementation of functional interfaces on the fly there is no other option to instrument them. To enable Tascalate JavaFlow Instrumentation Agent please add the following arguments to Java command line: ```bash java -javaagent:/javaflow.instrument-continuations.jar ``` @@ -105,7 +105,7 @@ The agent JAR file includes all necessary dependencies and requires no additiona Another useful application of the instrumentation agent is to apply it for debugging code within your IDE of choice. Just specify the "-javaagent" option listed above in your IDE debug/run configuration and you will be able to perform quick "debug-fix" loops without executing full project rebuild. # Command-line tools -It's possible to use a stand-alone command-line utility [JavaFlowRewriteJar.jar](https://github.com/vsilaev/tascalate-javaflow/releases/download/2.6.3/JavaFlowRewriteJar.jar) to instrument JAR archives containing continuable classes. Please use the following command: +It's possible to use a stand-alone command-line utility [JavaFlowRewriteJar.jar](https://github.com/vsilaev/tascalate-javaflow/releases/download/2.6.4/JavaFlowRewriteJar.jar) to instrument JAR archives containing continuable classes. Please use the following command: ```bash java -jar JavaFlowRewriteJar.jar src1.jar dst1.jar src2.jar dst2.jar... @@ -113,7 +113,7 @@ It's possible to use a stand-alone command-line utility [JavaFlowRewriteJar.jar] Note, that the source and the destination should be different files. # CDI Support -To work correctly in CDI environment continuable methods should be advised only by continuation-aware CDI proxies (interceptors, scope proxies, etc). Obviously, generation of these proxies is out of our control. Plus, major CDI containers (JBoss Weld and Apache OpenWebBeans) generates such proxies dynamically at run-time. Therefore if you plan to use Tascalate JavaFlow continuations with managed beans' methods then it's necessary to instrument CDI-specific proxies with [javaflow.instrument-cdi-proxy.jar](https://github.com/vsilaev/tascalate-javaflow/releases/download/2.6.3/javaflow.instrument-cdi-proxy.jar) Java Agent: +To work correctly in CDI environment continuable methods should be advised only by continuation-aware CDI proxies (interceptors, scope proxies, etc). Obviously, generation of these proxies is out of our control. Plus, major CDI containers (JBoss Weld and Apache OpenWebBeans) generates such proxies dynamically at run-time. Therefore if you plan to use Tascalate JavaFlow continuations with managed beans' methods then it's necessary to instrument CDI-specific proxies with [javaflow.instrument-cdi-proxy.jar](https://github.com/vsilaev/tascalate-javaflow/releases/download/2.6.4/javaflow.instrument-cdi-proxy.jar) Java Agent: ```bash java -javaagent:/javaflow.instrument-cdi-proxy.jar ``` diff --git a/net.tascalate.javaflow.api/.classpath b/net.tascalate.javaflow.api/.classpath index 61b4652..4394160 100644 --- a/net.tascalate.javaflow.api/.classpath +++ b/net.tascalate.javaflow.api/.classpath @@ -2,15 +2,15 @@ - + - + @@ -24,13 +24,12 @@ - + - - + diff --git a/net.tascalate.javaflow.api/.project b/net.tascalate.javaflow.api/.project index 8470695..21aad3e 100644 --- a/net.tascalate.javaflow.api/.project +++ b/net.tascalate.javaflow.api/.project @@ -5,24 +5,15 @@ 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. - - org.eclipse.wst.common.project.facet.core.builder - org.eclipse.jdt.core.javabuilder - - org.eclipse.wst.validation.validationbuilder - org.eclipse.m2e.core.maven2Builder - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature \ No newline at end of file diff --git a/net.tascalate.javaflow.api/.settings/org.eclipse.jdt.core.prefs b/net.tascalate.javaflow.api/.settings/org.eclipse.jdt.core.prefs index 552c396..8b6c44c 100644 --- a/net.tascalate.javaflow.api/.settings/org.eclipse.jdt.core.prefs +++ b/net.tascalate.javaflow.api/.settings/org.eclipse.jdt.core.prefs @@ -8,7 +8,9 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.6 diff --git a/net.tascalate.javaflow.api/pom.xml b/net.tascalate.javaflow.api/pom.xml index a763dbc..f92df4a 100644 --- a/net.tascalate.javaflow.api/pom.xml +++ b/net.tascalate.javaflow.api/pom.xml @@ -4,7 +4,7 @@ net.tascalate.javaflow net.tascalate.javaflow.parent - 2.6.3 + 2.6.4 ../ diff --git a/net.tascalate.javaflow.providers.asm3/.settings/org.eclipse.jdt.core.prefs b/net.tascalate.javaflow.providers.asm3/.settings/org.eclipse.jdt.core.prefs index 00398c4..71e67c6 100644 --- a/net.tascalate.javaflow.providers.asm3/.settings/org.eclipse.jdt.core.prefs +++ b/net.tascalate.javaflow.providers.asm3/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.6 diff --git a/net.tascalate.javaflow.providers.asm3/pom.xml b/net.tascalate.javaflow.providers.asm3/pom.xml index 97b7805..82a8d1b 100644 --- a/net.tascalate.javaflow.providers.asm3/pom.xml +++ b/net.tascalate.javaflow.providers.asm3/pom.xml @@ -4,7 +4,7 @@ net.tascalate.javaflow net.tascalate.javaflow.parent - 2.6.3 + 2.6.4 ../ diff --git a/net.tascalate.javaflow.providers.asm4/.settings/org.eclipse.jdt.core.prefs b/net.tascalate.javaflow.providers.asm4/.settings/org.eclipse.jdt.core.prefs index 00398c4..71e67c6 100644 --- a/net.tascalate.javaflow.providers.asm4/.settings/org.eclipse.jdt.core.prefs +++ b/net.tascalate.javaflow.providers.asm4/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.6 diff --git a/net.tascalate.javaflow.providers.asm4/pom.xml b/net.tascalate.javaflow.providers.asm4/pom.xml index 8c9f57c..d1fcb18 100644 --- a/net.tascalate.javaflow.providers.asm4/pom.xml +++ b/net.tascalate.javaflow.providers.asm4/pom.xml @@ -4,7 +4,7 @@ net.tascalate.javaflow net.tascalate.javaflow.parent - 2.6.3 + 2.6.4 ../ diff --git a/net.tascalate.javaflow.providers.asm5/.settings/org.eclipse.jdt.core.prefs b/net.tascalate.javaflow.providers.asm5/.settings/org.eclipse.jdt.core.prefs index 0be11e5..224450e 100644 --- a/net.tascalate.javaflow.providers.asm5/.settings/org.eclipse.jdt.core.prefs +++ b/net.tascalate.javaflow.providers.asm5/.settings/org.eclipse.jdt.core.prefs @@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -66,6 +67,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled diff --git a/net.tascalate.javaflow.providers.asm5/pom.xml b/net.tascalate.javaflow.providers.asm5/pom.xml index 9f9481e..2612a56 100644 --- a/net.tascalate.javaflow.providers.asm5/pom.xml +++ b/net.tascalate.javaflow.providers.asm5/pom.xml @@ -4,7 +4,7 @@ net.tascalate.javaflow net.tascalate.javaflow.parent - 2.6.3 + 2.6.4 ../ diff --git a/net.tascalate.javaflow.providers.asmx/.settings/org.eclipse.jdt.core.prefs b/net.tascalate.javaflow.providers.asmx/.settings/org.eclipse.jdt.core.prefs index 0be11e5..224450e 100644 --- a/net.tascalate.javaflow.providers.asmx/.settings/org.eclipse.jdt.core.prefs +++ b/net.tascalate.javaflow.providers.asmx/.settings/org.eclipse.jdt.core.prefs @@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -66,6 +67,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled diff --git a/net.tascalate.javaflow.providers.asmx/pom.xml b/net.tascalate.javaflow.providers.asmx/pom.xml index 63b605b..192c194 100644 --- a/net.tascalate.javaflow.providers.asmx/pom.xml +++ b/net.tascalate.javaflow.providers.asmx/pom.xml @@ -4,7 +4,7 @@ net.tascalate.javaflow net.tascalate.javaflow.parent - 2.6.3 + 2.6.4 ../ diff --git a/net.tascalate.javaflow.providers.asmx/src/main/java/org/apache/commons/javaflow/providers/asmx/OfflineClassWriter.java b/net.tascalate.javaflow.providers.asmx/src/main/java/org/apache/commons/javaflow/providers/asmx/OfflineClassWriter.java index 6a15e49..3a2baf5 100644 --- a/net.tascalate.javaflow.providers.asmx/src/main/java/org/apache/commons/javaflow/providers/asmx/OfflineClassWriter.java +++ b/net.tascalate.javaflow.providers.asmx/src/main/java/org/apache/commons/javaflow/providers/asmx/OfflineClassWriter.java @@ -1,5 +1,5 @@ /** - * Copyright 2013-2019 Valery Silaev (http://vsilaev.com) + * Copyright 2013-2021 Valery Silaev (http://vsilaev.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ public OfflineClassWriter(ClassHierarchy classHierarchy, int flags) { this.classHierarchy = classHierarchy; } - public OfflineClassWriter(ClassHierarchy classHierarchy, ClassReader reader, int flags) { + public OfflineClassWriter(ClassHierarchy classHierarchy, @SuppressWarnings("exports") ClassReader reader, int flags) { super(reader, flags); this.classHierarchy = classHierarchy; } diff --git a/net.tascalate.javaflow.providers.asmx/src/test/java/org/apache/commons/javaflow/providers/asmx/InheritanceLookupTest.java b/net.tascalate.javaflow.providers.asmx/src/test/java/org/apache/commons/javaflow/providers/asmx/InheritanceLookupTest.java index 41b932f..b97b0a7 100644 --- a/net.tascalate.javaflow.providers.asmx/src/test/java/org/apache/commons/javaflow/providers/asmx/InheritanceLookupTest.java +++ b/net.tascalate.javaflow.providers.asmx/src/test/java/org/apache/commons/javaflow/providers/asmx/InheritanceLookupTest.java @@ -10,7 +10,6 @@ import java.io.ObjectOutput; import java.util.LinkedList; -import org.apache.commons.javaflow.providers.asmx.ClassHierarchy; import org.apache.commons.javaflow.spi.ClasspathResourceLoader; import org.junit.Before; import org.junit.Test; diff --git a/net.tascalate.javaflow.spi/.settings/org.eclipse.jdt.core.prefs b/net.tascalate.javaflow.spi/.settings/org.eclipse.jdt.core.prefs index 00398c4..71e67c6 100644 --- a/net.tascalate.javaflow.spi/.settings/org.eclipse.jdt.core.prefs +++ b/net.tascalate.javaflow.spi/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.6 diff --git a/net.tascalate.javaflow.spi/pom.xml b/net.tascalate.javaflow.spi/pom.xml index aec98bf..dce226f 100644 --- a/net.tascalate.javaflow.spi/pom.xml +++ b/net.tascalate.javaflow.spi/pom.xml @@ -4,7 +4,7 @@ net.tascalate.javaflow net.tascalate.javaflow.parent - 2.6.3 + 2.6.4 ../ diff --git a/net.tascalate.javaflow.tools.ant/.classpath b/net.tascalate.javaflow.tools.ant/.classpath index 3fd87e9..b988878 100644 --- a/net.tascalate.javaflow.tools.ant/.classpath +++ b/net.tascalate.javaflow.tools.ant/.classpath @@ -2,15 +2,15 @@ + - - + @@ -29,13 +29,20 @@ - - - + + + + + + + + + + diff --git a/net.tascalate.javaflow.tools.ant/.settings/org.eclipse.jdt.core.prefs b/net.tascalate.javaflow.tools.ant/.settings/org.eclipse.jdt.core.prefs index 00398c4..71e67c6 100644 --- a/net.tascalate.javaflow.tools.ant/.settings/org.eclipse.jdt.core.prefs +++ b/net.tascalate.javaflow.tools.ant/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.6 diff --git a/net.tascalate.javaflow.tools.ant/pom.xml b/net.tascalate.javaflow.tools.ant/pom.xml index 988e52c..a1ada60 100644 --- a/net.tascalate.javaflow.tools.ant/pom.xml +++ b/net.tascalate.javaflow.tools.ant/pom.xml @@ -4,7 +4,7 @@ net.tascalate.javaflow net.tascalate.javaflow.parent - 2.6.3 + 2.6.4 ../ diff --git a/net.tascalate.javaflow.tools.cdi-javaagent/.settings/org.eclipse.jdt.core.prefs b/net.tascalate.javaflow.tools.cdi-javaagent/.settings/org.eclipse.jdt.core.prefs index 552c396..8b6c44c 100644 --- a/net.tascalate.javaflow.tools.cdi-javaagent/.settings/org.eclipse.jdt.core.prefs +++ b/net.tascalate.javaflow.tools.cdi-javaagent/.settings/org.eclipse.jdt.core.prefs @@ -8,7 +8,9 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.6 diff --git a/net.tascalate.javaflow.tools.cdi-javaagent/pom.xml b/net.tascalate.javaflow.tools.cdi-javaagent/pom.xml index 612276d..ab4aa1d 100644 --- a/net.tascalate.javaflow.tools.cdi-javaagent/pom.xml +++ b/net.tascalate.javaflow.tools.cdi-javaagent/pom.xml @@ -4,7 +4,7 @@ net.tascalate.javaflow net.tascalate.javaflow.parent - 2.6.3 + 2.6.4 ../ diff --git a/net.tascalate.javaflow.tools.cdi-javaagent/src/main/java/module-info.java b/net.tascalate.javaflow.tools.cdi-javaagent/src/main/java/module-info.java index 7b9703e..340829b 100644 --- a/net.tascalate.javaflow.tools.cdi-javaagent/src/main/java/module-info.java +++ b/net.tascalate.javaflow.tools.cdi-javaagent/src/main/java/module-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2013-2019 Valery Silaev (http://vsilaev.com) + * Copyright 2013-2021 Valery Silaev (http://vsilaev.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,10 +23,10 @@ requires net.tascalate.asmx.tree; requires net.tascalate.asmx.tree.analysis; - requires net.tascalate.javaflow.spi; - requires net.tascalate.javaflow.providers.asmx; + requires transitive net.tascalate.javaflow.spi; + requires transitive net.tascalate.javaflow.providers.asmx; - requires transitive org.apache.commons.javaflow.instrumentation.common; + requires transitive net.tascalate.javaflow.tools.instrument; exports org.apache.commons.javaflow.instrumentation.cdi; } diff --git a/net.tascalate.javaflow.tools.instrument/.settings/org.eclipse.jdt.core.prefs b/net.tascalate.javaflow.tools.instrument/.settings/org.eclipse.jdt.core.prefs index 00398c4..71e67c6 100644 --- a/net.tascalate.javaflow.tools.instrument/.settings/org.eclipse.jdt.core.prefs +++ b/net.tascalate.javaflow.tools.instrument/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.6 diff --git a/net.tascalate.javaflow.tools.instrument/pom.xml b/net.tascalate.javaflow.tools.instrument/pom.xml index 3dd5b9d..a81c935 100644 --- a/net.tascalate.javaflow.tools.instrument/pom.xml +++ b/net.tascalate.javaflow.tools.instrument/pom.xml @@ -4,7 +4,7 @@ net.tascalate.javaflow net.tascalate.javaflow.parent - 2.6.3 + 2.6.4 ../ diff --git a/net.tascalate.javaflow.tools.instrument/src/main/java/module-info.java b/net.tascalate.javaflow.tools.instrument/src/main/java/module-info.java index 8d5606d..6c23b44 100644 --- a/net.tascalate.javaflow.tools.instrument/src/main/java/module-info.java +++ b/net.tascalate.javaflow.tools.instrument/src/main/java/module-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2013-2019 Valery Silaev (http://vsilaev.com) + * Copyright 2013-2021 Valery Silaev (http://vsilaev.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ requires org.slf4j; - requires net.tascalate.javaflow.spi; + requires transitive net.tascalate.javaflow.spi; exports org.apache.commons.javaflow.instrumentation.common; } diff --git a/net.tascalate.javaflow.tools.jar/.settings/org.eclipse.jdt.core.prefs b/net.tascalate.javaflow.tools.jar/.settings/org.eclipse.jdt.core.prefs index 00398c4..71e67c6 100644 --- a/net.tascalate.javaflow.tools.jar/.settings/org.eclipse.jdt.core.prefs +++ b/net.tascalate.javaflow.tools.jar/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.6 diff --git a/net.tascalate.javaflow.tools.jar/pom.xml b/net.tascalate.javaflow.tools.jar/pom.xml index b9c2aff..94ab0b1 100644 --- a/net.tascalate.javaflow.tools.jar/pom.xml +++ b/net.tascalate.javaflow.tools.jar/pom.xml @@ -4,7 +4,7 @@ net.tascalate.javaflow net.tascalate.javaflow.parent - 2.6.3 + 2.6.4 ../ diff --git a/net.tascalate.javaflow.tools.javaagent/.settings/org.eclipse.jdt.core.prefs b/net.tascalate.javaflow.tools.javaagent/.settings/org.eclipse.jdt.core.prefs index 00398c4..71e67c6 100644 --- a/net.tascalate.javaflow.tools.javaagent/.settings/org.eclipse.jdt.core.prefs +++ b/net.tascalate.javaflow.tools.javaagent/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.6 diff --git a/net.tascalate.javaflow.tools.javaagent/pom.xml b/net.tascalate.javaflow.tools.javaagent/pom.xml index 7ea228f..41a99f1 100644 --- a/net.tascalate.javaflow.tools.javaagent/pom.xml +++ b/net.tascalate.javaflow.tools.javaagent/pom.xml @@ -4,7 +4,7 @@ net.tascalate.javaflow net.tascalate.javaflow.parent - 2.6.3 + 2.6.4 ../ diff --git a/net.tascalate.javaflow.tools.javaagent/src/main/java/module-info.java b/net.tascalate.javaflow.tools.javaagent/src/main/java/module-info.java index d220522..6ea7ec1 100644 --- a/net.tascalate.javaflow.tools.javaagent/src/main/java/module-info.java +++ b/net.tascalate.javaflow.tools.javaagent/src/main/java/module-info.java @@ -1,5 +1,5 @@ /** - * Copyright 2013-2019 Valery Silaev (http://vsilaev.com) + * Copyright 2013-2021 Valery Silaev (http://vsilaev.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ requires net.tascalate.javaflow.spi; requires net.tascalate.javaflow.providers.asmx; - requires transitive org.apache.commons.javaflow.instrumentation.common; + requires transitive net.tascalate.javaflow.tools.instrument; exports org.apache.commons.javaflow.instrumentation; } diff --git a/net.tascalate.javaflow.tools.maven/.classpath b/net.tascalate.javaflow.tools.maven/.classpath index c394b8d..73fc683 100644 --- a/net.tascalate.javaflow.tools.maven/.classpath +++ b/net.tascalate.javaflow.tools.maven/.classpath @@ -2,15 +2,15 @@ + - - + @@ -29,13 +29,25 @@ - - - + + + + + + + + + + + + + + + diff --git a/net.tascalate.javaflow.tools.maven/.settings/org.eclipse.jdt.core.prefs b/net.tascalate.javaflow.tools.maven/.settings/org.eclipse.jdt.core.prefs index 00398c4..71e67c6 100644 --- a/net.tascalate.javaflow.tools.maven/.settings/org.eclipse.jdt.core.prefs +++ b/net.tascalate.javaflow.tools.maven/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.6 diff --git a/net.tascalate.javaflow.tools.maven/pom.xml b/net.tascalate.javaflow.tools.maven/pom.xml index ab627a1..7d8a6e4 100644 --- a/net.tascalate.javaflow.tools.maven/pom.xml +++ b/net.tascalate.javaflow.tools.maven/pom.xml @@ -4,7 +4,7 @@ net.tascalate.javaflow net.tascalate.javaflow.parent - 2.6.3 + 2.6.4 ../ diff --git a/net.tascalate.javaflow.tools.runtime/.settings/org.eclipse.jdt.core.prefs b/net.tascalate.javaflow.tools.runtime/.settings/org.eclipse.jdt.core.prefs index 00398c4..71e67c6 100644 --- a/net.tascalate.javaflow.tools.runtime/.settings/org.eclipse.jdt.core.prefs +++ b/net.tascalate.javaflow.tools.runtime/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.6 diff --git a/net.tascalate.javaflow.tools.runtime/pom.xml b/net.tascalate.javaflow.tools.runtime/pom.xml index 6e08ef0..dfce0bd 100644 --- a/net.tascalate.javaflow.tools.runtime/pom.xml +++ b/net.tascalate.javaflow.tools.runtime/pom.xml @@ -4,7 +4,7 @@ net.tascalate.javaflow net.tascalate.javaflow.parent - 2.6.3 + 2.6.4 ../ diff --git a/pom.xml b/pom.xml index 7df538f..255c8ff 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ net.tascalate.javaflow net.tascalate.javaflow.parent - 2.6.3 + 2.6.4 pom Tascalate JavFlow