Skip to content

Commit

Permalink
Merge branch 'master' into WW-5350-allowlist-2
Browse files Browse the repository at this point in the history
  • Loading branch information
kusalk committed Nov 12, 2023
2 parents bef9769 + 9d6fe74 commit b4fbc0f
Showing 3 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -200,7 +200,7 @@ protected boolean checkExclusionList(Object target, Member member) {
return false;
}
if (isPackageExcluded(memberClass)) {
LOG.warn("Package [{}] of target class [{}] of target [{}] is excluded!",
LOG.warn("Package [{}] of member class [{}] of member [{}] is excluded!",
memberClass.getPackage(),
memberClass,
target);
@@ -215,7 +215,7 @@ protected boolean checkExclusionList(Object target, Member member) {
return false;
}
if (isPackageExcluded(targetClass)) {
LOG.warn("Package [{}] of member [{}] are excluded!", targetClass.getPackage(), member);
LOG.warn("Package [{}] of target [{}] is excluded!", targetClass.getPackage(), member);
return false;
}
return true;
2 changes: 1 addition & 1 deletion plugins/jasperreports/pom.xml
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<version>6.20.5</version>
<version>6.20.6</version>
<scope>provided</scope>
<exclusions>
<!-- not necessary to compile and it force dependency convergence issues -->
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -113,7 +113,7 @@
<jackson.version>2.15.3</jackson.version>
<log4j2.version>2.20.0</log4j2.version>
<ognl.version>3.3.4</ognl.version>
<slf4j.version>2.0.7</slf4j.version>
<slf4j.version>2.0.9</slf4j.version>
<spring.platformVersion>5.3.27</spring.platformVersion>
<tiles.version>3.0.8</tiles.version>
<tiles-request.version>1.0.7</tiles-request.version>

0 comments on commit b4fbc0f

Please sign in to comment.