Skip to content

Commit

Permalink
refactorings to standard package names
Browse files Browse the repository at this point in the history
  • Loading branch information
lmajano committed Apr 23, 2024
1 parent a91610b commit 08c940f
Show file tree
Hide file tree
Showing 20 changed files with 24 additions and 23 deletions.
13 changes: 7 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -131,23 +132,23 @@ 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( '.' ) {
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@', '-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 ) }
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/bx/ModuleConfig.bx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 08c940f

Please sign in to comment.