Skip to content

Commit

Permalink
Merge pull request #20 from ortus-boxlang/development
Browse files Browse the repository at this point in the history
v1.0.0-Beta17
  • Loading branch information
lmajano authored Oct 4, 2024
2 parents 7276857 + 4fae900 commit cb0f278
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 20 deletions.
23 changes: 12 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
permissions:
checks: write
contents: write
packages: write
steps:
- name: Checkout Repository
uses: actions/checkout@v4
Expand Down Expand Up @@ -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 publishToSonatype closeAndReleaseSonatypeStagingRepository
# 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: |
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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" )
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
7 changes: 5 additions & 2 deletions src/main/java/ortus/boxlang/servlet/BoxLangServlet.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {
Expand Down

0 comments on commit cb0f278

Please sign in to comment.