Skip to content

Commit

Permalink
CNDB-11028: Port CASSANDRA-18190, this fixes the tests for now, but m…
Browse files Browse the repository at this point in the history
…aybe we still want to check newer version for JDK22 specifically.

Though this is the last ecj version to support JDK11.
Upgrade:
- ecj plus fix the java udf functions for JDK11+
- snakeyaml - it was already bumped in CNDB for security vulnerability
- test dependencies:
   jacoco, byteman - higher version than CNDB but it is needed for catching up on JDK22 in tests
   findbugs - aligned with CNDB version but we probably want at some point to get to major version upgrade; not a priority for now
   jmh, bytebuddy - bumped to latest versions as they are known for not working on newer JDK versions
  • Loading branch information
ekaterinadimitrova2 committed Nov 7, 2024
1 parent 0258f7f commit 3846e52
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .build/parent-pom-template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
</license>
</licenses>
<properties>
<bytebuddy.version>1.12.13</bytebuddy.version>
<byteman.version>4.0.20</byteman.version>
<bytebuddy.version>1.14.17</bytebuddy.version>
<byteman.version>4.0.23</byteman.version>
<ohc.version>0.5.1</ohc.version>

<!-- These are referenced in build.xml, so need to be propagated from there -->
Expand Down Expand Up @@ -930,7 +930,7 @@
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>2.0.2</version>
<version>3.0.0</version>
</dependency>
<dependency>
<groupId>com.clearspring.analytics</groupId>
Expand Down
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
</condition>

<!-- https://www.eclemma.org/jacoco/ -->
<property name="jacoco.version" value="0.8.8"/>
<property name="jacoco.version" value="0.8.12"/>
<property name="jacoco.export.dir" value="${build.dir}/jacoco/" />
<property name="jacoco.partials.dir" value="${jacoco.export.dir}/partials" />
<property name="jacoco.partialexecfile" value="${jacoco.partials.dir}/partial.exec" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
import com.google.common.io.ByteStreams;

import org.apache.commons.lang3.StringUtils;
import org.eclipse.jdt.internal.compiler.lookup.LookupEnvironment;
import org.eclipse.jdt.internal.compiler.lookup.ModuleBinding;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down

0 comments on commit 3846e52

Please sign in to comment.