OFBiz › OFBiz - Commits

[ofbiz-framework] branch trunk updated (e08bfa1 -> af01783)

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

3 messages Options

jleroux@apache.org

[ofbiz-framework] branch trunk updated (e08bfa1 -> af01783)

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 e08bfa1 Fixed: Replace Bintray by a new place to upload the Gradle Wrapper (OFBIZ-12192)
new 1bde2a0 Fixed: Replace Bintray by a new place to upload the Gradle Wrapper (OFBIZ-12192)
new af01783 Fixed: Replace Bintray by a new place to upload the Gradle Wrapper (OFBIZ-12192)

The 2 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:
README.adoc | 14 +++++++++-----
gradle/init-gradle-wrapper.ps1 | 17 ++++++++++-------
init-gradle-wrapper.bat | 9 ++++++---
3 files changed, 25 insertions(+), 15 deletions(-)

jleroux@apache.org

[ofbiz-framework] 01/02: Fixed: Replace Bintray by a new place to upload the Gradle Wrapper (OFBIZ-12192)

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 1bde2a020499cc7332b7f21fb4f67f393b730b0c
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Sat Mar 13 23:13:40 2021 +0100

Fixed: Replace Bintray by a new place to upload the Gradle Wrapper (OFBIZ-12192)

Updates init-gradle-wrapper.bat
to exit if Gradle wrapper already exists
to start PowerShell (>=7) in admin mode, this to be able to use Set-ItemProperty

Updates init-gradle-wrapper.ps1
to removes exit if Gradle wrapper already exists
to create the gradle/wrapper dir if necessary
to handle the ConstrainedLanguage mode if necessary

Conflicts handled by hand
gradle/init-gradle-wrapper.ps1

Conflicts handled by hand
gradle/init-gradle-wrapper.ps1
---
gradle/init-gradle-wrapper.ps1 | 17 ++++++++++-------
init-gradle-wrapper.bat | 9 ++++++---
2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/gradle/init-gradle-wrapper.ps1 b/gradle/init-gradle-wrapper.ps1
index 323c48b..1594786 100644
--- a/gradle/init-gradle-wrapper.ps1
+++ b/gradle/init-gradle-wrapper.ps1
@@ -15,13 +15,16 @@
# specific language governing permissions and limitations
# under the License.

-if ((Test-Path -Path ((Get-Item -Path ".\").FullName + "\gradle\wrapper\gradle-wrapper.jar")) -and (Test-Path -Path ((Get-Item -Path ".\").FullName + "\gradle\wrapper\gradle-wrapper.properties"))) {
- Write-Host "The Gradle Wrapper has already been downloaded.";
- exit
+md -force 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
+ 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
}

-# HTTPS is not used because it gets complicated with Powershell and .Net framework versions
-Invoke-WebRequest -outf gradle\wrapper\gradle-wrapper.jar http://dl.bintray.com/apacheofbiz/GradleWrapper/v6.5.1/gradle-wrapper.jar
-Invoke-WebRequest -outf gradle\wrapper\gradle-wrapper.properties http://dl.bintray.com/apacheofbiz/GradleWrapper/v6.5.1/gradle-wrapper.properties
-Invoke-WebRequest -outf gradlew.bat http://dl.bintray.com/apacheofbiz/GradleWrapper/v6.5.1/gradlew.bat
+#Write-Host $ExecutionContext.SessionState.LanguageMode

+Start-Sleep -s 3
diff --git a/init-gradle-wrapper.bat b/init-gradle-wrapper.bat
index 05327d7..3440521 100755
--- a/init-gradle-wrapper.bat
+++ b/init-gradle-wrapper.bat
@@ -17,7 +17,10 @@ rem KIND, either express or implied. See the License for the
rem specific language governing permissions and limitations
rem under the License.
rem #####################################################################
-rem interactive DOS version of mergefromtrunk.sh.
-rem to use : launch and pass the trunk version number to merge in release

-Powershell.exe -executionpolicy bypass -File gradle\init-gradle-wrapper.ps1
\ No newline at end of file
+if exist "%~dp0gradle\wrapper\gradle-wrapper.jar" (
+ echo The Gradle Wrapper has already been downloaded.
+ exit /b
+)
+
+pwsh -command " Start-Process pwsh -Verb RunAs \""-Command `\""cd '%cd%'; & 'gradle\init-gradle-wrapper.ps1';`\""\"" "

jleroux@apache.org

[ofbiz-framework] 02/02: Fixed: Replace Bintray by a new place to upload the Gradle Wrapper (OFBIZ-12192)

In reply to this post by jleroux@apache.org