v1.2.0

.github/workflows/pr.yml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Java
         uses: actions/setup-java@v5

.github/workflows/release.yml

@@ -41,7 +41,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup CommandBox
         uses: Ortus-Solutions/setup-commandbox@v2.0.1
@@ -115,7 +115,7 @@ jobs:
 
       - name: Upload Build Artifacts
         if: success()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: boxlang-build
           path: |
@@ -188,12 +188,12 @@ jobs:
       issues: write
     steps:
       - name: Checkout Development Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: development
 
       - name: Download build artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: boxlang-build
           path: .tmp

.github/workflows/snapshot.yml

@@ -37,7 +37,7 @@ jobs:
       contents: write
       checks: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Setup Java
         uses: actions/setup-java@v5
@@ -50,7 +50,7 @@ jobs:
           ./gradlew spotlessApply --stacktrace
 
       - name: Commit Format Changes
-        uses: stefanzweifel/git-auto-commit-action@v6
+        uses: stefanzweifel/git-auto-commit-action@v7
         with:
           commit_message: Apply cfformat changes
 

.github/workflows/tests.yml

@@ -9,7 +9,7 @@ on:
 
 env:
   MODULE_ID: ${{ github.event.repository.name }}
-  GRADLE_VERSION: 8.7
+  GRADLE_VERSION: 8.14.1
 
 jobs:
   tests:
@@ -35,7 +35,7 @@ jobs:
         #  experimental: true
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Setup Java
         uses: actions/setup-java@v5
@@ -78,7 +78,7 @@ jobs:
 
       - name: Upload Test Results
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: tests-${{ matrix.os }}-${{ matrix.jdkVersion }}
           path: |
@@ -110,7 +110,7 @@ jobs:
       issues: read
     steps:
       - name: Download Artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           path: artifacts
 

.gitignore

@@ -1,6 +1,7 @@
 .gradle
-build/**
+build/
 bin/
+test/
 !gradle/wrapper/gradle-wrapper.jar
 
 # Secrets
@@ -23,7 +24,8 @@ derby.log
 src/test/resources/libs/*
 !src/test/resources/libs/.gitkeep
 src/test/resources/modules/
-grapher/**
+grapher/
+boxlang_modules/
 
 ## HBXML Files
 src/test/resources/app/models/**/*.hbm*

COPILOT_INSTRUCTIONS.md

@@ -0,0 +1,44 @@
+# Copilot Instruction File for bx-orm
+
+## High-Level Purpose
+
+The `bx-orm` module provides Object-Relational Mapping (ORM) capabilities for the BoxLang  and boxlang JVM language. It enables developers to map BoxLang objects to relational database tables, manage database schema, and perform CRUD operations using a high-level, object-oriented approach. The module abstracts database interactions, allowing for more maintainable and database-agnostic application code.
+
+bx-orm sits as a middleware between the boxlang dynamic JVM language and Hibernate ORM. It abstracts not only database operations, but the verbose Hibernate configuration syntax.
+
+Due to issues with JPA requiring native java classes in entity configuration, bx-orm utilizes Hibernate 5.6.15-FINAL which enables dynamic java classes in place of Java source files. Hence all Hibernate integration code is written against Hibernate 5, not Hibernate 6 or 7.
+
+## Module Structure and Design
+
+- src/main/bx/**: Contains BoxLang source files, including the module settings file `ModuleConfig.bx` and boxlang interfaces for event handling, naming strategies, etc.
+- src/main/java/**: Java implementation of the ORM engine
+  - src/main/java/ortus/boxlang/modules/orm/bifs/**: Built-in functions for interacting with ORM entities or the ORM session.
+  - src/main/java/ortus/boxlang/modules/orm/config/**: Hibernate configuration-related files, such as the event handler, connection provider, naming strategies, and base Hibernate configuration wrapper.
+  - src/main/java/ortus/boxlang/modules/orm/hibernate/**: Houses hibernate interface implemenations for value casters (converters), the hibernate cache, and especially box class to hibernate entity proxy objects.
+  - src/main/java/ortus/boxlang/modules/orm/mapping/**: Houses classes that assist in parsing boxlang ORM entities into ORM context/state and generating hibernate HBM.xml configuration files
+- src/main/test/java/ortus/**: Junit tests
+- src/main/test/java/ortus/tools/**: Base test files and util classes for assistance in writing junit tests
+- src/main/test/resources/app/**: Test boxlang files for a test app. Includes ORM models, ORM configuration in Application.bx, and other boxlang test files.
+- src/main/resources/**: Resource files such as configuration, metadata, and licensing.
+- build/**: Build artifacts, generated sources, and documentation.
+- bin/**: Packaged module binaries and metadata for distribution.
+
+## Design Principles
+
+- **Separation of Concerns**: Java code handles low-level ORM logic, while BoxLang code provides configuration and high-level integration.
+- **Extensibility**: The module supports custom naming strategies, event handlers, and database dialects.
+- **Testability**: Includes comprehensive test cases and seed data to ensure reliability across different environments.
+- **Documentation**: Extensive documentation and examples are provided to help users understand and extend the module.
+
+## Usage Guidance for Copilot
+- Follow the established directory structure when adding new features.
+- Prefer extending existing interfaces and base classes for new ORM features.
+- Ensure new code is covered by tests in the `src/main/test/java/ortus/` directory.
+- Ensure new features, bug fixes, security updates, etc. are added to `changelog.md` under `## [Unreleased]`.
+
+## Tooling
+
+* Gradle is used for building/compiling the java sources, running junit tests, and building the final boxlang module structure into a zip file for uploading to forgebox.io.
+* Hibernate 5.6.15-FINAL serves as the ORM engine under the hood.
+* Spotless is used for java source formatting.
+* Docker-compose is used to stand up a simple mysql database for integration testing.

build.gradle

@@ -2,11 +2,11 @@
 plugins {
     id 'java'
     // For source code formatting
-    id "com.diffplug.spotless" version "7.2.1"
+    id "com.diffplug.spotless" version "8.1.0"
 	// https://github.com/harbby/gradle-serviceloader
     id "com.github.harbby.gradle.serviceloader" version "1.1.9"
 	// Shadow
-	id "com.gradleup.shadow" version "9.0.0-beta17"
+	id "com.gradleup.shadow" version "9.2.2"
     // Download task
     id "de.undercouch.download" version "5.6.0"
 }
@@ -42,8 +42,8 @@ dependencies {
 		compileOnly files( '../../boxlang/build/libs/boxlang-' + boxlangVersion + '.jar' )
 		testImplementation files( '../../boxlang/build/libs/boxlang-' + boxlangVersion + '.jar' )
 	} else {
-		compileOnly "io.boxlang:boxlang:1.6.0"
-		testImplementation "io.boxlang:boxlang:1.6.0"
+		compileOnly "io.boxlang:boxlang:1.7.0"
+		testImplementation "io.boxlang:boxlang:1.7.0"
 	}
 
 	// Implementation Dependencies
@@ -54,11 +54,11 @@ dependencies {
 	// https://mvnrepository.com/artifact/javax.cache/cache-api
 	implementation 'javax.cache:cache-api:1.1.1'
 	// https://mvnrepository.com/artifact/org.ehcache/ehcache
-	implementation 'org.ehcache:ehcache:3.10.8'
+	implementation 'org.ehcache:ehcache:3.11.1'
 
     // Testing Dependencies
     // Pinning this because the next version up breaks our tests
-    testImplementation "org.junit.jupiter:junit-jupiter:5.+"
+    testImplementation "org.junit.jupiter:junit-jupiter:6.+"
 	testImplementation "org.mockito:mockito-core:5.+"
 	testImplementation "com.google.truth:truth:1.+"
 	// Explicitly declare the JUnit platform launcher (to avoid deprecation)
@@ -152,7 +152,6 @@ shadowJar {
     mergeServiceFiles()
     destinationDirectory = file( "build/libs" )
 }
-build.finalizedBy( shadowJar )
 
 /**
  * Source Code Formatting
@@ -174,31 +173,32 @@ spotless {
  * - Copies the src/main/bx/** to build/module/ folder.
  */
 task createModuleStructure(type: Copy) {
+	mustRunAfter shadowJar, jar
     from( 'build/libs' ) {
 		include "${project.name}-${version}.jar"
         into 'libs'
     }
     from( 'src/main/bx' ) {
 		include '**/*.bx'
 		// Token Replacements Go Here
-		filter { line -> line.replaceAll('@build.version@', project.version) }
 		filter { line -> line.replaceAll('@build.hibernateVersion@', hibernateVersion) }
+		filter{ line -> line.replaceAll( '@build.version@', project.version ) }
 		if( project.branch == "development" ){
-			filter { line -> line.replaceAll( '\\+@build.number@', '' ) }
+			filter{ line -> line.replaceAll( '\\+@build.number@', '' ) }
 		} else {
-			filter { line -> line.replaceAll( '@build.number@', project.buildID ) }
+			filter{ line -> line.replaceAll( '@build.number@', project.buildID ) }
 		}
     }
     from( '.' ) {
         include 'box.json'
 		include 'readme.md'
 		include 'changelog.md'
 		// Token Replacements Go Here
-		filter { line -> line.replaceAll( '@build.version@', project.version ) }
+		filter{ line -> line.replaceAll( '@build.version@', project.version ) }
 		if( project.branch == "development" ){
-			filter { line -> line.replaceAll( '\\+@build.number@', '' ) }
+			filter{ line -> line.replaceAll( '\\+@build.number@', '' ) }
 		} else {
-			filter { line -> line.replaceAll( '@build.number@', project.buildID ) }
+			filter{ line -> line.replaceAll( '@build.number@', project.buildID ) }
 		}
     }
 

changelog.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- [BLMODULES-102](https://ortussolutions.atlassian.net/browse/BLMODULES-102) - Fix ORM usage in threads causing ConcurrentModificationException
+
 ## [1.1.3] - 2025-11-04
 
 ### 🐛 Fixed