You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2023/01/12 13:28:13 UTC
[ofbiz-framework] branch trunk updated (5f11ebad2d -> 88a014296c)
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
from 5f11ebad2d Fixed: Accounting Invoice Overview - PDF failed (OFBIZ-12735)
new 397599a663 Improved: Upgrade to gradle 7.6 - support JDK 11 -> 17 (OFBIZ-12400)
new fd810574db Improved: Upgrade to gradle 7.6 - support JDK 11 -> 17 (OFBIZ-12400)
new 88a014296c Improved: Use JDK 17 in GitHub Action, BuildBot (ie OFBiz CI) and demos (OFBIZ-12729)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/gradle.yaml | 10 ++++++----
gradle/init-gradle-wrapper.ps1 | 12 +++++++-----
gradle/wrapper/gradle-wrapper.jar | Bin 58910 -> 61574 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
4 files changed, 14 insertions(+), 10 deletions(-)
[ofbiz-framework] 02/03: Improved: Upgrade to gradle 7.6 - support JDK 11 -> 17 (OFBIZ-12400)
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit fd810574db3e9842fa5fc34b8818fabbc0e126ea
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Thu Jan 12 14:19:57 2023 +0100
Improved: Upgrade to gradle 7.6 - support JDK 11 -> 17 (OFBIZ-12400)
This is the necessary upgraded Gradle 7.6 files:
gradle-wrapper.jar
gradle-wrapper.properties
---
gradle/wrapper/gradle-wrapper.jar | Bin 58910 -> 61574 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 62d4c05355..943f0cbfa7 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 622ab64a3c..070cb702f0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
[ofbiz-framework] 03/03: Improved: Use JDK 17 in GitHub Action, BuildBot (ie OFBiz CI) and demos (OFBIZ-12729)
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 88a014296c0fe7ec1d010bfb836595003aef14c0
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Thu Jan 12 14:25:12 2023 +0100
Improved: Use JDK 17 in GitHub Action, BuildBot (ie OFBiz CI) and demos (OFBIZ-12729)
This is only the GH actions file
---
.github/workflows/gradle.yaml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/gradle.yaml b/.github/workflows/gradle.yaml
index 61d488afb9..37ede81be8 100644
--- a/.github/workflows/gradle.yaml
+++ b/.github/workflows/gradle.yaml
@@ -15,7 +15,7 @@
# This workflow will check style in OFBiz with its plugins
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+# For more information see: https://github.com/actions/setup-java
name: Java CI with Gradle
@@ -32,15 +32,17 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v3.6.0
with:
- java-version: 11
- distribution: zulu
+ java-version: 17
+ distribution: temurin
+ cache: 'gradle'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew pullAllPluginsSource check javadoc
# Below does not work, see see https://lists.apache.org/thread/80wzf4kclfk5nh2fss56jd6otf7y4n2f
+# BuildBot does it anyway
# - name: Builds with Gradle, checks style and run integration tests (just to know if they pass)
# run: ./gradlew pullAllPluginsSource check javadoc loadAll testIntegration
[ofbiz-framework] 01/03: Improved: Upgrade to gradle 7.6 - support JDK 11 -> 17 (OFBIZ-12400)
Posted by jl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 397599a663c1133ed38a8a8a539cdc1528bdc712
Author: Jacques Le Roux <ja...@les7arts.com>
AuthorDate: Thu Jan 12 14:11:19 2023 +0100
Improved: Upgrade to gradle 7.6 - support JDK 11 -> 17 (OFBIZ-12400)
This is only the Windows init-gradle-wrapper.ps1 file
---
gradle/init-gradle-wrapper.ps1 | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/gradle/init-gradle-wrapper.ps1 b/gradle/init-gradle-wrapper.ps1
index a5cf90f29a..36d46eb624 100644
--- a/gradle/init-gradle-wrapper.ps1
+++ b/gradle/init-gradle-wrapper.ps1
@@ -17,17 +17,19 @@
md -force gradle/wrapper
+# download raw format from https://github.com/gradle/gradle/tree/v7.6.0/gradle/wrapper
If ($ExecutionContext.SessionState.LanguageMode -eq "ConstrainedLanguage") {
Set-ItemProperty 'hklm:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment' -name "__PSLockdownPolicy" -Value 8
- Invoke-WebRequest -outf gradle\wrapper\gradle-wrapper.jar https://github.com/gradle/gradle/raw/v6.5.1/gradle/wrapper/gradle-wrapper.jar
+ Invoke-WebRequest -outf gradle\wrapper\gradle-wrapper.jar https://github.com/gradle/gradle/raw/v7.6.0/gradle/wrapper/gradle-wrapper.jar
Set-ItemProperty 'hklm:\SYSTEM\CurrentControlSet\Control\Session Manager\Environment' -name "__PSLockdownPolicy" -Value 4
} else {
- Invoke-WebRequest -outf gradle\wrapper\gradle-wrapper.jar https://github.com/gradle/gradle/raw/v6.5.1/gradle/wrapper/gradle-wrapper.jar
+ Invoke-WebRequest -outf gradle\wrapper\gradle-wrapper.jar https://github.com/gradle/gradle/raw/v7.6.0/gradle/wrapper/gradle-wrapper.jar
}
-$expected = "33b0acb4572934fc1dd7d5880c65036724974e06"
-$actual = (Get-FileHash gradle\wrapper\gradle-wrapper.jar -Algorithm SHA1).Hash.ToLower()
-@{$true = 'OK: Checksum match'; $false = "ERROR: Checksum mismatch!`nExpected: $expected`nActual: $actual"}[$actual -eq $expected]
+# https://docs.gradle.org/current/userguide/gradle_wrapper.html#wrapper_checksum_verification
+$expected = Invoke-RestMethod -Uri https://services.gradle.org/distributions/gradle-7.6-wrapper.jar.sha256
+$actual = (Get-FileHash gradle\wrapper\gradle-wrapper.jar -Algorithm SHA256).Hash.ToLower()
+@{$true = 'OK: Checksum match'; $false = "ERROR: Checksum mismatch!`nExpected: $expected`nActual: $actual"}[$actual -eq $expected]
if (!$true) {
Remove-Item gradle\wrapper\gradle-wrapper.jar