You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dm...@apache.org on 2021/04/09 18:47:51 UTC

[ignite] branch master updated: IGNITE-14404-specify-correct-java-versions (#8993)

This is an automated email from the ASF dual-hosted git repository.

dmagda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 72f0671  IGNITE-14404-specify-correct-java-versions (#8993)
72f0671 is described below

commit 72f06712cb41a3ad5a7c9282aa383c8189027ed7
Author: IgGusev <de...@mail.ru>
AuthorDate: Fri Apr 9 21:47:21 2021 +0300

    IGNITE-14404-specify-correct-java-versions (#8993)
---
 docs/_docs/includes/cpp-prerequisites.adoc        | 2 +-
 docs/_docs/includes/dotnet-prerequisites.adoc     | 2 +-
 docs/_docs/includes/java9.adoc                    | 2 +-
 docs/_docs/includes/prereqs.adoc                  | 2 +-
 docs/_docs/quick-start/java.adoc                  | 2 +-
 modules/platforms/dotnet/DEVNOTES.txt             | 6 +++---
 modules/platforms/dotnet/build.ps1                | 2 +-
 modules/platforms/dotnet/release/verify-nuget.ps1 | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/_docs/includes/cpp-prerequisites.adoc b/docs/_docs/includes/cpp-prerequisites.adoc
index 7b91f10..464431c 100644
--- a/docs/_docs/includes/cpp-prerequisites.adoc
+++ b/docs/_docs/includes/cpp-prerequisites.adoc
@@ -14,7 +14,7 @@
 // limitations under the License.
 [width="100%",cols="1,3"]
 |===
-|JDK|Oracle JDK 8 and later, Open JDK 8 and later, IBM JDK 8 and later
+|JDK|Oracle JDK 8 or 11, Open JDK 8 or 11, IBM JDK 8 or 11
 |OS|Windows Vista, Windows Server 2008 and later versions, Ubuntu (18.04 64 bit)
 |Network|No restrictions (10G recommended)
 |Hardware|No restrictions
diff --git a/docs/_docs/includes/dotnet-prerequisites.adoc b/docs/_docs/includes/dotnet-prerequisites.adoc
index 489615b..02c4ea9 100644
--- a/docs/_docs/includes/dotnet-prerequisites.adoc
+++ b/docs/_docs/includes/dotnet-prerequisites.adoc
@@ -14,7 +14,7 @@
 // limitations under the License.
 [width="100%",cols="1,3"]
 |===
-|JDK |Oracle JDK 8 and later, Open JDK 8 and later, IBM JDK 8 and later
+|JDK |Oracle JDK 8 or 11, Open JDK 8 or 11, IBM JDK 8 or 11
 |.NET Framework |.NET 4.0+, .NET Core 2.0+
 //|IDE |Visual Studio 2010+, Rider, Visual Studio Code
 |===
diff --git a/docs/_docs/includes/java9.adoc b/docs/_docs/includes/java9.adoc
index e40abf8..69a948d 100644
--- a/docs/_docs/includes/java9.adoc
+++ b/docs/_docs/includes/java9.adoc
@@ -12,7 +12,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-To run Ignite with Java 11 or later, follow these steps:
+To run Ignite with Java 11, follow these steps:
 
 1.  Set the `JAVA_HOME` environment variable to point to the Java installation
 directory.
diff --git a/docs/_docs/includes/prereqs.adoc b/docs/_docs/includes/prereqs.adoc
index f984162..11e3355 100644
--- a/docs/_docs/includes/prereqs.adoc
+++ b/docs/_docs/includes/prereqs.adoc
@@ -14,7 +14,7 @@
 // limitations under the License.
 [width="100%",cols="1,3"]
 |===
-|JDK |Oracle JDK 8 and later, Open JDK 8 and later, IBM JDK 8 and later
+|JDK |Oracle JDK 8 or 11, Open JDK 8 or 11, IBM JDK 8 or 11
 |OS |Linux (any flavor), Mac OSX (10.6 and up), Windows (XP and up),
 Windows Server (2008 and up), Oracle Solaris
 |ISA |x86, x64, SPARC, PowerPC
diff --git a/docs/_docs/quick-start/java.adoc b/docs/_docs/quick-start/java.adoc
index 4dbcf6f..9f4f3ca 100644
--- a/docs/_docs/quick-start/java.adoc
+++ b/docs/_docs/quick-start/java.adoc
@@ -165,7 +165,7 @@ Run HelloWorld.java. You will see 'Hello World!' and other environment details p
 
 include::includes/exampleprojects.adoc[]
 
-== Running Ignite with Java 11 or later
+== Running Ignite with Java 11
 
 include::includes/java9.adoc[]
 
diff --git a/modules/platforms/dotnet/DEVNOTES.txt b/modules/platforms/dotnet/DEVNOTES.txt
index 8ce7b87..5d6d7fa 100644
--- a/modules/platforms/dotnet/DEVNOTES.txt
+++ b/modules/platforms/dotnet/DEVNOTES.txt
@@ -3,7 +3,7 @@ Apache Ignite.NET Build Instructions (Windows)
 
 Requirements:
 * Windows (XP and up), Windows Server (2008 and up)
-* Oracle JDK 8 and above
+* Oracle JDK 8 or 11
 * .NET Framework 4.0
 * .NET Core 2.0+
 * PowerShell 3.0+
@@ -41,7 +41,7 @@ A subset of functionality and tests is available. See Apache.Ignite.DotNetCore.s
 
 Requirements:
 * .NET Core SDK (2.1+): https://www.microsoft.com/net/download/linux
-* JDK 8+: apt install openjdk-8-jdk
+* JDK 8 or JDK 11: apt install openjdk-8-jdk
 * Maven: apt install maven
 * IDE: Not required. Rider or VSCode works.
 
@@ -70,7 +70,7 @@ Full Ignite.NET solution can be built, developed, and tested with Mono.
 Requirements:
 * Mono: http://www.mono-project.com/download/ (6.x may not work due to https://github.com/mono/mono/issues/18418)
 * NuGet: apt install nuget
-* JDK 8+: apt install openjdk-8-jdk
+* JDK 8 or JDK 11: apt install openjdk-8-jdk
 * Maven: apt install maven
 * PowerShell Core: https://github.com/PowerShell/PowerShell
 * IDE: Not required.
diff --git a/modules/platforms/dotnet/build.ps1 b/modules/platforms/dotnet/build.ps1
index 3e14c08..e9aaeb5 100644
--- a/modules/platforms/dotnet/build.ps1
+++ b/modules/platforms/dotnet/build.ps1
@@ -27,7 +27,7 @@ Builds all parts of Apache Ignite.NET: Java, .NET, NuGet. Copies results to 'bin
 
 Requirements:
 * PowerShell 3
-* JDK 8+
+* JDK 8 or JDK 11
 * MAVEN_HOME environment variable or mvn.bat in PATH
 
 .PARAMETER skipJava
diff --git a/modules/platforms/dotnet/release/verify-nuget.ps1 b/modules/platforms/dotnet/release/verify-nuget.ps1
index 60031aa..9df2207 100644
--- a/modules/platforms/dotnet/release/verify-nuget.ps1
+++ b/modules/platforms/dotnet/release/verify-nuget.ps1
@@ -27,7 +27,7 @@ Creates a project with .NET Core CLI, installs all packages, runs simple code to
 
 Requirements:
 * .NET Core 2.0+
-* JDK 8+
+* JDK 8 or JDK 11
 
 .PARAMETER packageDir
 Directory with nupkg files to verify, defaults to ..\nupkg.