Skip to content

Commit 77636a2

Browse files
committed
Fix java build
1 parent ea53937 commit 77636a2

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

tasks/Build.cfc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ component {
7575
}
7676

7777
function buildJavaDeps(){
78+
print
79+
.line()
80+
.boldMagentaLine( "Running task tasks/buildJavaDeps" )
81+
.toConsole();
7882
task( "tasks/BuildJavaDeps" )
7983
.inWorkingDirectory( variables.cwd )
8084
.run();
@@ -139,8 +143,8 @@ component {
139143
command( "tokenReplace" )
140144
.params(
141145
path = "/#variables.projectBuildDir#/**",
142-
token = ( arguments.branch == "master" ? "@build.number@" : "[email protected]@" ),
143-
replacement = ( arguments.branch == "master" ? arguments.buildID : "-snapshot" )
146+
token = ( arguments.branch == "main" ? "@build.number@" : "[email protected]@" ),
147+
replacement = ( arguments.branch == "main" ? arguments.buildID : "-snapshot" )
144148
)
145149
.run();
146150

tasks/BuildJavaDeps.cfc

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@ component {
1010

1111
var rootDir = getCWD().reReplace( "[\\/]$", "" );
1212

13-
print.line( rootDir );
14-
return;
13+
print
14+
.line()
15+
.boldMagentaLine( "Executing java build" )
16+
.toConsole();
1517

1618
command( "run" )
1719
.inWorkingDirectory( rootDir & "/java/cbsso-opensaml" )
@@ -25,6 +27,11 @@ component {
2527
command( "cd" )
2628
.params( rootDir )
2729
.run();
30+
31+
print
32+
.line()
33+
.boldMagentaLine( "Finished building java dependences: cbsso-opensaml-all.jar" )
34+
.toConsole();
2835
}
2936

3037
}

0 commit comments

Comments
 (0)