Skip to content

Commit 13becb8

Browse files
committed
Fix module-info.java for agents; up SLF4J version (to beta4)
1 parent ddeb910 commit 13becb8

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ Please note, that CDI-specific agent neither requires javaflow.instrument-contin
123123
-javaagent:<path-to-jar>/javaflow.instrument-cdi-proxy.jar \
124124
<rest-of arguments>
125125
```
126-
CDI functionality is tested with JBoss Weld 2.x - 3.1.0 and Apache OpenWebBeans 1.6.x - 2.0.10. Contribution for other CDI/CDI-like containers (Spring, Google Guice, etc) is welcome.
126+
CDI functionality is tested with JBoss Weld 2.x - 3.1.1 and Apache OpenWebBeans 1.6.x - 2.0.10. Contribution for other CDI/CDI-like containers (Spring, Google Guice, etc) is welcome.
127127

128128
# More documentation & exmaples
129129
Examples of the library usage may be found in the [Tascalate JavaFlow Examples](https://github.com/vsilaev/tascalate-javaflow-examples) project. The covered topics are common tasks, inheritance, lambdas support, proxies, usage with CDI containers like JBoss Weld and Apache OpenWebBeans.

net.tascalate.javaflow.tools.cdi-javaagent/src/main/java/module-info.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
requires net.tascalate.javaflow.spi;
2727
requires net.tascalate.javaflow.providers.asmx;
28+
29+
requires transitive org.apache.commons.javaflow.instrumentation.common;
2830

2931
exports org.apache.commons.javaflow.instrumentation.cdi;
3032
}

net.tascalate.javaflow.tools.instrument/src/main/java/org/apache/commons/javaflow/instrumentation/common/ConfigurableClassFileTransformer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private boolean isSystemClassLoaderParent(ClassLoader maybeParent) {
112112
private String resolveClassName(String className,
113113
Class<?> classBeingRedefined,
114114
byte[] classfileBuffer) {
115-
if (null != className) {
115+
if (className != null) {
116116
return className;
117117
} else if (classBeingRedefined != null) {
118118
return classBeingRedefined.getName().replace('.', '/');

net.tascalate.javaflow.tools.javaagent/src/main/java/module-info.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,7 @@
2121
requires net.tascalate.javaflow.spi;
2222
requires net.tascalate.javaflow.providers.asmx;
2323

24+
requires transitive org.apache.commons.javaflow.instrumentation.common;
25+
2426
exports org.apache.commons.javaflow.instrumentation;
2527
}

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@
8080
<dependency>
8181
<groupId>org.slf4j</groupId>
8282
<artifactId>slf4j-api</artifactId>
83-
<version>1.8.0-beta2</version>
83+
<version>1.8.0-beta4</version>
8484
</dependency>
8585
<dependency>
8686
<groupId>org.slf4j</groupId>
8787
<artifactId>slf4j-simple</artifactId>
88-
<version>1.8.0-beta2</version>
88+
<version>1.8.0-beta4</version>
8989
<scope>runtime</scope>
9090
</dependency>
9191
<dependency>

0 commit comments

Comments
 (0)