Merge pull request #247 from savantly-net/development

update to jdk 11

.github/workflows/backend-pr.yml

@@ -81,6 +81,10 @@ jobs:
           java-version: '11' # The JDK version to make available on the path.
           java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk
           architecture: x64 # (x64 or x86) - defaults to x64
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 5.0.x
 
       - name: Build Server Projects
         run: ./gradlew build

.github/workflows/backend.yml

@@ -91,6 +91,10 @@ jobs:
         run: |
           cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import
           gpg --list-secret-keys --keyid-format LONG
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 5.0.x
 
       - name: Build Server Projects
         run: ./gradlew clean && ./gradlew build

.github/workflows/development.yml

@@ -81,6 +81,10 @@ jobs:
         uses: actions/[email protected]
         with:
           node-version: '14'
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 5.0.x
 
       # Analyze
       - name: Analyze sprout-core

backend/core/build.gradle

@@ -5,12 +5,11 @@ plugins {
 	id 'java-library'
  	id 'jacoco'
  	id 'org.sonarqube'
-	id "org.owasp.dependencycheck" version "5.3.1"
+	id "org.owasp.dependencycheck" version "7.4.1"
 }
 
 archivesBaseName = name
 description = "The core of the Sprout Platform"
-sourceCompatibility = '1.8'
 
 ext {
 	sonarProjectKey = "savantly-net_sprout-platform_core"
@@ -19,6 +18,12 @@ ext {
 apply from: '../../gradle/sonar.gradle'
 apply from: '../../gradle/sonatype.gradle'
 
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(11))
+  }
+}
+
 repositories {
 	mavenCentral()
 }

backend/modules/example-panel/build.gradle

@@ -5,17 +5,22 @@ plugins {
 	id 'java-library'
  	id 'jacoco'
  	id 'org.sonarqube'
-	id "org.owasp.dependencycheck" version "5.3.1"
+	id "org.owasp.dependencycheck" version "7.4.1"
 	id "com.github.node-gradle.node" version "2.2.0"
 }
 
 archivesBaseName = name
 description = "Provides dynamic content management for the Sprout Platform"
-sourceCompatibility = '1.8'
 
 //apply from: '../../../gradle/sonar.gradle'
 apply from: '../../../gradle/sonatype.gradle'
 
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(11))
+  }
+}
+
 repositories {
 	mavenCentral()
 }

backend/modules/forms/build.gradle

@@ -5,13 +5,12 @@ plugins {
 	id 'java-library'
  	id 'jacoco'
  	id 'org.sonarqube'
-	id "org.owasp.dependencycheck" version "6.2.2"
+	id "org.owasp.dependencycheck" version "7.4.1"
 	id "com.github.node-gradle.node" version "2.2.0"
 }
 
 archivesBaseName = name
 description = "Provides Form integration APIs and UI components for the Sprout Platform"
-sourceCompatibility = '1.8'
 
 ext {
 	sonarProjectKey = "savantly-net_sprout-platform_forms"
@@ -20,6 +19,12 @@ ext {
 apply from: '../../../gradle/sonar.gradle'
 apply from: '../../../gradle/sonatype.gradle'
 
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(11))
+  }
+}
+
 repositories {
 	mavenCentral()
 }

backend/modules/newsfeed/build.gradle

@@ -6,17 +6,22 @@ plugins {
 	id 'signing'
  	id 'jacoco'
  	id 'org.sonarqube'
-	id "org.owasp.dependencycheck" version "5.3.1"
+	id "org.owasp.dependencycheck" version "7.4.1"
 	id "com.github.node-gradle.node" version "2.2.0"
 }
 
 archivesBaseName = name
 description = "Provides newsfeed APIs and UI components for the Sprout Platform"
-sourceCompatibility = '1.8'
 
 //apply from: '../../../gradle/sonar.gradle'
 apply from: '../../../gradle/sonatype.gradle'
 
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(11))
+  }
+}
+
 repositories {
 	mavenCentral()
 }

backend/server/build.gradle

@@ -4,19 +4,24 @@ plugins {
 	id 'java'
  	id 'jacoco'
  	id 'org.sonarqube'
-	id "org.owasp.dependencycheck" version "5.3.1"
+	id "org.owasp.dependencycheck" version "7.4.1"
 }
 
 archivesBaseName = name
 description = "A preconfigured Sprout Server Application"
-sourceCompatibility = '1.8'
 
 ext {
 	sonarProjectKey = "savantly-net_sprout-platform_server"
 }
 
 apply from: "${rootProject.projectDir}/gradle/sonar.gradle"
 
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(11))
+  }
+}
+
 // run `./gradlew bootRun -Psuspend=y` to suspend for debugger connection
 def suspend = project.ext.properties.suspend
 if(!suspend) {

backend/starters/sprout-spring-boot-starter/build.gradle

@@ -5,13 +5,12 @@ plugins {
 	id 'java-library'
  	id 'jacoco'
  	id 'org.sonarqube'
-	id "org.owasp.dependencycheck" version "6.2.2"
+	id "org.owasp.dependencycheck" version "7.4.1"
 	id 'org.asciidoctor.convert' version '1.5.6'
 }
 
 archivesBaseName = name
 description = "A Spring Boot starter for Sprout Projects"
-sourceCompatibility = '1.8'
 
 ext {
 	sonarProjectKey = "savantly-net_sprout-platform_starter"
@@ -20,6 +19,12 @@ ext {
 apply from: "${rootProject.projectDir}/gradle/sonar.gradle"
 apply from: "${rootProject.projectDir}/gradle/sonatype.gradle"
 
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(11))
+  }
+}
+
 sourceSets {
     dev {
         java {

backend/test/module-test/build.gradle

@@ -6,16 +6,21 @@ plugins {
 	id 'signing'
  	id 'jacoco'
  	id 'org.sonarqube'
-	id "org.owasp.dependencycheck" version "5.3.1"
+	//id "org.owasp.dependencycheck" version "7.4.1"
 }
 
 archivesBaseName = name
 description = "Test library for a Sprout Module"
-sourceCompatibility = '1.8'
 
 //apply from: "${rootProject.projectDir}/gradle/sonar.gradle"
 apply from: "${rootProject.projectDir}/gradle/sonatype.gradle"
 
+java {
+  toolchain {
+    languageVersion.set(JavaLanguageVersion.of(11))
+  }
+}
+
 repositories {
 	mavenCentral()
 }