Fix java build

coldbox-modules · Sep 4, 2024 · 77636a2 · 77636a2
1 parent ea53937
commit 77636a2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/tasks/Build.cfc b/tasks/Build.cfc
@@ -75,6 +75,10 @@ component {
 	}
 
     function buildJavaDeps(){
+		print
+			.line()
+			.boldMagentaLine( "Running task tasks/buildJavaDeps" )
+			.toConsole();
         task( "tasks/BuildJavaDeps" )
             .inWorkingDirectory( variables.cwd )
             .run();
@@ -139,8 +143,8 @@ component {
 		command( "tokenReplace" )
 			.params(
 				path        = "/#variables.projectBuildDir#/**",
-				token       = ( arguments.branch == "master" ? "@build.number@" : "+@build.number@" ),
-				replacement = ( arguments.branch == "master" ? arguments.buildID : "-snapshot" )
+				token       = ( arguments.branch == "main" ? "@build.number@" : "+@build.number@" ),
+				replacement = ( arguments.branch == "main" ? arguments.buildID : "-snapshot" )
 			)
 			.run();
 

diff --git a/tasks/BuildJavaDeps.cfc b/tasks/BuildJavaDeps.cfc
@@ -10,8 +10,10 @@ component {
 
 		var rootDir = getCWD().reReplace( "[\\/]$", "" );
 
-		print.line( rootDir );
-		return;
+		print
+			.line()
+			.boldMagentaLine( "Executing java build" )
+			.toConsole();
 
 		command( "run" )
 			.inWorkingDirectory( rootDir & "/java/cbsso-opensaml" )
@@ -25,6 +27,11 @@ component {
 		command( "cd" )
 			.params( rootDir )
 			.run();
+
+		print
+			.line()
+			.boldMagentaLine( "Finished building java dependences: cbsso-opensaml-all.jar" )
+			.toConsole();
 	}
 
 }