diff --git a/build.gradle b/build.gradle index af858d4..bf837f5 100644 --- a/build.gradle +++ b/build.gradle @@ -59,6 +59,7 @@ compileTestJava{ // Make sure the service loaders are created before testing dependsOn compileJava, serviceLoaderBuild } +compileTestJava.finalizedBy( shadowJar ) javadoc { // To avoid our own doclet issues @@ -131,11 +132,11 @@ task createModuleStructure(type: Copy) { from( 'src/main/bx' ) { include '**/*.bx' // 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@', '-SNAPSHOT' ) ) + filter{ line -> line.replaceAll( '\\+@build.number@', '-SNAPSHOT' ) } } else { - filter( line -> line.replaceAll( '@build.number@', project.buildID ) ) + filter{ line -> line.replaceAll( '@build.number@', project.buildID ) } } } from( '.' ) { @@ -143,11 +144,11 @@ task createModuleStructure(type: Copy) { 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@', '-SNAPSHOT' ) ) + filter{ line -> line.replaceAll( '\\+@build.number@', '-SNAPSHOT' ) } } else { - filter( line -> line.replaceAll( '@build.number@', project.buildID ) ) + filter{ line -> line.replaceAll( '@build.number@', project.buildID ) } } } diff --git a/src/main/bx/ModuleConfig.bx b/src/main/bx/ModuleConfig.bx index aeb4172..d000eef 100644 --- a/src/main/bx/ModuleConfig.bx +++ b/src/main/bx/ModuleConfig.bx @@ -38,7 +38,7 @@ * The BoxLang mapping for your module. All BoxLang modules are registered with an internal * mapping prefix of : bxModules.{this.mapping}, /bxmodules/{this.mapping}. Ex: bxModules.test, /bxmodules/test */ - this.mapping = "bx-compat"; + this.mapping = "bxCompat"; /** * Who built the module diff --git a/src/main/java/com/ortussolutions/bifs/cache/CacheClear.java b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheClear.java similarity index 98% rename from src/main/java/com/ortussolutions/bifs/cache/CacheClear.java rename to src/main/java/ortus/boxlang/compat/bifs/cache/CacheClear.java index 090c6fe..03573a8 100644 --- a/src/main/java/com/ortussolutions/bifs/cache/CacheClear.java +++ b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheClear.java @@ -12,7 +12,7 @@ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package com.ortussolutions.bifs.cache; +package ortus.boxlang.compat.bifs.cache; import java.util.Set; diff --git a/src/main/java/com/ortussolutions/bifs/cache/CacheClearAll.java b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheClearAll.java similarity index 98% rename from src/main/java/com/ortussolutions/bifs/cache/CacheClearAll.java rename to src/main/java/ortus/boxlang/compat/bifs/cache/CacheClearAll.java index a297adc..2f68840 100644 --- a/src/main/java/com/ortussolutions/bifs/cache/CacheClearAll.java +++ b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheClearAll.java @@ -12,7 +12,7 @@ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package com.ortussolutions.bifs.cache; +package ortus.boxlang.compat.bifs.cache; import java.util.Set; diff --git a/src/main/java/com/ortussolutions/bifs/cache/CacheClearOrFail.java b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheClearOrFail.java similarity index 98% rename from src/main/java/com/ortussolutions/bifs/cache/CacheClearOrFail.java rename to src/main/java/ortus/boxlang/compat/bifs/cache/CacheClearOrFail.java index 38f0e89..e1da04b 100644 --- a/src/main/java/com/ortussolutions/bifs/cache/CacheClearOrFail.java +++ b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheClearOrFail.java @@ -12,7 +12,7 @@ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package com.ortussolutions.bifs.cache; +package ortus.boxlang.compat.bifs.cache; import java.util.Set; diff --git a/src/main/java/com/ortussolutions/bifs/cache/CacheGet.java b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGet.java similarity index 98% rename from src/main/java/com/ortussolutions/bifs/cache/CacheGet.java rename to src/main/java/ortus/boxlang/compat/bifs/cache/CacheGet.java index eeb442c..c2cbe51 100644 --- a/src/main/java/com/ortussolutions/bifs/cache/CacheGet.java +++ b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGet.java @@ -12,7 +12,7 @@ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package com.ortussolutions.bifs.cache; +package ortus.boxlang.compat.bifs.cache; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/com/ortussolutions/bifs/cache/CacheGetAll.java b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetAll.java similarity index 98% rename from src/main/java/com/ortussolutions/bifs/cache/CacheGetAll.java rename to src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetAll.java index 4cc1c73..33498cf 100644 --- a/src/main/java/com/ortussolutions/bifs/cache/CacheGetAll.java +++ b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetAll.java @@ -12,7 +12,7 @@ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package com.ortussolutions.bifs.cache; +package ortus.boxlang.compat.bifs.cache; import java.util.Set; diff --git a/src/main/java/com/ortussolutions/bifs/cache/CacheGetAllIds.java b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetAllIds.java similarity index 98% rename from src/main/java/com/ortussolutions/bifs/cache/CacheGetAllIds.java rename to src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetAllIds.java index 099fa1c..2d3b8ae 100644 --- a/src/main/java/com/ortussolutions/bifs/cache/CacheGetAllIds.java +++ b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetAllIds.java @@ -12,7 +12,7 @@ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package com.ortussolutions.bifs.cache; +package ortus.boxlang.compat.bifs.cache; import java.util.Set; diff --git a/src/main/java/com/ortussolutions/bifs/cache/CacheGetAsOptional.java b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetAsOptional.java similarity index 98% rename from src/main/java/com/ortussolutions/bifs/cache/CacheGetAsOptional.java rename to src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetAsOptional.java index b1b3c3b..b1af0ca 100644 --- a/src/main/java/com/ortussolutions/bifs/cache/CacheGetAsOptional.java +++ b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetAsOptional.java @@ -12,7 +12,7 @@ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package com.ortussolutions.bifs.cache; +package ortus.boxlang.compat.bifs.cache; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/com/ortussolutions/bifs/cache/CacheGetKeysStream.java b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetKeysStream.java similarity index 98% rename from src/main/java/com/ortussolutions/bifs/cache/CacheGetKeysStream.java rename to src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetKeysStream.java index 826cbb7..457f975 100644 --- a/src/main/java/com/ortussolutions/bifs/cache/CacheGetKeysStream.java +++ b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetKeysStream.java @@ -12,7 +12,7 @@ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package com.ortussolutions.bifs.cache; +package ortus.boxlang.compat.bifs.cache; import java.util.Set; diff --git a/src/main/java/com/ortussolutions/bifs/cache/CacheGetMetadata.java b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetMetadata.java similarity index 98% rename from src/main/java/com/ortussolutions/bifs/cache/CacheGetMetadata.java rename to src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetMetadata.java index 1587041..2447e13 100644 --- a/src/main/java/com/ortussolutions/bifs/cache/CacheGetMetadata.java +++ b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetMetadata.java @@ -12,7 +12,7 @@ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package com.ortussolutions.bifs.cache; +package ortus.boxlang.compat.bifs.cache; import java.util.Set; diff --git a/src/main/java/com/ortussolutions/bifs/cache/CacheGetMetadataReport.java b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetMetadataReport.java similarity index 98% rename from src/main/java/com/ortussolutions/bifs/cache/CacheGetMetadataReport.java rename to src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetMetadataReport.java index e088295..f4e4f0c 100644 --- a/src/main/java/com/ortussolutions/bifs/cache/CacheGetMetadataReport.java +++ b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetMetadataReport.java @@ -12,7 +12,7 @@ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package com.ortussolutions.bifs.cache; +package ortus.boxlang.compat.bifs.cache; import java.util.Set; diff --git a/src/main/java/com/ortussolutions/bifs/cache/CacheGetOrFail.java b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetOrFail.java similarity index 98% rename from src/main/java/com/ortussolutions/bifs/cache/CacheGetOrFail.java rename to src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetOrFail.java index 4bcf270..c4752fe 100644 --- a/src/main/java/com/ortussolutions/bifs/cache/CacheGetOrFail.java +++ b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetOrFail.java @@ -12,7 +12,7 @@ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package com.ortussolutions.bifs.cache; +package ortus.boxlang.compat.bifs.cache; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/com/ortussolutions/bifs/cache/CacheGetSize.java b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetSize.java similarity index 98% rename from src/main/java/com/ortussolutions/bifs/cache/CacheGetSize.java rename to src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetSize.java index 77f9fdf..d6d01b3 100644 --- a/src/main/java/com/ortussolutions/bifs/cache/CacheGetSize.java +++ b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheGetSize.java @@ -12,7 +12,7 @@ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package com.ortussolutions.bifs.cache; +package ortus.boxlang.compat.bifs.cache; import java.util.Set; diff --git a/src/main/java/com/ortussolutions/bifs/cache/CacheLookup.java b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheLookup.java similarity index 98% rename from src/main/java/com/ortussolutions/bifs/cache/CacheLookup.java rename to src/main/java/ortus/boxlang/compat/bifs/cache/CacheLookup.java index cff9270..4d1c514 100644 --- a/src/main/java/com/ortussolutions/bifs/cache/CacheLookup.java +++ b/src/main/java/ortus/boxlang/compat/bifs/cache/CacheLookup.java @@ -12,7 +12,7 @@ * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language * governing permissions and limitations under the License. */ -package com.ortussolutions.bifs.cache; +package ortus.boxlang.compat.bifs.cache; import java.util.Set; diff --git a/src/main/java/com/ortussolutions/components/.gitkeep b/src/main/java/ortus/boxlang/compat/components/.gitkeep similarity index 100% rename from src/main/java/com/ortussolutions/components/.gitkeep rename to src/main/java/ortus/boxlang/compat/components/.gitkeep diff --git a/src/test/java/com/ortussolutions/bifs/cache/BaseCacheTest.java b/src/test/java/ortus/boxlang/compat/bifs/cache/BaseCacheTest.java similarity index 97% rename from src/test/java/com/ortussolutions/bifs/cache/BaseCacheTest.java rename to src/test/java/ortus/boxlang/compat/bifs/cache/BaseCacheTest.java index 6631522..65d5d56 100644 --- a/src/test/java/com/ortussolutions/bifs/cache/BaseCacheTest.java +++ b/src/test/java/ortus/boxlang/compat/bifs/cache/BaseCacheTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ortussolutions.bifs.cache; +package ortus.boxlang.compat.bifs.cache; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/com/ortussolutions/bifs/cache/CacheGetMetadataReportTest.java b/src/test/java/ortus/boxlang/compat/bifs/cache/CacheGetMetadataReportTest.java similarity index 97% rename from src/test/java/com/ortussolutions/bifs/cache/CacheGetMetadataReportTest.java rename to src/test/java/ortus/boxlang/compat/bifs/cache/CacheGetMetadataReportTest.java index 1fce133..277dca9 100644 --- a/src/test/java/com/ortussolutions/bifs/cache/CacheGetMetadataReportTest.java +++ b/src/test/java/ortus/boxlang/compat/bifs/cache/CacheGetMetadataReportTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ortussolutions.bifs.cache; +package ortus.boxlang.compat.bifs.cache; import static com.google.common.truth.Truth.assertThat; diff --git a/src/test/java/com/ortussolutions/bifs/cache/CacheGetMetadataTest.java b/src/test/java/ortus/boxlang/compat/bifs/cache/CacheGetMetadataTest.java similarity index 98% rename from src/test/java/com/ortussolutions/bifs/cache/CacheGetMetadataTest.java rename to src/test/java/ortus/boxlang/compat/bifs/cache/CacheGetMetadataTest.java index dfefd90..ee735c3 100644 --- a/src/test/java/com/ortussolutions/bifs/cache/CacheGetMetadataTest.java +++ b/src/test/java/ortus/boxlang/compat/bifs/cache/CacheGetMetadataTest.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ortussolutions.bifs.cache; +package ortus.boxlang.compat.bifs.cache; import static com.google.common.truth.Truth.assertThat; diff --git a/src/test/java/com/ortussolutions/components/.gitkeep b/src/test/java/ortus/boxlang/compat/components/.gitkeep similarity index 100% rename from src/test/java/com/ortussolutions/components/.gitkeep rename to src/test/java/ortus/boxlang/compat/components/.gitkeep