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.

Sign up for GitHub

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

Remove JDK 8 #16418

Merged
merged 6 commits into from
Apr 14, 2021
Merged

Remove JDK 8 #16418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7d27552
Remove JDK 8
gastaldi Apr 10, 2021
602de53
Update .github/workflows/release-build.yml
gastaldi Apr 10, 2021
f82f0a7
Bump plexus-component-metadata to 2.1.0
gastaldi Apr 12, 2021
adfff60
Error if QuarkusAugmentor runs in JDK 8
gastaldi Apr 12, 2021
206595e
Configure enforcer plugin to build on JDK 11+
gastaldi Apr 12, 2021
21dc993
Remove GRPC JDK 8 compatibility
gastaldi Apr 13, 2021
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
5 changes: 0 additions & 5 deletions .github/workflows/ci-actions-incremental.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,6 @@ jobs:
fail-fast: false
matrix:
java:
- {
name: "8",
java-version: 8,
maven_args: "-pl !integration-tests/kubernetes/quarkus-standard-way"
}
- {
name: "11",
java-version: 11,
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-snapshots.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:
ref: main
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
- name: Set up JDK 8
- name: Set up JDK 11
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
with:
java-version: 8
java-version: 11
- name: Get Date
id: get-date
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
ref: main
- name: Reclaim Disk Space
run: .github/ci-prerequisites.sh
- name: Set up JDK 8
- name: Set up JDK 11
# Uses sha for added security since tags can be updated
uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
with:
java-version: 8
java-version: 11
- name: Create maven repo
run: mkdir -p $HOME/release/repository
- name: Build and Test
Expand Down
26 changes: 3 additions & 23 deletions build-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
<packaging>pom</packaging>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.parameters>true</maven.compiler.parameters>

<!-- Maven plugin versions -->

<!-- These properties are needed in order for them to be resolvable by the generated projects -->
Expand Down Expand Up @@ -110,8 +106,6 @@
<protoc.version>3.14.0</protoc.version> <!--keep in sync with the BOM-->
<grpc.version>1.35.0</grpc.version> <!--keep in sync with the BOM -->

<boring-ssl.version>2.0.36.Final</boring-ssl.version>

<!-- Webjars -->
<webjar.bootstrap.version>4.6.0</webjar.bootstrap.version>
<webjar.font-awesome.version>5.15.2</webjar.font-awesome.version>
Expand Down Expand Up @@ -257,12 +251,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<scope>test</scope>
<version>${boring-ssl.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-core</artifactId>
Expand Down Expand Up @@ -382,6 +370,9 @@
<configuration>
<rules>
<dependencyConvergence/>
<requireJavaVersion>
<version>[11,)</version>
</requireJavaVersion>
<requireMavenVersion>
<version>${supported-maven-versions}</version>
</requireMavenVersion>
Expand Down Expand Up @@ -605,17 +596,6 @@
</build>

<profiles>
<profile>
<id>jdk-8-classpath</id>
<activation>
<!-- activate this on any JDK from 9 onwards -->
<jdk>[9,)</jdk>
</activation>
<properties>
<maven.compiler.release>8</maven.compiler.release>
</properties>
</profile>

<profile>
<id>format</id>
<activation>
Expand Down
3 changes: 1 addition & 2 deletions core/deployment/src/main/java/io/quarkus/deployment/QuarkusAugmentor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ public class QuarkusAugmentor {

public BuildResult run() throws Exception {
if (!JavaVersionUtil.isJava11OrHigher()) {
log.warn("Using Java versions older than 11 to build"
+ " Quarkus applications is deprecated and will be disallowed in a future release!");
throw new IllegalStateException("Quarkus applications require Java 11 or higher to build");
}
long time = System.currentTimeMillis();
log.debug("Beginning Quarkus augmentation");
Expand Down
6 changes: 3 additions & 3 deletions devtools/gradle/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ plugins {
id 'java-gradle-plugin'
}
if (JavaVersion.current().isJava9Compatible()) {
compileJava.options.compilerArgs.addAll(['--release', '8'])
compileJava.options.compilerArgs.addAll(['--release', '11'])
}
compileJava {
options.encoding = 'UTF-8'
sourceCompatibility = '1.8'
targetCompatibility = '1.8'
sourceCompatibility = '11'
targetCompatibility = '11'
}

compileTestJava {
Expand Down
2 changes: 1 addition & 1 deletion devtools/maven/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
<plugin>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-metadata</artifactId>
<version>1.7.1</version>
<version>2.1.0</version>
<configuration>
<staticMetadataDirectory>${basedir}/target/filtered-resources/META-INF/plexus</staticMetadataDirectory>
</configuration>
Expand Down
16 changes: 0 additions & 16 deletions extensions/grpc/deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,20 +141,4 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>java-8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<dependencies>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
15 changes: 3 additions & 12 deletions independent-projects/arc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.release>11</maven.compiler.release>
<!-- Versions -->
<version.cdi>2.0.2</version.cdi>
<version.jta>1.3.3</version.jta>
Expand Down Expand Up @@ -307,16 +308,6 @@
</distributionManagement>

<profiles>
<profile>
<id>jdk-8-classpath</id>
<activation>
<!-- activate this on any JDK from 9 onwards -->
<jdk>[9,)</jdk>
</activation>
<properties>
<maven.compiler.release>8</maven.compiler.release>
</properties>
</profile>
<profile>
<id>quick-build</id>
<activation>
Expand Down
15 changes: 3 additions & 12 deletions independent-projects/bootstrap/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
</licenses>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.release>11</maven.compiler.release>
<!-- Versions -->
<eclipse-minimal-json.version>0.9.5</eclipse-minimal-json.version>
<jboss-logging.version>3.3.2.Final</jboss-logging.version>
Expand Down Expand Up @@ -526,16 +527,6 @@
</distributionManagement>

<profiles>
<profile>
<id>jdk-8-classpath</id>
<activation>
<!-- activate this on any JDK from 9 onwards -->
<jdk>[9,)</jdk>
</activation>
<properties>
<maven.compiler.release>8</maven.compiler.release>
</properties>
</profile>
<profile>
<id>quick-build</id>
<activation>
Expand Down
15 changes: 3 additions & 12 deletions independent-projects/enforcer-rules/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.release>11</maven.compiler.release>

<enforcer-api.version>3.0.0-M3</enforcer-api.version>
<maven-invoker-plugin.version>3.2.1</maven-invoker-plugin.version>
Expand Down Expand Up @@ -128,16 +129,6 @@
</distributionManagement>

<profiles>
<profile>
<id>jdk-8-classpath</id>
<activation>
<!-- activate this on any JDK from 9 onwards -->
<jdk>[9,)</jdk>
</activation>
<properties>
<maven.compiler.release>8</maven.compiler.release>
</properties>
</profile>
<profile>
<id>quick-build</id>
<activation>
Expand Down
15 changes: 3 additions & 12 deletions independent-projects/ide-config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.release>11</maven.compiler.release>
<version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
<version.nexus-staging-maven-plugin>1.6.8</version.nexus-staging-maven-plugin>
</properties>
Expand Down Expand Up @@ -64,16 +65,6 @@
</build>

<profiles>
<profile>
<id>jdk-8-classpath</id>
<activation>
<!-- activate this on any JDK from 9 onwards -->
<jdk>[9,)</jdk>
</activation>
<properties>
<maven.compiler.release>8</maven.compiler.release>
</properties>
</profile>
<profile>
<id>quick-build</id>
<activation>
Expand Down
15 changes: 3 additions & 12 deletions independent-projects/qute/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>11</maven.compiler.release>
<version.junit>5.7.1</version.junit>
<version.gizmo>1.0.7.Final</version.gizmo>
<version.jboss-logging>3.3.2.Final</version.jboss-logging>
Expand Down Expand Up @@ -235,16 +236,6 @@
</distributionManagement>

<profiles>
<profile>
<id>jdk-8-classpath</id>
<activation>
<!-- activate this on any JDK from 9 onwards -->
<jdk>[9,)</jdk>
</activation>
<properties>
<maven.compiler.release>8</maven.compiler.release>
</properties>
</profile>
<profile>
<id>quick-build</id>
<activation>
Expand Down
15 changes: 3 additions & 12 deletions independent-projects/resteasy-reactive/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.release>11</maven.compiler.release>
<!-- Versions -->
<version.cdi>2.0.2</version.cdi>
<version.jandex>2.2.3.Final</version.jandex>
Expand Down Expand Up @@ -410,16 +411,6 @@
</distributionManagement>

<profiles>
<profile>
<id>jdk-8-classpath</id>
<activation>
<!-- activate this on any JDK from 9 onwards -->
<jdk>[9,)</jdk>
</activation>
<properties>
<maven.compiler.release>8</maven.compiler.release>
</properties>
</profile>
<profile>
<id>quick-build</id>
<activation>
Expand Down
13 changes: 3 additions & 10 deletions independent-projects/revapi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
<packaging>jar</packaging>

<properties>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.release>11</maven.compiler.release>
<format.skip>true</format.skip>
</properties>

Expand All @@ -37,16 +40,6 @@
</build>

<profiles>
<profile>
<id>jdk-8-classpath</id>
<activation>
<!-- activate this on any JDK from 9 onwards -->
<jdk>[9,)</jdk>
</activation>
<properties>
<maven.compiler.release>8</maven.compiler.release>
</properties>
</profile>
<profile>
<id>quick-build</id>
<activation>
Expand Down
15 changes: 3 additions & 12 deletions independent-projects/tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
</licenses>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.release>11</maven.compiler.release>

<!-- These properties are used by CreateProjectMojo to add the Maven Wrapper -->
<proposed-maven-version>3.6.3</proposed-maven-version>
Expand Down Expand Up @@ -351,16 +352,6 @@
</build>

<profiles>
<profile>
<id>jdk-8-classpath</id>
<activation>
<!-- activate this on any JDK from 9 onwards -->
<jdk>[9,)</jdk>
</activation>
<properties>
<maven.compiler.release>8</maven.compiler.release>
</properties>
</profile>
<profile>
<id>quick-build</id>
<activation>
Expand Down
Loading