Merge pull request #65 from belgattitude/gradle-update

update to gradle 4.10.3 + remove deprecations
belgattitude · Apr 19, 2021 · 146592a · 146592a
2 parents 2ab1759 + 285290a
commit 146592a
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 21 deletions.
diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.bmuschko:gradle-tomcat-plugin:2.3'
+        classpath 'com.bmuschko:gradle-tomcat-plugin:2.5'
         //classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3'
         //classpath 'org.ajoberstar:gradle-git:1.6.0'
     }
@@ -58,18 +58,22 @@ dependencies {
 
     providedCompile('javax.servlet:servlet-api:2.5')
 
-    def tomcatVersion = '7.0.79'    // must not exclude eclipse compiler since version 7.0.59
+    def tomcatVersion = '8.5.16'
 
-    tomcat(
-            "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
-            "org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}",
-            "org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}",
-    )
+    tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
+           "org.apache.tomcat.embed:tomcat-embed-logging-juli:8.5.2",
+           "org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}"
 
     runtime('log4j:log4j:1.2.17')
 }
 
 
+tomcat {
+    httpProtocol = 'org.apache.coyote.http11.Http11Nio2Protocol'
+    ajpProtocol  = 'org.apache.coyote.ajp.AjpNio2Protocol'
+}
+
+
 // When testing you can specify your local PHP executable as a system property with
 // -Dphp_exec=/path/to/php-executabale on the Gradle command line
 // Default value is "php" which should work both on Linux and Windows for most standard PHP installations.

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,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
diff --git a/src/main/java/io/soluble/pjb/bridge/JavaBridge.java b/src/main/java/io/soluble/pjb/bridge/JavaBridge.java
@@ -1830,7 +1830,6 @@ public IContext getContext() {
      * @param name The session name, if any
      * @param clientIsNew true, if the client wants a new session
      * @param timeout session timeout in seconds. If timeout is &lt;= 0, the session will never expire @return The session context
-     * @return 
      * @throws Exception
      * @see io.soluble.pjb.bridge.ISession
      */

diff --git a/src/main/java/io/soluble/pjb/bridge/http/IContextFactory.java b/src/main/java/io/soluble/pjb/bridge/http/IContextFactory.java
@@ -26,6 +26,7 @@
 
 import io.soluble.pjb.bridge.IJavaBridgeFactory;
 import io.soluble.pjb.bridge.ISession;
+import io.soluble.pjb.bridge.JavaBridge;
 
 /**
  * Interface that the ContextFactories must implement.
@@ -41,7 +42,7 @@ public interface IContextFactory extends IJavaBridgeFactory {
      *
      * @param id The fresh id
      * @see io.soluble.pjb.bridge.http.ContextFactory#recycle()
-     * @see io.soluble.pjb.bridge.Request#setBridge(io.soluble.pjb.JavaBridge)
+     * @see io.soluble.pjb.bridge.Request#setBridge(JavaBridge)
      * @see io.soluble.pjb.bridge.Request#recycle()
      */
     public void recycle(String id);

diff --git a/src/main/java/io/soluble/pjb/script/AbstractPhpScriptContext.java b/src/main/java/io/soluble/pjb/script/AbstractPhpScriptContext.java
@@ -48,9 +48,6 @@ public AbstractPhpScriptContext(ScriptContext ctx) {
 
     private int exitCode;
 
-    /**
-     * {@inheritDoc}
-     */
     protected Writer writer;
 
     public Writer getWriter() {
@@ -59,9 +56,6 @@ public Writer getWriter() {
         return writer;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     protected Writer errorWriter;
 
     public Writer getErrorWriter() {

diff --git a/src/main/java/io/soluble/pjb/script/PhpScriptContext.java b/src/main/java/io/soluble/pjb/script/PhpScriptContext.java
@@ -208,7 +208,6 @@ public String getSocketName() {
     }
 
     /**
-     * @return 
      * @deprecated
      */
     @Override
@@ -218,7 +217,6 @@ public String getRedirectString() {
 
     /**
      * @param webPath
-     * @return 
      * @deprecated
      */
     @Override

diff --git a/src/main/java/io/soluble/pjb/servlet/SimpleServletContextFactory.java b/src/main/java/io/soluble/pjb/servlet/SimpleServletContextFactory.java
@@ -65,9 +65,6 @@ protected SimpleServletContextFactory(Servlet servlet, ServletContext ctx, HttpS
     protected void setSessionFactory(HttpServletRequest req) {
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public ISession getSimpleSession(String name, boolean clientIsNew,
                                      int timeout) {
         throw new IllegalStateException("Named sessions not supported by servlet.");