From 967bdef910a2658cd6941e0491e5e193ac9649db Mon Sep 17 00:00:00 2001 From: Drew Brokke Date: Mon, 11 Nov 2024 15:38:04 -0600 Subject: [PATCH 1/5] LPD-41339 liferay-blade-cli: put jcenter last --- build.gradle | 4 ++-- extensions/build.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 0e860fa8a..a9ce02d1d 100644 --- a/build.gradle +++ b/build.gradle @@ -9,8 +9,6 @@ buildscript { } repositories { - jcenter() - maven { url "https://plugins.gradle.org/m2/" } @@ -25,6 +23,8 @@ buildscript { } mavenCentral() + + jcenter() } } diff --git a/extensions/build.gradle b/extensions/build.gradle index e76b6701f..46bab9169 100644 --- a/extensions/build.gradle +++ b/extensions/build.gradle @@ -21,8 +21,6 @@ subprojects { dirs "${rootProject.projectDir}/libs" } - jcenter() - maven { url "https://repo.gradle.org/gradle/libs-releases/" } @@ -36,5 +34,7 @@ subprojects { } mavenCentral() + + jcenter() } } \ No newline at end of file From 415753bc0974d60b0ba6692f00651db74d35d54d Mon Sep 17 00:00:00 2001 From: Drew Brokke Date: Mon, 11 Nov 2024 16:56:43 -0600 Subject: [PATCH 2/5] LPD-41339 liferay-blade-cli: workflow: bumps version of upload-artifact --- .github/workflows/verify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 932e52bca..a4ec3e901 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -89,7 +89,7 @@ jobs: run: | ./run-tests.sh - name: Upload tests zip - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: LinuxJDK11-tests.zip From ee4694340423c041eca0eef007f3718c71140d8d Mon Sep 17 00:00:00 2001 From: Drew Brokke Date: Mon, 11 Nov 2024 16:57:10 -0600 Subject: [PATCH 3/5] LPD-41339 liferay-blade-cli: workflow: parameterize the jobs that are otherwise identical except for JDK version --- .github/workflows/verify.yml | 41 +++++++----------------------------- 1 file changed, 8 insertions(+), 33 deletions(-) diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index a4ec3e901..d8f7e47b4 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -32,45 +32,17 @@ jobs: shell: bash run: | ./gradlew --no-daemon checkSourceFormatting - LinuxJDK8: - name: Linux JDK8 + RunTests: + name: Linux JDK${{matrix.javaVersion}} runs-on: ubuntu-latest timeout-minutes: 60 steps: - name: Check out repository uses: actions/checkout@v3 - - name: Setup Java 8 + - name: Setup Java ${{matrix.javaVersion}} uses: actions/setup-java@v3 with: - java-version: 8 - distribution: 'zulu' - cache: gradle - - name: Cache - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/build.gradle', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Build - shell: bash - env: - GITHUB_CI: "true" - run: | - ./run-tests.sh - LinuxJDK11: - name: Linux JDK11 - runs-on: ubuntu-latest - timeout-minutes: 60 - steps: - - name: Check out repository - uses: actions/checkout@v3 - - name: Setup Java 11 - uses: actions/setup-java@v3 - with: - java-version: 11.0.20 + java-version: ${{matrix.javaVersion}} distribution: 'zulu' cache: gradle - name: Cache @@ -92,8 +64,11 @@ jobs: uses: actions/upload-artifact@v4 if: failure() with: - name: LinuxJDK11-tests.zip + name: LinuxJDK${{matrix.javaVersion}}-tests.zip path: tests.zip + strategy: + matrix: + javaVersion: [8, 11] #MacOSJDK11: # name: MacOS JDK11 # runs-on: macos-latest From 61592c1a971a68cadd299b3243ccc510f650302b Mon Sep 17 00:00:00 2001 From: Drew Brokke Date: Mon, 11 Nov 2024 15:40:02 -0600 Subject: [PATCH 4/5] LPD-41339 liferay-blade-cli: prepareRelease 7.0.2 --- cli/build.gradle | 8 ++++---- extensions/maven-profile/build.gradle | 2 +- extensions/project-templates-js-theme/build.gradle | 2 +- extensions/project-templates-js-widget/build.gradle | 2 +- extensions/project-templates-social-bookmark/build.gradle | 2 +- extensions/remote-deploy-command/build.gradle | 2 +- gradle-tooling/build.gradle | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cli/build.gradle b/cli/build.gradle index ac0aade15..08f3efbf7 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -115,9 +115,9 @@ dependencies { api name: "org.objectweb.asm.tree-6.0.0" api name: "org.objectweb.asm.util-6.0.0" - bladeExtensions group: "com.liferay.blade", name: "com.liferay.blade.extensions.maven.profile", version: "1.0.42-SNAPSHOT" - bladeExtensions group: "com.liferay.blade", name: "com.liferay.project.templates.js.theme", version: "1.0.25-SNAPSHOT" - bladeExtensions group: "com.liferay.blade", name: "com.liferay.project.templates.js.widget", version: "1.0.26-SNAPSHOT" + bladeExtensions group: "com.liferay.blade", name: "com.liferay.blade.extensions.maven.profile", version: "1.0.42" + bladeExtensions group: "com.liferay.blade", name: "com.liferay.project.templates.js.theme", version: "1.0.25" + bladeExtensions group: "com.liferay.blade", name: "com.liferay.project.templates.js.widget", version: "1.0.26" compileOnly group: "org.osgi", name: "osgi.core", version: "6.0.0" compileOnly project(":gradle-tooling") @@ -326,6 +326,6 @@ unzipPortal { finalizedBy("processZipsResources") } -version = "7.0.2-SNAPSHOT" +version = "7.0.2" apply from: "blade-jar-smoke-tests.gradle" \ No newline at end of file diff --git a/extensions/maven-profile/build.gradle b/extensions/maven-profile/build.gradle index ba5c0cf17..6f754c6df 100644 --- a/extensions/maven-profile/build.gradle +++ b/extensions/maven-profile/build.gradle @@ -44,4 +44,4 @@ publishing { } } -version = "1.0.42-SNAPSHOT" \ No newline at end of file +version = "1.0.42" \ No newline at end of file diff --git a/extensions/project-templates-js-theme/build.gradle b/extensions/project-templates-js-theme/build.gradle index 269b3f77b..414dd31d4 100644 --- a/extensions/project-templates-js-theme/build.gradle +++ b/extensions/project-templates-js-theme/build.gradle @@ -59,4 +59,4 @@ test { } } -version = "1.0.25-SNAPSHOT" \ No newline at end of file +version = "1.0.25" \ No newline at end of file diff --git a/extensions/project-templates-js-widget/build.gradle b/extensions/project-templates-js-widget/build.gradle index e95d8569d..7c17de246 100644 --- a/extensions/project-templates-js-widget/build.gradle +++ b/extensions/project-templates-js-widget/build.gradle @@ -57,4 +57,4 @@ test { } } -version = "1.0.26-SNAPSHOT" \ No newline at end of file +version = "1.0.26" \ No newline at end of file diff --git a/extensions/project-templates-social-bookmark/build.gradle b/extensions/project-templates-social-bookmark/build.gradle index 677d260e6..c26e9bb96 100644 --- a/extensions/project-templates-social-bookmark/build.gradle +++ b/extensions/project-templates-social-bookmark/build.gradle @@ -59,4 +59,4 @@ publishing { } } -version = "1.0.23-SNAPSHOT" \ No newline at end of file +version = "1.0.23" \ No newline at end of file diff --git a/extensions/remote-deploy-command/build.gradle b/extensions/remote-deploy-command/build.gradle index 818a191e9..532c4e767 100644 --- a/extensions/remote-deploy-command/build.gradle +++ b/extensions/remote-deploy-command/build.gradle @@ -37,4 +37,4 @@ publishing { } } -version = "1.0.33-SNAPSHOT" \ No newline at end of file +version = "1.0.33" \ No newline at end of file diff --git a/gradle-tooling/build.gradle b/gradle-tooling/build.gradle index 48ded776c..a96b3a751 100644 --- a/gradle-tooling/build.gradle +++ b/gradle-tooling/build.gradle @@ -17,4 +17,4 @@ publishing { } */ -version = "1.2.26-SNAPSHOT" \ No newline at end of file +version = "1.2.26" \ No newline at end of file From 2e365d27ca12e0f2f199356de478a30c436e5f86 Mon Sep 17 00:00:00 2001 From: Drew Brokke Date: Mon, 11 Nov 2024 16:59:34 -0600 Subject: [PATCH 5/5] LPD-41339 liferay-blade-cli: buildChangelogs --- CHANGELOG.commits | 1 + CHANGELOG.markdown | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/CHANGELOG.commits b/CHANGELOG.commits index 3699877b7..fbfc0fdb9 100644 --- a/CHANGELOG.commits +++ b/CHANGELOG.commits @@ -1,3 +1,4 @@ +7.0.2:d4bafa36754932ec4b00325a690fb42ea82bdae4..984c77401db4a3e168fdd02c02bc1e7890feae88 7.0.1:bd4ed0488324ce2a6e3cd35efd8c77da90720362..d4bafa36754932ec4b00325a690fb42ea82bdae4 7.0.0:8232a7a9b4f171cd39d308d86eefd9ce2121769e..bd4ed0488324ce2a6e3cd35efd8c77da90720362 6.0.0:24b33093382cf2e0d14b7b22cc6f15786cb0c267..8232a7a9b4f171cd39d308d86eefd9ce2121769e diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown index 988d56b29..5f93490fd 100644 --- a/CHANGELOG.markdown +++ b/CHANGELOG.markdown @@ -1,5 +1,54 @@ # Liferay Blade CLI Change Log +## 7.0.2 - 2024-11-11 + +### Commits +- [LPD-41339] liferay-blade-cli: workflow: parameterize the jobs that are +otherwise identical except for JDK version (35f153225c) +- [LPD-41339] liferay-blade-cli: workflow: bumps version of upload-artifact +(ab74e7df78) +- [LPD-41339] liferay-blade-cli: put jcenter last (4b4eadc9eb) +- [LPD-32781] cli: bnd.bnd: includes org.apache.http at runtime (b2bb226c16) +- [LPD-32781] cli: bumps com.liferay.project.templates to 5.0.297 (c322469341) +- [LPD-32781] cli: use string matching on the docker property to get the target +platform version from the docker image property (49dba7b3f0) +- [LPD-32781] liferay-blade-cli: auto SF (57243dd6f6) +- [LPD-32781] extensions: bumps project templates compatible version ranges +(b124de1dbe) +- [LPD-32781] liferay-blade-cli: removes unused ResourceUtil (dafdd33d09) +- [LPD-32781] liferay-blade-cli: CreateCommand: normalizes version string before +checking Version range (da782b67f6) +- [LPD-32781] liferay-blade-cli: updates getProduct methods in WorkspaceProvider +classes (ca01fea6c5) +- [LPD-32781] liferay-blade-cli: updates usages to use new lib and util in tests +(d145cd6899) +- [LPD-32781] liferay-blade-cli: updates usages to use new lib and util +(c7bcbf9321) +- [LPD-32781] liferay-blade-cli: ReleaseUtil extends from lib ReleaseUtil +(3d8c2ebc81) +- [LPD-32781] includes lib classes in resulting jar (0e77920e1c) +- [LPD-32781] adds com.liferay.release.util dependency (dcb3cc70d9) +- [LPD-32781] cli: bumps project templates dependency version (45263216e5) + +### Dependencies +- [LPD-41339] Update the com.liferay.blade.extensions.maven.profile dependency +to version 1.0.42. +- [LPD-41339] Update the com.liferay.project.templates.js.theme dependency to +version 1.0.25. +- [LPD-41339] Update the com.liferay.project.templates.js.widget dependency to +version 1.0.26. +- [LPD-32781] Update the com.liferay.project.templates dependency to version +5.0.298. +- [LPD-32781] Update the com.liferay.release.util dependency to version 1.0.0. +- [LPD-32781] Update the com.liferay.project.templates dependency to version +5.0.296. +- [LPD-32144] Update the com.liferay.blade.extensions.maven.profile dependency +to version 1.0.42-SNAPSHOT. +- [LPD-32144] Update the com.liferay.project.templates.js.theme dependency to +version 1.0.25-SNAPSHOT. +- [LPD-32144] Update the com.liferay.project.templates.js.widget dependency to +version 1.0.26-SNAPSHOT. + ## 7.0.1 - 2024-07-26 ### Commits @@ -2891,6 +2940,8 @@ maintainability (7f9bc3f45e) [LPD-28297]: https://issues.liferay.com/browse/LPD-28297 [LPD-31577]: https://issues.liferay.com/browse/LPD-31577 [LPD-32144]: https://issues.liferay.com/browse/LPD-32144 +[LPD-32781]: https://issues.liferay.com/browse/LPD-32781 +[LPD-41339]: https://issues.liferay.com/browse/LPD-41339 [LPS-47580]: https://issues.liferay.com/browse/LPS-47580 [LPS-50156]: https://issues.liferay.com/browse/LPS-50156 [LPS-58672]: https://issues.liferay.com/browse/LPS-58672