From 2e3193e17d4cdbe044be4d25bd22635e1199f861 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Fri, 27 Sep 2024 20:20:30 +0000 Subject: [PATCH 1/4] Version bump --- changelog.md | 6 +++++- gradle.properties | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changelog.md b/changelog.md index 3d01ac2..11c451d 100644 --- a/changelog.md +++ b/changelog.md @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.0.0-beta16] - 2024-09-27 + ## [1.0.0-beta15] - 2024-09-20 ## [1.0.0-beta14] - 2024-09-13 @@ -41,7 +43,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - First iteration of this runtime -[Unreleased]: https://github.com/ortus-boxlang/boxlang-servlet/compare/v1.0.0-beta15...HEAD +[Unreleased]: https://github.com/ortus-boxlang/boxlang-servlet/compare/v1.0.0-beta16...HEAD + +[1.0.0-beta16]: https://github.com/ortus-boxlang/boxlang-servlet/compare/v1.0.0-beta15...v1.0.0-beta16 [1.0.0-beta15]: https://github.com/ortus-boxlang/boxlang-servlet/compare/v1.0.0-beta14...v1.0.0-beta15 diff --git a/gradle.properties b/gradle.properties index 484b1d5..2641d9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -#Fri Sep 20 13:05:51 UTC 2024 -boxlangVersion=1.0.0-beta16 +#Fri Sep 27 20:20:29 UTC 2024 +boxlangVersion=1.0.0-beta17 jdkVersion=21 -version=1.0.0-beta16 +version=1.0.0-beta17 group=ortus.boxlang From 077ce4e72422c8b956ad171a8536dbd9814b8e9a Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Fri, 27 Sep 2024 17:11:47 -0600 Subject: [PATCH 2/4] fixing publish to maven --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7828292..17d0732 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -164,7 +164,7 @@ jobs: # if: env.SNAPSHOT == 'false' # run: | # gradle publish --no-daemon --no-parallel - # gradle publishToSonatype closeAndReleaseSonatypeStagingRepository + # gradle publishAllPublicationsToCentralPortal # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # GPG_KEY: ${{ secrets.GPG_KEY }} From 5c591d57940ff768df5f337e58a6b89a8c0d5f90 Mon Sep 17 00:00:00 2001 From: Michael Born Date: Mon, 30 Sep 2024 10:33:17 -0400 Subject: [PATCH 3/4] Fix debug mode parsing to NOT set a default Do NOT default the debugMode parameter to false, but instead pass a null if none is configured. This way we can fall back to the boxlang runtime's `BOXLANG_DEBUG` env var loading, and/or other config reading. --- src/main/java/ortus/boxlang/servlet/BoxLangServlet.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/ortus/boxlang/servlet/BoxLangServlet.java b/src/main/java/ortus/boxlang/servlet/BoxLangServlet.java index 6b34da7..6d951e9 100644 --- a/src/main/java/ortus/boxlang/servlet/BoxLangServlet.java +++ b/src/main/java/ortus/boxlang/servlet/BoxLangServlet.java @@ -70,10 +70,13 @@ public void init( ServletConfig config ) throws ServletException { BLHome = Path.of( customHome ); } // Null, if not exists - Boolean debug = Boolean.parseBoolean( config.getInitParameter( "boxlang-debug" ) ); + Boolean debug = null; + String debugParam = config.getInitParameter( "boxlang-debug" ); + // Null, if not exists. Must be absolute path. String configPath = config.getInitParameter( "boxlang-config-path" ); - if ( debug != null ) { + if ( debugParam != null ) { + debug = Boolean.parseBoolean( debugParam ); System.out.println( "Ortus BoxLang Servlet debug mode: " + debug ); } if ( configPath != null ) { From 4fae9003c2eb8e93d4e3669881283603ac92b6c5 Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Fri, 4 Oct 2024 21:21:53 +0200 Subject: [PATCH 4/4] maven publish --- .github/workflows/release.yml | 23 ++++++++++++----------- build.gradle | 8 ++++---- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 17d0732..7146c18 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,6 +45,7 @@ jobs: permissions: checks: write contents: write + packages: write steps: - name: Checkout Repository uses: actions/checkout@v4 @@ -160,17 +161,17 @@ jobs: DEST_DIR: "boxlang-runtimes/${{ env.MODULE_ID }}/${{ env.VERSION }}" # Publish to Maven Central + Github ONLY on Beta/Final Releases - # - name: Publish Package (Maven+Github) - # if: env.SNAPSHOT == 'false' - # run: | - # gradle publish --no-daemon --no-parallel - # gradle publishAllPublicationsToCentralPortal - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # GPG_KEY: ${{ secrets.GPG_KEY }} - # GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }} - # MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} - # MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + - name: Publish Package (Maven+Github) + if: env.SNAPSHOT == 'false' + run: | + gradle publish --no-daemon --no-parallel + gradle publishAllPublicationsToCentralPortal + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GPG_KEY: ${{ secrets.GPG_KEY }} + GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }} + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - name: Publish to ForgeBox run: | diff --git a/build.gradle b/build.gradle index 4c61fc4..bd13f11 100644 --- a/build.gradle +++ b/build.gradle @@ -141,9 +141,9 @@ publishing { } } scm { - connection = 'scm:git:https://github.com/ortus-boxlang/boxlang.git' - developerConnection = 'scm:git:ssh://github.com/ortus-boxlang/boxlang.git' - url = 'https://github.com/ortus-boxlang/boxlang' + connection = 'scm:git:https://github.com/ortus-boxlang/boxlang-servlet.git' + developerConnection = 'scm:git:ssh://github.com/ortus-boxlang/boxlang-servlet.git' + url = 'https://github.com/ortus-boxlang/boxlang-servlet' } developers{ developer { @@ -214,7 +214,7 @@ publishing { } maven { name = "GitHubPackages" - url = "https://maven.pkg.github.com/ortus-boxlang/boxlang" + url = "https://maven.pkg.github.com/ortus-boxlang/boxlang-servlet" credentials { username = System.getenv( "GITHUB_ACTOR" ) password = System.getenv( "GITHUB_TOKEN" )