Fix java 21 issues

.github/workflows/CI.yml

@@ -22,15 +22,15 @@ jobs:
           - temurin
           - zulu
         java-version:
-          - 8
-          - 11
+          - 17
+          - 21
         include:
           - platform: windows-latest
             java-distribution: adopt-hotspot
-            java-version: 11
+            java-version: 17
           - platform: macos-latest
             java-distribution: adopt-hotspot
-            java-version: 11
+            java-version: 17
     runs-on: ${{ matrix.platform }}
     timeout-minutes: 5
     steps:

build.gradle

@@ -2,6 +2,7 @@ plugins {
     id 'net.researchgate.release' version '3.1.0'
     // TODO: wait for https://github.com/hierynomus/license-gradle-plugin/issues/161
     // id "com.github.hierynomus.license" version "0.14.0" apply false
+    id 'maven-publish'
 }
 
 apply plugin: 'java'
@@ -10,7 +11,7 @@ description = "Notifications infrastucture for Apereo uPortal"
 
 subprojects {
     apply plugin: 'java'
-    apply plugin: 'maven'
+    apply plugin: 'maven-publish'
     apply plugin: 'signing'
     // TODO: wait for https://github.com/hierynomus/license-gradle-plugin/issues/161
     // apply plugin: 'license'
@@ -39,7 +40,8 @@ subprojects {
     //     exclude "**/*.json"
     // }
 
-    sourceCompatibility = 1.8
+    sourceCompatibility = 17
+    targetCompatibility = 17
 
     /* Release Management
      *
@@ -49,12 +51,12 @@ subprojects {
         publishingUsername = project.hasProperty('ossrhUsername') ? project.getProperty('ossrhUsername') : ""
         publishingPassword = project.hasProperty('ossrhPassword') ? project.getProperty('ossrhPassword') : ""
     }
-    task javadocJar(type: Jar, dependsOn: javadoc) {
-        classifier = 'javadoc'
+    tasks.register('javadocJar', Jar) {
+        archiveClassifier = 'javadoc'
         from javadoc.destinationDir
     }
-    task sourcesJar(type: Jar, dependsOn: classes) {
-        classifier 'sources'
+    tasks.register('sourcesJar', Jar) {
+        archiveClassifier = 'sources'
         from sourceSets.main.allSource
     }
     tasks.withType(Javadoc) {
@@ -74,48 +76,12 @@ subprojects {
         required { gradle.taskGraph.hasTask('uploadArchives') }
         sign configurations.archives
     }
-    uploadArchives {
-        repositories {
-            mavenDeployer {
-                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-                repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-                    authentication(userName: publishingUsername, password: publishingPassword)
-                }
-
-                pom.project {
-                    name 'NotificationPortlet'
-                    description 'Content objects for displaying important notices from campus ' +
-                            'systems in uPortal based on Web Components and JSR-286 (Portlet 2.0)'
-                    url 'https://github.com/Jasig/NotificationPortlet'
-
-                    scm {
-                        connection 'scm:git:git://github.com/Jasig/NotificationPortlet.git'
-                        url 'https://github.com/Jasig/NotificationPortlet'
-                    }
-
-                    licenses {
-                        license {
-                            name 'The Apache License, Version 2.0'
-                            url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                        }
-                    }
-
-                    developers {
-                        developer {
-                            organization 'NotificationPortlet Developers'
-                            organizationUrl 'https://github.com/Jasig/NotificationPortlet/graphs/contributors'
-                        }
-                    }
-                }
-            }
-        }
-    }
     release {
         tagTemplate = 'v${version}' // Looks like it should be a GString, but not necessary
         git {
             requireBranch.set('')
         }
     }
-    afterReleaseBuild.dependsOn uploadArchives
+    afterReleaseBuild.dependsOn publish
 }

gradle.properties

@@ -1,9 +1,8 @@
 group=org.jasig.portlet.notification
 version=4.8.1-SNAPSHOT
 
-# Matches (apparently) Spring Boot 1.5.10.RELEASE
-springVersion=4.3.30.RELEASE
-springSecurityVersion=4.2.9.RELEASE
+springVersion=5.3.31
+springSecurityVersion=5.7.11
 springSecurityOAuth2Version=2.5.2.RELEASE
 
 # Dependency Versions

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

notification-portlet-api/build.gradle

@@ -1,48 +1,54 @@
 description = "Simple data model for Notifications used in integrations"
 
 dependencies {
-    compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
-    compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
-    compile "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
-    compile "commons-lang:commons-lang:${commonsLangVersion}"
-    compile "org.slf4j:slf4j-api:${slf4jVersion}"
-    compile "javax.annotation:javax.annotation-api:${annotationApiVersion}"
-    compile "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
+    implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
+    implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
+    implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
+    implementation "commons-lang:commons-lang:${commonsLangVersion}"
+    implementation "org.slf4j:slf4j-api:${slf4jVersion}"
+    implementation "javax.annotation:javax.annotation-api:${annotationApiVersion}"
+    implementation "javax.xml.bind:jaxb-api:${jaxbApiVersion}"
     compileOnly "org.projectlombok:lombok:${lombokVersion}"
     annotationProcessor "org.projectlombok:lombok:${lombokVersion}"
     compileOnly "${portletApiDependency}"
     compileOnly "javax.servlet:servlet-api:${servletApiVersion}"
 }
 
-uploadArchives{
-    repositories {
-        mavenDeployer {
-            pom.project {
-                name 'notification-portlet-api'
-                packaging 'jar'
-                // optionally artifactId can be defined here
-                description 'API jar for Apereo NotificationPortlet'
-                url 'https://github.com/Jasig/NotificationPortlet'
+publishing {
+    publications {
+        create('mavenJava', MavenPublication) {
+            from components.java
+
+            pom {
+                name = 'notification-portlet-api'
+                packaging = 'jar'
+                description = 'API jar for Apereo NotificationPortlet'
+                url = 'https://github.com/Jasig/NotificationPortlet'
 
                 scm {
-                    connection 'scm:[email protected]:Jasig/NotificationPortlet.git'
-                    url 'https://github.com/Jasig/NotificationPortlet'
+                    connection = 'scm:[email protected]:Jasig/NotificationPortlet.git'
+                    url = 'https://github.com/Jasig/NotificationPortlet'
                 }
 
                 licenses {
                     license {
-                        name 'The Apache License, Version 2.0'
-                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                        name = 'The Apache License, Version 2.0'
+                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
                     }
                 }
 
                 developers {
                     developer {
-                        organization 'uPortal Developers'
-                        organizationUrl 'https://github.com/Jasig/uPortal/graphs/contributors'
+                        organization = 'uPortal Developers'
+                        organizationUrl = 'https://github.com/Jasig/uPortal/graphs/contributors'
                     }
                 }
             }
         }
     }
 }
+
+java {
+    withJavadocJar()
+    withSourcesJar()
+}