Skip to content

Commit

Permalink
Build ecChronos With Java 17 - Issue Ericsson#607
Browse files Browse the repository at this point in the history
In order to provide support for Java 17 in EcChronos,
identify the minimal changes necessary for the project to
compile and run with Java 17. Additionally, implement these
changes and any necessary updates to Maven packages.

This change must be merged just after a release of ecChronos
with the Issue Ericsson#616 done.

Closes Ericsson#607
  • Loading branch information
VictorCavichioli committed Dec 7, 2023
1 parent 5986d7d commit 0245142
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 21 deletions.
4 changes: 2 additions & 2 deletions connection/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>11</source>
<target>11</target>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
</plugins>
Expand Down
5 changes: 5 additions & 0 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
<description>Core package for scheduling and repairs</description>
<name>EcChronos Core</name>

<properties>
<datastax.driver.extra_config_options>jamm.use_static_fields=true</datastax.driver.extra_config_options>
</properties>

<dependencies>
<!-- Internal -->
<dependency>
Expand Down Expand Up @@ -119,6 +123,7 @@
<dependency>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
<version>5.0-alpha1</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ public int getJMXPort()
*/
public boolean isSSLEnabled()
{
return DatabaseDescriptor.getNativeProtocolEncryptionOptions().isEnabled();
return DatabaseDescriptor.getNativeProtocolEncryptionOptions().getEnabled();
}

/**
Expand Down Expand Up @@ -353,7 +353,7 @@ private SSLContext generateSslContext()
}
catch (NoSuchAlgorithmException e)
{
LOG.error("Environment does support {} - Proceeding without SSL/TLS", DatabaseDescriptor.getNativeProtocolEncryptionOptions().acceptedProtocols());
LOG.error("Environment does support {} - Proceeding without SSL/TLS", DatabaseDescriptor.getNativeProtocolEncryptionOptions().getAcceptedProtocols());
}
catch (KeyManagementException e)
{
Expand Down
2 changes: 1 addition & 1 deletion docs/autogenerated/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ info:
url: https://www.apache.org/licenses/LICENSE-2.0
version: 1.0.0
servers:
- url: https://localhost:8080
- url: http://localhost:8080
description: Generated server url
tags:
- name: Repair-Management
Expand Down
4 changes: 2 additions & 2 deletions osgi-integration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>11</source>
<target>11</target>
<source>17</source>
<target>17</target>
<generatedSourcesDirectory>${project.build.directory}/generated-sources/</generatedSourcesDirectory>
</configuration>
</plugin>
Expand Down
32 changes: 20 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
<properties>
<bundle.symbolicName>${project.groupId}.${project.artifactId}</bundle.symbolicName>
<bundle.namespace>${project.groupId}.${project.artifactId}</bundle.namespace>
<datastax.driver.extra_config_options>jamm.use_static_fields=true</datastax.driver.extra_config_options>

<!-- Dependency versions -->
<io.netty.version>4.1.94.Final</io.netty.version>
Expand All @@ -70,8 +71,8 @@
<com.typesafe.config.version>1.4.2</com.typesafe.config.version>
<org.hdrhistogram.version>2.1.12</org.hdrhistogram.version>
<slf4j.version>1.7.30</slf4j.version>
<logback.version>1.2.13</logback.version>
<cassandra.version>4.0.10</cassandra.version>
<logback.version>1.2.10</logback.version>
<cassandra.version>5.0-alpha1</cassandra.version>
<osgi.version>1.3.0</osgi.version>
<mockito.core.version>3.3.3</mockito.core.version>
<assertj.version>3.16.1</assertj.version>
Expand All @@ -90,32 +91,32 @@
<awaitility.version>3.0.0</awaitility.version>
<jcip.version>1.0</jcip.version>
<junitparams.version>1.1.1</junitparams.version>
<equalsverifier.version>3.5</equalsverifier.version>
<equalsverifier.version>3.15</equalsverifier.version>
<org.springframework.boot.version>2.7.17</org.springframework.boot.version>
<org.springdoc.openapi-ui.version>1.7.0</org.springdoc.openapi-ui.version>
<io.prometheus.simpleclient>0.16.0</io.prometheus.simpleclient>
<jakarta.validation-api.version>2.0.2</jakarta.validation-api.version>
<swagger-annotations.version>2.2.11</swagger-annotations.version>

<!-- Plugin versions -->
<org.apache.maven.plugins.maven-compiler-plugin.version>3.8.0</org.apache.maven.plugins.maven-compiler-plugin.version>
<org.apache.maven.plugins.maven-compiler-plugin.version>3.11.0</org.apache.maven.plugins.maven-compiler-plugin.version>
<org.apache.maven.plugins.maven-install-plugin.version>2.5.2</org.apache.maven.plugins.maven-install-plugin.version>
<org.apache.maven.plugins.maven-surefire-plugin.version>2.22.1</org.apache.maven.plugins.maven-surefire-plugin.version>
<org.apache.maven.plugins.maven-surefire-plugin.version>3.0.0-M5</org.apache.maven.plugins.maven-surefire-plugin.version>
<org.apache.maven.plugins.maven-failsafe-plugin.version>2.22.1</org.apache.maven.plugins.maven-failsafe-plugin.version>
<org.apache.maven.plugins.maven-assembly-plugin.version>3.6.0</org.apache.maven.plugins.maven-assembly-plugin.version>
<org.apache.maven.plugins-maven-checkstyle-plugin.version>3.2.0</org.apache.maven.plugins-maven-checkstyle-plugin.version>
<org.apache.maven.plugins-maven-pmd-plugin.version>3.14.0</org.apache.maven.plugins-maven-pmd-plugin.version>
<org.apache.maven.plugin.maven-jxr-plugin.version>3.0.0</org.apache.maven.plugin.maven-jxr-plugin.version>
<org.apache.maven.plugins-maven-resources-plugin.version>3.1.0</org.apache.maven.plugins-maven-resources-plugin.version>
<org.apache.maven.plugins-maven-dependency-plugin.version>3.5.0</org.apache.maven.plugins-maven-dependency-plugin.version>
<org.apache.maven.plugins-maven-jar-plugin.version>2.6</org.apache.maven.plugins-maven-jar-plugin.version>
<org.apache.maven.plugins-maven-jar-plugin.version>3.3.0</org.apache.maven.plugins-maven-jar-plugin.version>
<org.apache.maven.plugins-maven-shade-plugin.version>3.4.1</org.apache.maven.plugins-maven-shade-plugin.version>
<org.apache.felix.maven-bundle-plugin.version>5.1.8</org.apache.felix.maven-bundle-plugin.version>
<com.mycila.license-maven-plugin.version>3.0</com.mycila.license-maven-plugin.version>
<io.fabric8.docker-maven-plugin.version>0.35.0</io.fabric8.docker-maven-plugin.version>
<io.fabric8.docker-maven-plugin.version>0.43.0</io.fabric8.docker-maven-plugin.version>
<org.apache.servicemix.tooling.depends-maven-plugin.version>1.2</org.apache.servicemix.tooling.depends-maven-plugin.version>
<org.apache.karaf.tooling.karaf-maven-plugin.version>4.2.1</org.apache.karaf.tooling.karaf-maven-plugin.version>
<org.jacoco.jacoco-maven-plugin.version>0.8.4</org.jacoco.jacoco-maven-plugin.version>
<org.apache.karaf.tooling.karaf-maven-plugin.version>4.4.0</org.apache.karaf.tooling.karaf-maven-plugin.version>
<org.jacoco.jacoco-maven-plugin.version>0.8.9</org.jacoco.jacoco-maven-plugin.version>
<org.codehaus.mojo.exec-maven-plugin.version>3.0.0</org.codehaus.mojo.exec-maven-plugin.version>
<org.codehaus.mojo.license-maven-plugin.version>1.19</org.codehaus.mojo.license-maven-plugin.version>

Expand All @@ -133,7 +134,7 @@
<!-- Integration tests -->
<it.cassandra.memory>1073741824</it.cassandra.memory>
<it.cassandra.heap>256M</it.cassandra.heap>
<it.cassandra.version>4.0</it.cassandra.version>
<it.cassandra.version>5.0</it.cassandra.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -588,6 +589,12 @@
--add-opens java.base/jdk.internal.module=ALL-UNNAMED
--add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED
--add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED
--add-opens=java.base/java.io=ALL-UNNAMED
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
--add-opens=java.base/java.util.concurrent=ALL-UNNAMED
--add-opens=java.base/java.util=ALL-UNNAMED
--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
--add-opens=java.base/java.lang=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
Expand All @@ -601,8 +608,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${org.apache.maven.plugins.maven-compiler-plugin.version}</version>
<configuration>
<source>11</source>
<target>11</target>
<source>17</source>
<target>17</target>
</configuration>
</plugin>

Expand All @@ -616,6 +623,7 @@
<version>${org.apache.maven.plugins.maven-assembly-plugin.version}</version>
<configuration>
<skipAssembly>true</skipAssembly>
<tarLongFileMode>posix</tarLongFileMode>
</configuration>
</plugin>

Expand Down
4 changes: 2 additions & 2 deletions standalone-integration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>11</source>
<target>11</target>
<source>17</source>
<target>17</target>
<generatedSourcesDirectory>${project.build.directory}/generated-sources/</generatedSourcesDirectory>
</configuration>
</plugin>
Expand Down

0 comments on commit 0245142

Please sign in to comment.