You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/06/04 12:32:38 UTC
[camel-quarkus] branch master updated: Revert #1299 require Java 11
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new 7c1b0dd Revert #1299 require Java 11
new 3f71741 Merge pull request #1305 from ppalaga/200604-unrevert-java-8
7c1b0dd is described below
commit 7c1b0ddd10e1e64e152bfba2aac899cd3412e7f5
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Jun 4 11:22:22 2020 +0200
Revert #1299 require Java 11
---
.github/workflows/ci-build.yaml | 4 ++--
docs/modules/ROOT/pages/contributor-guide/index.adoc | 2 +-
docs/modules/ROOT/pages/user-guide/first-steps.adoc | 2 +-
pom.xml | 3 ---
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index 5e385f1..e1e3556 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -115,7 +115,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- java: [ '14' ]
+ java: [ '8' , '14' ]
env:
MAVEN_OPTS: -Xmx3000m
steps:
@@ -219,7 +219,7 @@ jobs:
# - name: Set Up Java
# uses: actions/setup-java@v1
# with:
- # java-version: 11
+ # java-version: 1.8
# - name: Download Maven Repo
# uses: actions/download-artifact@v1
# with:
diff --git a/docs/modules/ROOT/pages/contributor-guide/index.adoc b/docs/modules/ROOT/pages/contributor-guide/index.adoc
index fe0b2d4..dc5de96 100644
--- a/docs/modules/ROOT/pages/contributor-guide/index.adoc
+++ b/docs/modules/ROOT/pages/contributor-guide/index.adoc
@@ -11,7 +11,7 @@
documentation.
* If your are on Linux, `docker` is sufficient for the native mode too. Use `-Pnative,docker` instead of `-Pnative`
if you choose this option.
-* Java 11
+* JDK 8+
* Maven 3.6.2+ (unless you use the Maven Wrapper, a.k.a. `mvnw` available in the source tree).
[[how-to-build]]
diff --git a/docs/modules/ROOT/pages/user-guide/first-steps.adoc b/docs/modules/ROOT/pages/user-guide/first-steps.adoc
index 8f05fda..27e810c 100644
--- a/docs/modules/ROOT/pages/user-guide/first-steps.adoc
+++ b/docs/modules/ROOT/pages/user-guide/first-steps.adoc
@@ -8,7 +8,7 @@ as a base for your real world project.
* A `git` client
* An IDE
-* JDK 11+ with JAVA_HOME configured appropriately
+* JDK 8+ with JAVA_HOME configured appropriately
* Apache Maven 3.6.2+
* GraalVM with `native-image` command installed and `GRAALVM_HOME` environment variable set, see
https://quarkus.io/guides/building-native-image-guide[Building a native executable] section of the Quarkus
diff --git a/pom.xml b/pom.xml
index 65de612..c2a0066 100644
--- a/pom.xml
+++ b/pom.xml
@@ -487,9 +487,6 @@
<version>3.6.2</version>
</requireMavenVersion>
<rules>
- <requireJavaVersion>
- <version>11</version>
- </requireJavaVersion>
<dependencyConvergence />
<requireMavenVersion>
<version>${supported-maven-versions}</version>