sargue · sargue · Feb 19, 2022 · Jan 22, 2022 · Jan 22, 2022 · Jan 22, 2022
diff --git a/.gitignore b/.gitignore
@@ -55,3 +55,8 @@ atlassian-ide-plugin.xml
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
+
+# eclipse
+bin/
+.classpath
+.project
diff --git a/README.md b/README.md
@@ -29,26 +29,26 @@ library and almost exactly as the tags in the original Joda-Time JSP Tags.
 Requirements
 ------------
 
-* Java 8
-* Servlet 2.4
-* JSP 2.0
-* JSTL 1.1
+* Java 17
+* Servlet 5.0
+* JSP 3.0
+* JSTL 2.0
 
 Usage
 -----
 
 Add the dependency to your project:
 
 ### Gradle
-`compile 'net.sargue:java-time-jsptags:1.1.4'`
+`compile 'net.sargue:java-time-jsptags:2.0.0'`
 
 ### Maven
 
 ```xml
 <dependency>
     <groupId>net.sargue</groupId>
     <artifactId>java-time-jsptags</artifactId>
-    <version>1.1.4</version>
+    <version>2.0.0</version>
 </dependency>
 ```
 
@@ -265,6 +265,11 @@ Build is based on gradle. See build.gradle included in the repository.
 Changelog
 ---------
 
+### v2.0.0
+
+Updated for jakarta package names for J2EE classes.
+Requires Java 17 now due to dependency on spring-test 6.0.
+
 ### v1.1.4
 Made helper method public [by request](https://github.com/sargue/java-time-jsptags/issues/7).
 

diff --git a/build.gradle b/build.gradle
@@ -1,33 +1,38 @@
 plugins {
     id "com.jfrog.bintray" version "1.7.3"
+    id "java"
+    id "maven-publish"
 }
 
-apply plugin: 'java'
-apply plugin: 'maven'
-
 group = 'net.sargue'
 archivesBaseName = 'java-time-jsptags'
-version = '1.1.4'
+version = '2.0.0'
 
-sourceCompatibility = 1.8
 compileJava.options.encoding = 'UTF-8'
 compileTestJava.options.encoding = 'UTF-8'
 
-repositories {
-    jcenter()
+java {
+    // set version of Java that the source confirms to. 
+    // The bytecode will be for this version of Java as well, unless targetCompatibility is specified.
+    sourceCompatibility = JavaVersion.VERSION_17
 }
 
-configurations {
-    testCompile.extendsFrom compileOnly
+repositories {
+    mavenCentral()
+    // for snapshot release of spring that includes jakarta classes
+    maven {
+      url "https://repo.spring.io/milestone"
+    }    
 }
 
 dependencies {
-    compileOnly 'javax.servlet:javax.servlet-api:3.0.1'
-    compileOnly 'javax.servlet.jsp:javax.servlet.jsp-api:2.2.1'
-    compileOnly 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1'
+    implementation(group: "jakarta.servlet", name: "jakarta.servlet-api", version: "5.0.0")
+    implementation(group: "jakarta.servlet.jsp", name: "jakarta.servlet.jsp-api", version: "3.0.0")
+    implementation(group: "jakarta.servlet.jsp.jstl", name: "jakarta.servlet.jsp.jstl-api", version: "2.0.0")
+
 
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.springframework:spring-test:4.1.7.RELEASE'
+    testImplementation(group: "junit", name: "junit", version: "4.12")
+    testImplementation(group: "org.springframework", name: "spring-test", version: "6.0.0-M2")
 }
 
 jar {
@@ -51,36 +56,36 @@ artifacts {
     archives javadocJar, sourcesJar
 }
 
-install {
-    repositories.mavenInstaller {
-        pom.project {
-            name 'Java 8 java.time JSP tags'
-            description 'JSP tag support for Java 8 java.time (JSR-310)'
-            url 'https://github.com/sargue/java-time-jsptags'
-
-            scm {
-                connection 'scm:git:[email protected]:sargue/java-time-jsptags.git'
-                developerConnection 'scm:git:[email protected]:sargue/java-time-jsptags.git'
-                url '[email protected]:sargue/java-time-jsptags.git'
-            }
-
-            licenses {
-                license {
-                    name 'The Apache License, Version 2.0'
-                    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                }
-            }
-
-            developers {
-                developer {
-                    id 'sargue'
-                    name 'Sergi Baila'
-                    email '[email protected]'
-                }
-            }
-        }
-    }
-}
+// install {
+//     repositories.mavenInstaller {
+//         pom.project {
+//             name 'Java 8 java.time JSP tags'
+//             description 'JSP tag support for Java 8 java.time (JSR-310)'
+//             url 'https://github.com/sargue/java-time-jsptags'
+// 
+//             scm {
+//                 connection 'scm:git:[email protected]:sargue/java-time-jsptags.git'
+//                 developerConnection 'scm:git:[email protected]:sargue/java-time-jsptags.git'
+//                 url '[email protected]:sargue/java-time-jsptags.git'
+//             }
+// 
+//             licenses {
+//                 license {
+//                     name 'The Apache License, Version 2.0'
+//                     url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+//                 }
+//             }
+// 
+//             developers {
+//                 developer {
+//                     id 'sargue'
+//                     name 'Sergi Baila'
+//                     email '[email protected]'
+//                 }
+//             }
+//         }
+//     }
+// }
 
 bintray {
     user = project.hasProperty('BINTRAY_USER') ? BINTRAY_USER : ''

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Jan 21 21:48:13 CST 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip