Drop support for Java 7. Remove tasks deprecated in Gradle 7.0 .

geopossachs · Apr 29, 2021 · 4678f40 · 4678f40
1 parent d90258d
commit 4678f40
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 22 deletions.
diff --git a/build.gradle b/build.gradle
@@ -123,4 +123,4 @@ showConfig.doFirst {
 
 //By default build also the default( plain Bootstrap without Themes ) Jar for Java 8 and 9 only
 //defaultTasks 'showConfig', ':java8:defaultJar', ':java9:defaultJar', ':java10:defaultJar', ':java7:jar', ':java6:jar'
-defaultTasks 'showConfig', ':java8:defaultJar', ':java11:defaultJar' //, ':java11:defaultJar'
+defaultTasks 'showConfig', ':java8:defaultJar', ':java11:defaultJar' //, ':java17:defaultJar' //Next LTS?
diff --git a/build.properties b/build.properties
@@ -64,8 +64,8 @@ patternfly.version=3.18.1
 # Starting with BootsFaces v1.3.1 Java 11 LTS release will be supported dropping Java 9 and Java 10 (No-LTS releases).
 # First LTS Release after Java 8 is Java 11, released september 2018
 # Default Build uses Java 8
-###java6=NO
-java7=NO
+###java6=NO #DROPPED
+###java7=NO #DROPPED
 java8=YES
 java9=No
 java10=No

diff --git a/gradleResources/compileLess/build.gradle b/gradleResources/compileLess/build.gradle
@@ -24,10 +24,12 @@ buildscript {
     }
     dependencies {
       //classpath 'com.bertramlabs.plugins:asset-pipeline-gradle:2.15.1'
-      classpath 'com.bertramlabs.plugins:asset-pipeline-gradle:3.1.0'
+      classpath 'com.bertramlabs.plugins:asset-pipeline-gradle:3.3.1'
+      //classpath 'com.bertramlabs.plugins:asset-pipeline-gradle:3.1.0'
       //classpath 'com.bertramlabs.plugins:asset-pipeline-gradle:3.0.10'
       //classpath 'com.bertramlabs.plugins:less-asset-pipeline:2.15.1'
-      classpath 'com.bertramlabs.plugins:less-asset-pipeline:3.1.0'
+      classpath 'com.bertramlabs.plugins:less-asset-pipeline:3.3.1'
+      //classpath 'com.bertramlabs.plugins:less-asset-pipeline:3.1.0'
       //classpath 'com.bertramlabs.plugins:less-asset-pipeline:3.0.10'
     }
 }

diff --git a/java11/build.gradle b/java11/build.gradle
@@ -21,11 +21,11 @@
 apply plugin: 'java'
 
 //Configurations for Target Java 11 runtime.
-sourceCompatibility = '1.7'
+sourceCompatibility = '1.8'
 targetCompatibility = '11'
 
 compileJava {
-  sourceCompatibility = '1.7'
+  sourceCompatibility = '1.8'
   targetCompatibility = '11'
 }
 

diff --git a/java8/build.gradle b/java8/build.gradle
@@ -21,7 +21,7 @@
 apply plugin: 'java'
 
 //Configurations for Target Java 8 runtime.
-sourceCompatibility = '1.7'
+sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
 
 archivesBaseName = 'BootsFaces-OSP'

diff --git a/legacyJava/java7/build.gradle b/legacyJava/java7/build.gradle
@@ -49,12 +49,12 @@ mavenCentral()
 }
 
 dependencies {
-  compile 'javax.servlet:javax.servlet-api:3.1.0'
-  compile 'com.sun.faces:jsf-api:2.2.14'
-  compile 'javax.el:javax.el-api:3.0.0'
-  compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20191001.1'
-  testCompile 'junit:junit:4.11'
-  testCompile 'org.mockito:mockito-core:2.0.17-beta'
+  compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
+  compileOnly 'com.sun.faces:jsf-api:2.2.14'
+  compileOnly 'javax.el:javax.el-api:3.0.0'
+  compileOnly 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20191001.1'
+  testImplementation 'junit:junit:4.11'
+  testImplementation 'org.mockito:mockito-core:2.0.17-beta'
 // testCompile 'org.jboss.arquillian.protocol:arquillian-protocol-servlet:1.1.8.Final'
 // testCompile 'org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven:2.1.1'
 // testCompile 'org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven-archive:2.1.1'
@@ -112,7 +112,7 @@ jar.dependsOn(":gradleResources:buildResources")
 //jar.onlyIf { buildJava7==true }
 
 task defaultJar(type: Jar) {
-   baseName='BootsFaces-OSP-jre7-default'
+   archiveBaseName='BootsFaces-OSP-jre7-default'
    from(sourceSets.main.output.classesDirs) {
         include "**"
    }

diff --git a/legacyJava/java9/build.gradle b/legacyJava/java9/build.gradle
@@ -49,12 +49,12 @@ mavenCentral()
 }
 
 dependencies {
-  compile 'javax.servlet:javax.servlet-api:3.1.0'
-  compile 'com.sun.faces:jsf-api:2.2.14'
-  compile 'javax.el:javax.el-api:3.0.0'
-  compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20191001.1'
-  testCompile 'junit:junit:4.11'
-  testCompile 'org.mockito:mockito-core:2.0.17-beta'
+  compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
+  compileOnly 'com.sun.faces:jsf-api:2.2.14'
+  compileOnly 'javax.el:javax.el-api:3.0.0'
+  compileOnly 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20191001.1'
+  testImplementation 'junit:junit:4.11'
+  testImplementation 'org.mockito:mockito-core:2.0.17-beta'
 // testCompile 'org.jboss.arquillian.protocol:arquillian-protocol-servlet:1.1.8.Final'
 // testCompile 'org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven:2.1.1'
 // testCompile 'org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven-archive:2.1.1'
@@ -104,7 +104,7 @@ jar.dependsOn(":gradleResources:buildResources")
 //jar.onlyIf { buildJava9==true }
 
 task defaultJar(type: Jar) {
-   baseName='BootsFaces-OSP-jre9-default'
+   archiveBaseName='BootsFaces-OSP-jre9-default'
    from(sourceSets.main.output.classesDirs) {
         include "**"
    }