Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

java-17 #2

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,14 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Configure Java
uses: actions/setup-java@v4
with:
java-version: '17'
cache: 'maven'
distribution: 'corretto'
overwrite-settings: false

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-patch-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on: # yamllint disable-line rule:truthy
default: ""

env:
JAVA_VERSION: "11"
JAVA_VERSION: "17"
JAVA_DISTRIBUTION: "corretto"

jobs:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/maven-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on: # yamllint disable-line rule:truthy

jobs:
build:
name: RHEL8 standard build on Java 11 with compiler target 11
name: RHEL8 standard build on Java 17 with compiler target 17
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -32,8 +32,8 @@ jobs:
strategy:
fail-fast: false
matrix:
java-compiler: ['11', '17']
java-version: ['17']
java-compiler: ['17', '21']
java-version: ['21']
continue-on-error: true

steps:
Expand All @@ -60,7 +60,7 @@ jobs:
cache-to: ${{ github.event_name == 'push' && 'type=gha,mode=max' || '' }}

centos7-build:
name: Centos7 legacy build on Java 11 with compiler target 11
name: Centos7 legacy build on Java 17 with compiler target 17
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -85,7 +85,7 @@ jobs:
cache-to: ${{ github.event_name == 'push' && 'type=gha,mode=max' || '' }}

macos-build:
name: MacOS non-standard build on Java 11 with compiler target 11
name: MacOS non-standard build on Java 17 with compiler target 17
runs-on: macos-14
steps:
- name: Checkout repo
Expand All @@ -94,7 +94,7 @@ jobs:
- name: Configure Java
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
cache: 'maven'
distribution: 'corretto'
overwrite-settings: false
Expand All @@ -113,7 +113,7 @@ jobs:
- name: Configure Java & Maven
uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
cache: "maven"
distribution: "corretto"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on: # yamllint disable-line rule:truthy
# types: [created]

env:
JAVA_VERSION: "11"
JAVA_VERSION: "17"
JAVA_DISTRIBUTION: "corretto"

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on: # yamllint disable-line rule:truthy
default: ""

env:
JAVA_VERSION: "11"
JAVA_VERSION: "17"
JAVA_DISTRIBUTION: "corretto"
MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Djava.awt.headless=true"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/maven-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on: # yamllint disable-line rule:truthy
default: ""

env:
JAVA_VERSION: "11"
JAVA_VERSION: "17"
JAVA_DISTRIBUTION: "corretto"
MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Djava.awt.headless=true"

Expand Down
6 changes: 3 additions & 3 deletions DEVELOPING.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,10 @@ Emissary is best developed and run in a Unix environment.

Preferred operating systems are Linux or macOS.

### Java 11
### Java 17

Java 1.8 is no longer supported in this codebase, only
[Java 11](https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html).
Java 11 is no longer supported in this codebase, only
[Java 17](https://docs.aws.amazon.com/corretto/latest/corretto-17-ug/downloads-list.html).

### Apache Maven 3.6+

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ services, their cost and quality and keep the P2P network connected.
## Minimum Requirements

- Linux or MacOSX operating system
- [JDK 11](https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html)
- [Apache Maven 3.5+](http://maven.apache.org)
- [JDK 17](https://docs.aws.amazon.com/corretto/latest/corretto-17-ug/downloads-list.html)
- [Apache Maven 3.6+](http://maven.apache.org)

## Getting Started

Expand Down
6 changes: 3 additions & 3 deletions contrib/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FROM redhat/ubi8:8.9 AS base_ubi8
ENV JAVA_TOOL_OPTIONS -Dfile.encoding=UTF8
ENV PROJECT_BASE=/opt/emissary

ARG java_version=11
ARG java_version=17
ARG user=emissary
ARG group=emissary
ARG uid=1000
Expand All @@ -30,7 +30,7 @@ FROM centos:7 AS base_centos7
ENV JAVA_TOOL_OPTIONS -Dfile.encoding=UTF8
ENV PROJECT_BASE=/opt/emissary

ARG java_version=11
ARG java_version=17
ARG user=emissary
ARG group=emissary
ARG uid=1000
Expand All @@ -56,7 +56,7 @@ FROM alpine:3 AS base_alpine3
ENV JAVA_TOOL_OPTIONS -Dfile.encoding=UTF8
ENV PROJECT_BASE=/opt/emissary

ARG java_version=11
ARG java_version=17
ARG user=emissary
ARG group=emissary
ARG uid=1000
Expand Down
18 changes: 9 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,18 @@
<dep.webjars.popper.version>2.9.3</dep.webjars.popper.version>
<eclipseFormatterStyle>${project.basedir}/contrib/formatter.xml</eclipseFormatterStyle>
<git.useNative>false</git.useNative>
<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.min-version>3.5.0</maven.min-version>
<plugin.build-helper-maven.version>3.3.0</plugin.build-helper-maven.version>
<plugin.cyclonedx-maven.version>2.7.9</plugin.cyclonedx-maven.version>
<plugin.duplicate-finder-maven.version>1.5.1</plugin.duplicate-finder-maven.version>
<plugin.exec-maven.version>3.1.0</plugin.exec-maven.version>
<plugin.formatter-maven.version>2.23.0</plugin.formatter-maven.version>
<plugin.git-commit-id-maven.version>4.9.9</plugin.git-commit-id-maven.version>
<plugin.impsort-maven.version>1.8.0</plugin.impsort-maven.version>
<plugin.impsort-maven.version>1.12.0</plugin.impsort-maven.version>
<plugin.jacoco-maven.version>0.8.8</plugin.jacoco-maven.version>
<plugin.maven-assembly.version>3.4.2</plugin.maven-assembly.version>
<plugin.maven-checkstyle.version>3.2.1</plugin.maven-checkstyle.version>
Expand Down Expand Up @@ -795,7 +795,7 @@
<version>[${maven.min-version},)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[11,)</version>
<version>[17,)</version>
</requireJavaVersion>
<dependencyConvergence />
</rules>
Expand Down Expand Up @@ -1460,7 +1460,7 @@
<!-- on by default, but disable with '-P !errorProne' or '-DskipErrorProne' -->
<id>errorProne</id>
<activation>
<jdk>[11,)</jdk>
<jdk>[17,)</jdk>
<property>
<name>!skipErrorProne</name>
</property>
Expand Down Expand Up @@ -1534,7 +1534,7 @@
</activation>
<properties>
<!-- enable compiler compliance when building in Eclipse -->
<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.release>17</maven.compiler.release>
</properties>
<build>
<!-- different build directory for eclipse, so running maven and clicking in IDE don't conflict -->
Expand Down Expand Up @@ -1674,10 +1674,10 @@
<profile>
<id>jdk-release-flag</id>
<activation>
<jdk>[11,)</jdk>
<jdk>[17,)</jdk>
</activation>
<properties>
<maven.compiler.release>11</maven.compiler.release>
<maven.compiler.release>17</maven.compiler.release>
</properties>
</profile>
<profile>
Expand Down
Loading