diff --git a/build.gradle b/build.gradle index f97f9a8d6..b33ddfe57 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,11 @@ Properties props = new Properties() props.load(new FileInputStream("${projectDir}/build.properties")) ext.BootsFacesVersion = props['VERSION'] -ext.BootsFacesReleaseStatus = props['RELEASE-STATUS'] //SNAPSHOT or RELEASE +ext.BootsFacesReleaseStatus = props['RELEASE-STATUS'] //SNAPSHOT or RCn or betaN or empty for RELEASE +def pomVersion = BootsFacesVersion+'-SNAPSHOT' +if(BootsFacesReleaseStatus==null||BootsFacesReleaseStatus=='') { pomVersion=BootsFacesVersion } +else if(BootsFacesReleaseStatus.startsWith("RC")||BootsFacesReleaseStatus.startsWith("beta")) { pomVersion=BootsFacesVersion+'-'+BootsFacesReleaseStatus } +ext.pomVersion=pomVersion //Bootstrap ext.BootstrapVersion = props['bootstrap.version'] //PatternFly @@ -89,7 +93,7 @@ showConfig.doFirst { new File( configClassFile ).write( configClass, 'UTF-8' ) //Patches version in pom file. - def pomVersion = BootsFacesReleaseStatus == 'SNAPSHOT' ? BootsFacesVersion+'-SNAPSHOT' : BootsFacesVersion + //def pomVersion = BootsFacesReleaseStatus == 'SNAPSHOT' ? BootsFacesVersion+'-SNAPSHOT' : BootsFacesVersion String projectPomText = new File( 'pom.xml' ).getText( 'UTF-8' ) projectPomText=(projectPomText =~ /[^<]+<\/version>/).replaceFirst(''+pomVersion+'') new File( 'pom.xml' ).write( projectPomText, 'UTF-8' ) diff --git a/build.properties b/build.properties index 5f4d238c0..5c3fec8a6 100644 --- a/build.properties +++ b/build.properties @@ -28,7 +28,7 @@ VERSION=1.1.0 # RELEASE-STATUS - SNAPSHOT (default) # or don't remove the property but just leave it blank for a Final RELEASE : # RELEASE-STATUS= -RELEASE-STATUS=SNAPSHOT +RELEASE-STATUS=RC1 bootstrap.version=3.3.7 # Set global properties for this build diff --git a/java6/build.gradle b/java6/build.gradle index a8679e076..d2359c34f 100644 --- a/java6/build.gradle +++ b/java6/build.gradle @@ -40,7 +40,7 @@ install { pom.artifactId = 'bootsfaces' // shouldn't be needed as this is the default anyway pom.packaging = 'jar' - pom.version = "$BootsFacesVersion-SNAPSHOT" + pom.version = "$pomVersion" } } diff --git a/java7/build.gradle b/java7/build.gradle index 18d2b4cd8..c7761b1ee 100644 --- a/java7/build.gradle +++ b/java7/build.gradle @@ -40,7 +40,7 @@ install { pom.artifactId = 'bootsfaces' // shouldn't be needed as this is the default anyway pom.packaging = 'jar' - pom.version = "$BootsFacesVersion-SNAPSHOT" + pom.version = "$pomVersion" } } diff --git a/java8/build.gradle b/java8/build.gradle index a5d119fd4..29c38a76a 100644 --- a/java8/build.gradle +++ b/java8/build.gradle @@ -40,7 +40,7 @@ install { pom.artifactId = 'bootsfaces' // shouldn't be needed as this is the default anyway pom.packaging = 'jar' - pom.version = "$BootsFacesVersion-SNAPSHOT" + pom.version = "$pomVersion" } } diff --git a/pom.xml b/pom.xml index 22ea3cb6e..fee83f88f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 net.bootsfaces bootsfaces - 1.1.0-SNAPSHOT + 1.1.0-RC1 BootsFaces TheCoder4EU http://www.bootsfaces.net diff --git a/src/main/java/net/bootsfaces/C.java b/src/main/java/net/bootsfaces/C.java index be6ebda4d..4a32a96db 100644 --- a/src/main/java/net/bootsfaces/C.java +++ b/src/main/java/net/bootsfaces/C.java @@ -29,7 +29,7 @@ public final class C { * BootsFaces Library Constants */ public static final String BSFVERSION="1.1.0"; - public static final String BSFRELEASE_STATUS="SNAPSHOT"; //SNAPSHOT or empty String (for a final RELEASE) + public static final String BSFRELEASE_STATUS="RC1"; //SNAPSHOT or empty String (for a final RELEASE) public static final String BSFCOMPONENT= "net.bootsfaces.component"; public static final String BSFLAYOUT = "net.bootsfaces.layout"; //public static final String BSFRENDER = "net.bootsfaces.render";