Merge pull request Waffle#2179 from hazendaz/master

[pom] Bump servlet to 6.0.0 for jakarta
hazendaz · Jan 20, 2024 · f20010a · f20010a
2 parents 6ff13a5 + 214ec21
commit f20010a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 65 deletions.
diff --git a/Source/JNA/waffle-jna-jakarta/pom.xml b/Source/JNA/waffle-jna-jakarta/pom.xml
@@ -3,7 +3,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2023 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -55,7 +55,7 @@
         <checker-qual.version>3.42.0</checker-qual.version>
         <jna.version>5.14.0</jna.version>
         <powermock.version>2.0.9</powermock.version>
-        <servlet.version>5.0.0</servlet.version>
+        <servlet.version>6.0.0</servlet.version>
 
         <!-- Automatic Module Name for JPMS -->
         <module.name>waffle.jna.jakarta</module.name>

diff --git a/Source/JNA/waffle-tests-jakarta/pom.xml b/Source/JNA/waffle-tests-jakarta/pom.xml
@@ -59,7 +59,7 @@
         <byte-buddy.version>1.14.11</byte-buddy.version>
         <mockito-core.version>5.9.0</mockito-core.version>
         <objenesis.version>3.3</objenesis.version>
-        <servlet.version>5.0.0</servlet.version>
+        <servlet.version>6.0.0</servlet.version>
 
         <!-- Automatic Module Name for JPMS -->
         <module.name>waffle.tests.jakarta</module.name>

diff --git a/Source/JNA/waffle-tests-jakarta/src/main/java/waffle/mock/http/SimpleHttpSession.java b/Source/JNA/waffle-tests-jakarta/src/main/java/waffle/mock/http/SimpleHttpSession.java
@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+ * Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,11 +23,8 @@
  */
 package waffle.mock.http;
 
-import com.google.errorprone.annotations.InlineMe;
-
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.http.HttpSession;
-import jakarta.servlet.http.HttpSessionContext;
 
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -78,42 +75,6 @@ public ServletContext getServletContext() {
         return null;
     }
 
-    /**
-     * Simply remove this if it is ever actually removed from servlet-api
-     *
-     * @deprecated Remove this once servlet does.
-     */
-    @Deprecated
-    @InlineMe(replacement = "null")
-    @Override
-    public final HttpSessionContext getSessionContext() {
-        return null;
-    }
-
-    /**
-     * Simply remove this if it is ever actually removed from servlet-api
-     *
-     * @deprecated Remove this once servlet does.
-     */
-    @Deprecated
-    @InlineMe(replacement = "null")
-    @Override
-    public final Object getValue(final String arg0) {
-        return null;
-    }
-
-    /**
-     * Simply remove this if it is ever actually removed from servlet-api
-     *
-     * @deprecated Remove this once servlet does.
-     */
-    @Deprecated
-    @InlineMe(replacement = "new String[0]")
-    @Override
-    public final String[] getValueNames() {
-        return new String[0];
-    }
-
     @Override
     public void invalidate() {
         // Do Nothing
@@ -124,33 +85,11 @@ public boolean isNew() {
         return false;
     }
 
-    /**
-     * Simply remove this if it is ever actually removed from servlet-api
-     *
-     * @deprecated Remove this once servlet does.
-     */
-    @Deprecated
-    @Override
-    public void putValue(final String arg0, final Object arg1) {
-        // Do Nothing
-    }
-
     @Override
     public void removeAttribute(final String attributeName) {
         this.attributes.remove(attributeName);
     }
 
-    /**
-     * Simply remove this if it is ever actually removed from servlet-api
-     *
-     * @deprecated Remove this once servlet does.
-     */
-    @Deprecated
-    @Override
-    public void removeValue(final String arg0) {
-        // Do Nothing
-    }
-
     @Override
     public void setAttribute(final String attributeName, final Object attributeValue) {
         this.attributes.put(attributeName, attributeValue);