Skip to content

Commit f4e91cf

Browse files
adam-wolfeadam-wolfe
authored
Merge pull request #162 from BroadcomMFD/gradle-9-compatibility-issue
(web-viewer) Workaround for openapi-generator Gradle 9 compatibility issue
2 parents 436c201 + 47ca153 commit f4e91cf

6 files changed

Lines changed: 24 additions & 14 deletions

File tree

‎output-management/web-viewer/downloader/README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ Other OS:
5050
npm ci
5151

5252
### Build
53+
> [!CAUTION]
54+
> There is a [Gradle 9.x compatibility issue](https://github.com/OpenAPITools/openapi-generator/issues/22084)
55+
in the OpenAPI Generator. Verify that the `distributionUrl` property in the
56+
`gradle\wrapper\gradle-wrapper.properties` file contains `gradle-8.14.2-bin.zip`.
57+
If not, delete the `gradle\wrapper` folder and perform the [First-time Initialization](#first-time-initialization).
5358

5459
Use the following commands to build the application.
5560

‎output-management/web-viewer/downloader/gradle/bootstrap/bootstrap-gradlew.bat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
@echo off
22

3+
SET GRADLE_WRAPPER_GITHUB_URL="https://raw.githubusercontent.com/gradle/gradle/refs/tags/v8.14.3/gradle/wrapper"
4+
35
if not exist gradle\wrapper\gradle-wrapper.jar (
46
echo Gradle wrapper not found. Attempting to download...
57

68
mkdir gradle\wrapper
79

8-
powershell -Command "& {wget https://raw.githubusercontent.com/gradle/gradle/master/gradle/wrapper/gradle-wrapper.jar -OutFile gradle/wrapper/gradle-wrapper.jar}"
10+
powershell -Command "& {wget %GRADLE_WRAPPER_GITHUB_URL%/gradle-wrapper.jar -OutFile gradle/wrapper/gradle-wrapper.jar}"
911
IF ERRORLEVEL 1 (
1012
echo Gradle wrapper jar download failed. Bootstrap failed.
1113
)
1214

13-
powershell -Command "& {wget https://raw.githubusercontent.com/gradle/gradle/master/gradle/wrapper/gradle-wrapper.properties -OutFile gradle/wrapper/gradle-wrapper.properties}"
15+
powershell -Command "& {wget %GRADLE_WRAPPER_GITHUB_URL%/gradle-wrapper.properties -OutFile gradle/wrapper/gradle-wrapper.properties}"
1416
IF ERRORLEVEL 1 (
1517
echo Gradle wrapper properties download failed. Bootstrap failed.
1618
)

‎output-management/web-viewer/downloader/gradle/bootstrap/bootstrap-gradlew.sh‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
#!/usr/bin/env sh
22

33
DIR=gradle/wrapper
4-
JAR=${DIR}/gradle-wrapper.jar
4+
GRADLE_WRAPPER_GITHUB_URL="https://raw.githubusercontent.com/gradle/gradle/refs/tags/v8.14.3/gradle/wrapper"
55

66
if [ ! -f ${DIR}/gradle-wrapper.jar ]; then
77
echo "Gradle wrapper not found. Attempting to download..."
88

99
mkdir -p "${DIR}"
1010

11-
curl --silent --output ${DIR}/gradle-wrapper.jar \
12-
https://raw.githubusercontent.com/gradle/gradle/master/gradle/wrapper/gradle-wrapper.jar
11+
curl --silent --output ${DIR}/gradle-wrapper.jar ${GRADLE_WRAPPER_GITHUB_URL}/gradle-wrapper.jar
1312
if [ $? != 0 ]; then
1413
echo "Gradle wrapper jar download failed. Bootstrap failed."
1514
exit 1
1615
fi
1716

18-
curl --silent --output ${DIR}/gradle-wrapper.properties \
19-
https://raw.githubusercontent.com/gradle/gradle/master/gradle/wrapper/gradle-wrapper.properties
17+
curl --silent --output ${DIR}/gradle-wrapper.properties ${GRADLE_WRAPPER_GITHUB_URL}/gradle-wrapper.properties
2018
if [ $? != 0 ]; then
2119
echo "Gradle wrapper properties download failed. Bootstrap failed."
2220
exit 2

‎output-management/web-viewer/favorites/README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ Other OS:
5151
npm ci
5252

5353
### Build
54+
> [!CAUTION]
55+
> There is a [Gradle 9.x compatibility issue](https://github.com/OpenAPITools/openapi-generator/issues/22084)
56+
in the OpenAPI Generator. Verify that the `distributionUrl` property in the
57+
`gradle\wrapper\gradle-wrapper.properties` file contains `gradle-8.14.2-bin.zip`.
58+
If not, delete the `gradle\wrapper` folder and perform the [First-time Initialization](#first-time-initialization).
5459

5560
Use the following commands to build the application.
5661

‎output-management/web-viewer/favorites/gradle/bootstrap/bootstrap-gradlew.bat‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
@echo off
22

3+
SET GRADLE_WRAPPER_GITHUB_URL="https://raw.githubusercontent.com/gradle/gradle/refs/tags/v8.14.3/gradle/wrapper"
4+
35
if not exist gradle\wrapper\gradle-wrapper.jar (
46
echo Gradle wrapper not found. Attempting to download...
57

68
mkdir gradle\wrapper
79

8-
powershell -Command "& {wget https://raw.githubusercontent.com/gradle/gradle/master/gradle/wrapper/gradle-wrapper.jar -OutFile gradle/wrapper/gradle-wrapper.jar}"
10+
powershell -Command "& {wget %GRADLE_WRAPPER_GITHUB_URL%/gradle-wrapper.jar -OutFile gradle/wrapper/gradle-wrapper.jar}"
911
IF ERRORLEVEL 1 (
1012
echo Gradle wrapper jar download failed. Bootstrap failed.
1113
)
1214

13-
powershell -Command "& {wget https://raw.githubusercontent.com/gradle/gradle/master/gradle/wrapper/gradle-wrapper.properties -OutFile gradle/wrapper/gradle-wrapper.properties}"
15+
powershell -Command "& {wget %GRADLE_WRAPPER_GITHUB_URL%/gradle-wrapper.properties -OutFile gradle/wrapper/gradle-wrapper.properties}"
1416
IF ERRORLEVEL 1 (
1517
echo Gradle wrapper properties download failed. Bootstrap failed.
1618
)

‎output-management/web-viewer/favorites/gradle/bootstrap/bootstrap-gradlew.sh‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
#!/usr/bin/env sh
22

33
DIR=gradle/wrapper
4-
JAR=${DIR}/gradle-wrapper.jar
4+
GRADLE_WRAPPER_GITHUB_URL="https://raw.githubusercontent.com/gradle/gradle/refs/tags/v8.14.3/gradle/wrapper"
55

66
if [ ! -f ${DIR}/gradle-wrapper.jar ]; then
77
echo "Gradle wrapper not found. Attempting to download..."
88

99
mkdir -p "${DIR}"
1010

11-
curl --silent --output ${DIR}/gradle-wrapper.jar \
12-
https://raw.githubusercontent.com/gradle/gradle/master/gradle/wrapper/gradle-wrapper.jar
11+
curl --silent --output ${DIR}/gradle-wrapper.jar ${GRADLE_WRAPPER_GITHUB_URL}/gradle-wrapper.jar
1312
if [ $? != 0 ]; then
1413
echo "Gradle wrapper jar download failed. Bootstrap failed."
1514
exit 1
1615
fi
1716

18-
curl --silent --output ${DIR}/gradle-wrapper.properties \
19-
https://raw.githubusercontent.com/gradle/gradle/master/gradle/wrapper/gradle-wrapper.properties
17+
curl --silent --output ${DIR}/gradle-wrapper.properties ${GRADLE_WRAPPER_GITHUB_URL}/gradle-wrapper.properties
2018
if [ $? != 0 ]; then
2119
echo "Gradle wrapper properties download failed. Bootstrap failed."
2220
exit 2

0 commit comments

Comments
 (0)