From 05bf46bb3bba46e9f700d3cf2ed986acb14cc764 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Mon, 2 Dec 2024 11:44:54 +0000 Subject: [PATCH 1/3] Version bump --- changelog.md | 6 +++++- gradle.properties | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changelog.md b/changelog.md index 04ff806..03a8a18 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-beta24] - 2024-12-02 + ## [1.0.0-beta23] - 2024-11-23 ## [1.0.0-beta22] - 2024-11-15 @@ -57,7 +59,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-beta23...HEAD +[Unreleased]: https://github.com/ortus-boxlang/boxlang-servlet/compare/v1.0.0-beta24...HEAD + +[1.0.0-beta24]: https://github.com/ortus-boxlang/boxlang-servlet/compare/v1.0.0-beta23...v1.0.0-beta24 [1.0.0-beta23]: https://github.com/ortus-boxlang/boxlang-servlet/compare/v1.0.0-beta22...v1.0.0-beta23 diff --git a/gradle.properties b/gradle.properties index fadb91c..38a1691 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -#Sat Nov 23 12:55:59 UTC 2024 -boxlangVersion=1.0.0-beta24 +#Mon Dec 02 11:44:52 UTC 2024 +boxlangVersion=1.0.0-beta25 jdkVersion=21 -version=1.0.0-beta24 +version=1.0.0-beta25 group=ortus.boxlang From deb338123df68cfee12a855561f99b37b155d0b7 Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Sat, 7 Dec 2024 09:52:10 -0600 Subject: [PATCH 2/3] create zip file of server for testing --- build.gradle | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f6820f8..6a4142d 100644 --- a/build.gradle +++ b/build.gradle @@ -358,8 +358,8 @@ task packageWar( type: War ){ println "+ War created in the distributions folder" } } -task buildRuntime( type: Copy ){ - dependsOn( packageWar ) +task buildRuntime( type: Copy, dependsOn: packageWar ){ + finalizedBy( "zipEngine" ) from( 'build/distributions' ) { include "${project.name}-${version}.war" include "box.json" @@ -380,6 +380,18 @@ task buildRuntime( type: Copy ){ } } +/** + * ZIp up a test server + */ +task zipEngine( type: Zip ) { + archiveFileName = "boxlang-servlet-${version}.zip" + destinationDirectory = file( "build/forgebox" ) + from( "build/forgebox" ) { + include "box.json" + include "*.war" + } +} + /** * TEMPORARY until we publish to maven * Task to download the latest jar from https://ortus-temp.s3.amazonaws.com/jericho/libs/boxlang-1.0.0-all.jar From 6b721f22fc21ee107e9457729424465d94f22d81 Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Sat, 7 Dec 2024 09:54:34 -0600 Subject: [PATCH 3/3] make sure it creates the engine as a zip for ease of use --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6a4142d..8c925d1 100644 --- a/build.gradle +++ b/build.gradle @@ -385,7 +385,7 @@ task buildRuntime( type: Copy, dependsOn: packageWar ){ */ task zipEngine( type: Zip ) { archiveFileName = "boxlang-servlet-${version}.zip" - destinationDirectory = file( "build/forgebox" ) + destinationDirectory = file( "build/distributions" ) from( "build/forgebox" ) { include "box.json" include "*.war"