AOD-12957 Update dependencies

README.md

@@ -46,6 +46,8 @@ inactive:
   - [Add description support](https://github.com/AODocs/endpoints-java/pull/40/commits/bbb1eff2bb9e7d28fc2ec17599257d0ef610531d) for resource and resource usage
   - [Configurable naming templates](https://github.com/AODocs/endpoints-java/pull/42) for operationIds and tag names with better defaults
   - Support exclusiveMinimum/exclusiveMaximum, minLength/maxLength and minItems/maxItems attributes
+- Dependency updates
+  - `com.github.ben-manes.versions` plugin added, Dependecy Updates report can be generated via `./gradlew dependencyUpdates` command
 
 Check 
 [closed PRs](https://github.com/AODocs/endpoints-java/pulls?q=is%3Apr+sort%3Aupdated-desc+is%3Aclosed)

build.gradle

@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+plugins {
+  id 'com.github.ben-manes.versions' version "+"
+}
+
 subprojects {
   apply plugin: 'java'
   apply plugin: 'jacoco'

discovery-client/build.gradle

@@ -40,9 +40,9 @@ repositories {
 }
 
 dependencies {
-  implementation module(group: 'com.google.api-client', name: 'google-api-client', version: "1.32.1") {
-    module(group: 'com.google.http-client', name: 'google-http-client-jackson2', version: "1.40.0") {
-      dependency("com.fasterxml.jackson.core:jackson-core:2.12.5")
+  implementation module(group: 'com.google.api-client', name: 'google-api-client', version: apiclientVersion) {
+    module(group: 'com.google.http-client', name: 'google-http-client-jackson2', version: httpClientVersion) {
+      dependency("com.fasterxml.jackson.core:jackson-core:${jacksonVersion}")
       dependency("com.google.http-client:google-http-client:1.40.0")
     }
     dependency("com.google.oauth-client:google-oauth-client:1.32.1")

discovery-client/src/main/java/com/google/api/services/discovery/Discovery.java

@@ -43,16 +43,6 @@
 @SuppressWarnings("javadoc")
 public class Discovery extends com.google.api.client.googleapis.services.json.AbstractGoogleJsonClient {
 
-  // Note: Leave this static initializer at the top of the file.
-  static {
-    com.google.api.client.util.Preconditions.checkState(
-        com.google.api.client.googleapis.GoogleUtils.MAJOR_VERSION == 1 &&
-        com.google.api.client.googleapis.GoogleUtils.MINOR_VERSION >= 15,
-        "You are currently running with version %s of google-api-client. " +
-        "You need at least version 1.15 of google-api-client to run version " +
-        "1.20.0 of the APIs Discovery Service library.", com.google.api.client.googleapis.GoogleUtils.VERSION);
-  }
-
   /**
    * The default encoded root URL of the service. This is determined when the library is generated
    * and normally should not be changed.

endpoints-framework-all/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-  id 'com.github.johnrengelman.shadow' version '5.1.0'
+  id 'com.github.johnrengelman.shadow' version '7.1.2'
   id 'java-library'
 }
 
@@ -30,7 +30,7 @@ shadowJar {
 
   dependencies {
     exclude(dependency('com.google.appengine:appengine-api-1.0-sdk:.*'))
-    exclude(dependency('javax.servlet:servlet-api:.*'))
+    exclude(dependency('javax.servlet:javax.servlet-api:.*'))
   }
 }
 
@@ -41,7 +41,7 @@ artifacts {
 dependencies {
   compileOnly project(':endpoints-framework')
   api group: 'com.google.appengine', name: 'appengine-api-1.0-sdk', version: appengineVersion
-  api group: 'javax.servlet', name: 'servlet-api', version: servletVersion
+  api group: 'javax.servlet', name: 'javax.servlet-api', version: servletVersion
 }
 
 configureMaven(project, 'Endpoints Framework', 'A framework for building RESTful web APIs.')

endpoints-framework-tools/build.gradle

@@ -39,4 +39,5 @@ dependencies {
   testImplementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
   testImplementation group: 'com.google.truth', name: 'truth', version: truthVersion
   testImplementation group: 'org.springframework', name: 'spring-test', version: springtestVersion
+  testImplementation group: 'javax.inject', name: 'javax.inject', version: javaxinjectVersion
 }

endpoints-framework/build.gradle

@@ -100,7 +100,7 @@ dependencies {
   }
   compileOnly group: 'org.slf4j', name: 'slf4j-nop', version: slf4jVersion
 
-  compileOnly group: 'javax.servlet', name: 'servlet-api', version: servletVersion
+  compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: servletVersion
   compileOnly group: 'com.google.auto.value', name: 'auto-value-annotations', version: autoValueVersion
   annotationProcessor group: 'com.google.auto.value', name: 'auto-value', version: autoValueVersion
 

endpoints-framework/src/test/resources/com/google/api/server/spi/swagger/error_codes_all.swagger

@@ -126,9 +126,6 @@
         },
         "reason": {
           "type": "string"
-        },
-        "type": {
-          "type": "string"
         }
       }
     },

endpoints-framework/src/test/resources/com/google/api/server/spi/swagger/error_codes_default_response.swagger

@@ -117,9 +117,6 @@
         },
         "reason": {
           "type": "string"
-        },
-        "type": {
-          "type": "string"
         }
       }
     },

endpoints-framework/src/test/resources/com/google/api/server/spi/swagger/error_codes_service_exceptions.swagger

@@ -111,9 +111,6 @@
         },
         "reason": {
           "type": "string"
-        },
-        "type": {
-          "type": "string"
         }
       }
     },

gradle.properties

@@ -3,28 +3,28 @@ sourceCompatibility=1.8
 targetCompatibility=1.8
 group=com.aodocs.endpoints
 
-servletVersion=2.5
+servletVersion=4.0.1
 javaxinjectVersion=1
-autoValueVersion=1.8.2
+autoValueVersion=1.10.1
 guavaVersion=28.1-jre
 jacksonVersion=2.12.5
 gradleAppenginePluginVersion=1.9.59
-appengineVersion=1.9.91
-httpClientVersion=1.40.0
-apiclientVersion=1.32.1
+appengineVersion=2.0.10
+httpClientVersion=1.42.3
+apiclientVersion=2.1.3
 fileUploadVersion=1.4
 findbugsVersion=3.0.2
 swaggerVersion=1.6.2
-slf4jVersion=1.7.32
-guiceVersion=4.2.3
+slf4jVersion=2.0.6
+guiceVersion=5.1.0
 objectifyVersion=5.1.24
-floggerVersion=0.6
-hibernateValidatorVersion=6.2.0.Final
+floggerVersion=0.7.4
+hibernateValidatorVersion=6.2.5.Final
 validationApiVersion=2.0.2
 
 junitVersion=4.13.2
-mockitoVersion=3.6.28
-jsonassertVersion=1.5.0
+mockitoVersion=4.11.0
+jsonassertVersion=1.5.1
 truthVersion=1.1.3
 springtestVersion=3.2.18.RELEASE
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Aug 21 16:54:33 CEST 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists