forgebox and s3 updates

.github/workflows/release.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Setup CommandBox
         uses: Ortus-Solutions/[email protected]
         with:
-          forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
+          forgeboxAPIKey: ${{ secrets.FORGEBOX_API_TOKEN }}
 
       - name: Setup Java
         uses: actions/setup-java@v4
@@ -118,11 +118,11 @@ jobs:
         with:
           args: --acl public-read
         env:
-          AWS_S3_BUCKET: "ortus-temp"
+          AWS_S3_BUCKET: "downloads.ortussolutions.com"
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ACCESS_SECRET }}
           SOURCE_DIR: "build/distributions"
-          DEST_DIR: "boxlang-modules/${{ env.MODULE_ID }}/${{ env.VERSION }}"
+          DEST_DIR: "ortussolutions/boxlang-modules/${{ env.MODULE_ID }}/${{ env.VERSION }}"
 
       # - name: Upload API Docs to S3
       #   uses: jakejarvis/s3-sync-action@master
@@ -137,6 +137,10 @@ jobs:
 
       # - name: Publish to Maven Central
       #   run: |
+      - name: Publish to ForgeBox
+        run: |
+          cd build/module
+          box forgebox publish --force
 
       - name: Create Github Release
         uses: taiki-e/[email protected]

.vscode/settings.json

@@ -18,4 +18,3 @@
 		"source.organizeImports": "explicit"
 	}
 }
-

box.json

@@ -1,46 +1,48 @@
 {
-    "name":"BoxLang Apache Derby",
-    "version":"@build.version@[email protected]@",
-    "location"  : "https://downloads.ortussolutions.com/ortussolutions/boxlang-modules/bx-derby/@build.version@/[email protected]@.zip",
-    "author":"Ortus Solutions",
-    "homepage":"https://github.com/boxlang-modules/bx-derby",
-    "documentation":"https://github.com/boxlang-modules/bx-derby",
-    "repository":{
-        "type":"git",
-        "URL":"https://github.com/boxlang-modules/bx-derby"
-    },
-    "bugs":"https://github.com/boxlang-modules/bx-derby/issues",
-    "slug":"bx-derby",
-    "shortDescription":"Module template for BoxLang modules",
-    "type":"boxlang-modules",
-    "keywords":[
-        "boxlang"
-    ],
-    "private":false,
-    "license":[
-        {
-            "type":"Apache-2.0",
-            "URL":"https://www.apache.org/licenses/LICENSE-2.0"
-        }
-    ],
-	"devDependencies" 	:{
-		"commandbox-cfformat":"*",
-        "commandbox-docbox":"*",
-		"commandbox-dotenv":"*",
-        "commandbox-cfconfig":"*",
+	"name": "BoxLang Apache Derby",
+	"version": "@build.version@[email protected]@",
+	"location": "https://downloads.ortussolutions.com/ortussolutions/boxlang-modules/bx-derby/@build.version@/[email protected]@.zip",
+	"author": "Ortus Solutions",
+	"homepage": "https://github.com/boxlang-modules/bx-derby",
+	"documentation": "https://github.com/boxlang-modules/bx-derby",
+	"repository": {
+		"type": "git",
+		"URL": "https://github.com/boxlang-modules/bx-derby"
+	},
+	"bugs": "https://github.com/boxlang-modules/bx-derby/issues",
+	"slug": "bx-derby",
+	"shortDescription": "BoxLang module for Apache Derby database connectivity",
+	"type": "boxlang-modules",
+	"boxlang": {
+		"moduleName": "derby"
+	},
+	"keywords": ["boxlang"],
+	"unlisted": true,
+	"private": false,
+	"license": [
+		{
+			"type": "Apache-2.0",
+			"URL": "https://www.apache.org/licenses/LICENSE-2.0"
+		}
+	],
+	"devDependencies": {
+		"commandbox-cfformat": "*",
+		"commandbox-docbox": "*",
+		"commandbox-dotenv": "*",
+		"commandbox-cfconfig": "*",
 		"testbox": "*"
 	},
-    "ignore": [
-        "**/.*",
-        "settings.gradle",
-        "gradlew.bat",
-        "gradlew",
-        "build.gradle",
-        "/src/**",
-        "gradle/**"
-    ],
-	"scripts":{
+	"ignore": [
+		"**/.*",
+		"settings.gradle",
+		"gradlew.bat",
+		"gradlew",
+		"build.gradle",
+		"/src/**",
+		"gradle/**"
+	],
+	"scripts": {
 		"setupTemplate": "task run taskFile=src/build/SetupTemplate.cfc",
-        "onRelease":"publish"
-    }
+		"onRelease": "publish"
+	}
 }

build.gradle

@@ -28,11 +28,13 @@ dependencies {
 	// Until BoxLang is published to Maven Central
 	// Look for it in the local build directory
 	// You must run `./gradle build -x test` in the BoxLang project
+    // compileOnly files( 'src/test/resources/libs/boxlang-websupport-1.0.0.jar' )
     compileOnly files( 'src/test/resources/libs/boxlang-1.0.0-all.jar' )
-    implementation 'org.apache.derby:derby:10.16.1.1'
+	implementation 'org.apache.derby:derby:10.16.1.1'
 
     // Testing Dependencies
-	testImplementation files( 'src/test/resources/libs/boxlang-1.0.0-all.jar' )
+    // testImplementation files( 'src/test/resources/libs/boxlang-websupport-1.0.0.jar' )
+    testImplementation files( 'src/test/resources/libs/boxlang-1.0.0-all.jar' )
     testImplementation "org.junit.jupiter:junit-jupiter:5.+"
 	testImplementation "org.mockito:mockito-core:5.+"
 	testImplementation "com.google.truth:truth:1.+"
@@ -185,10 +187,13 @@ task downloadBoxLang( type: Download ) {
 	doFirst {
 		file( "src/test/resources/libs" ).mkdirs()
 	}
-    // Configure the URL of the file to download
-    src "https://ortus-temp.s3.amazonaws.com/jericho/libs/boxlang-${boxlangVersion}-all.jar"
-    // Specify the destination directory for the downloaded file
-    dest "src/test/resources/libs/boxlang-${boxlangVersion}-all.jar"
+	// Configure the URLs of the files to download
+	src([
+		"https://downloads.ortussolutions.com/ortussolutions/boxlang/${boxlangVersion}/boxlang-${boxlangVersion}-all.jar"//,
+		// "https://downloads.ortussolutions.com/ortussolutions/boxlang-runtimes/boxlang-web-support/${boxlangVersion}/boxlang-web-support-${boxlangVersion}.jar"
+	])
+	// Specify the destination directories for the downloaded files
+	dest "src/test/resources/libs/"
     overwrite true
     onlyIfModified false
 }

gradle.properties

@@ -1,5 +1,5 @@
 # Gradle Properties
-version = 1.0.0
-group = com.ortussolutions
-boxlangVersion = 1.0.0
-jdkVersion = 17
+version=1.0.0
+group=com.ortussolutions
+boxlangVersion=1.0.0
+jdkVersion=17