Skip to content

Commit db68f7b

Browse files
committed
AOD-12957 Update dependencies
- com.fasterxml.jackson.core:jackson-annotations [2.12.5 -> 2.12.5] - com.fasterxml.jackson.core:jackson-core [2.12.5 -> 2.12.5] - com.fasterxml.jackson.core:jackson-databind [2.12.5 -> 2.12.5] - com.fasterxml.jackson.datatype:jackson-datatype-jdk8 [2.12.5 -> 2.12.5] - com.fasterxml.jackson.module:jackson-module-parameter-names [2.12.5 -> 2.12.5] - com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin [5.1.0 -> 7.1.2] - com.google.api-client:google-api-client [1.32.1 -> 2.1.3] - com.google.api-client:google-api-client-appengine [1.32.1 -> 2.1.3] - com.google.appengine:appengine-api-1.0-sdk [1.9.91 -> 2.0.10] - com.google.appengine:appengine-api-stubs [1.9.91 -> 2.0.10] - com.google.appengine:appengine-testing [1.9.91 -> 2.0.10] - com.google.appengine:appengine-tools-sdk [1.9.91 -> 2.0.10] - com.google.auto.value:auto-value [1.8.2 -> 1.10.1] - com.google.auto.value:auto-value-annotations [1.8.2 -> 1.10.1] - com.google.flogger:flogger [0.6 -> 0.7.4] - com.google.flogger:flogger-system-backend [0.6 -> 0.7.4] - com.google.http-client:google-http-client-jackson2 [1.40.0 -> 1.42.3] - com.google.inject:guice [4.2.3 -> 5.1.0] - com.google.inject.extensions:guice-servlet [4.2.3 -> 5.1.0] - io.swagger:swagger-core [1.6.2 -> 1.6.2] - io.swagger:swagger-models [1.6.2 -> 1.6.2] - org.hibernate.validator:hibernate-validator [6.2.0.Final -> 6.2.5.Final] - org.mockito:mockito-core [3.6.28 -> 4.11.0] - org.skyscreamer:jsonassert [1.5.0 -> 1.5.1] - org.slf4j:slf4j-nop [1.7.32 -> 2.0.6] - javax.servlet:[javax.]servlet-api [2.5 -> 4.0.1] - Gradle: [7.2 -> 7.6]
1 parent f34f786 commit db68f7b

16 files changed

Lines changed: 229 additions & 173 deletions

File tree

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ inactive:
4646
- [Add description support](https://github.com/AODocs/endpoints-java/pull/40/commits/bbb1eff2bb9e7d28fc2ec17599257d0ef610531d) for resource and resource usage
4747
- [Configurable naming templates](https://github.com/AODocs/endpoints-java/pull/42) for operationIds and tag names with better defaults
4848
- Support exclusiveMinimum/exclusiveMaximum, minLength/maxLength and minItems/maxItems attributes
49+
- Dependency updates
50+
- `com.github.ben-manes.versions` plugin added, Dependecy Updates report can be generated via `./gradlew dependencyUpdates` command
4951

5052
Check
5153
[closed PRs](https://github.com/AODocs/endpoints-java/pulls?q=is%3Apr+sort%3Aupdated-desc+is%3Aclosed)

build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17+
plugins {
18+
id 'com.github.ben-manes.versions' version "+"
19+
}
20+
1721
subprojects {
1822
apply plugin: 'java'
1923
apply plugin: 'jacoco'

discovery-client/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ repositories {
4040
}
4141

4242
dependencies {
43-
implementation module(group: 'com.google.api-client', name: 'google-api-client', version: "1.32.1") {
44-
module(group: 'com.google.http-client', name: 'google-http-client-jackson2', version: "1.40.0") {
45-
dependency("com.fasterxml.jackson.core:jackson-core:2.12.5")
43+
implementation module(group: 'com.google.api-client', name: 'google-api-client', version: apiclientVersion) {
44+
module(group: 'com.google.http-client', name: 'google-http-client-jackson2', version: httpClientVersion) {
45+
dependency("com.fasterxml.jackson.core:jackson-core:${jacksonVersion}")
4646
dependency("com.google.http-client:google-http-client:1.40.0")
4747
}
4848
dependency("com.google.oauth-client:google-oauth-client:1.32.1")

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,6 @@
4343
@SuppressWarnings("javadoc")
4444
public class Discovery extends com.google.api.client.googleapis.services.json.AbstractGoogleJsonClient {
4545

46-
// Note: Leave this static initializer at the top of the file.
47-
static {
48-
com.google.api.client.util.Preconditions.checkState(
49-
com.google.api.client.googleapis.GoogleUtils.MAJOR_VERSION == 1 &&
50-
com.google.api.client.googleapis.GoogleUtils.MINOR_VERSION >= 15,
51-
"You are currently running with version %s of google-api-client. " +
52-
"You need at least version 1.15 of google-api-client to run version " +
53-
"1.20.0 of the APIs Discovery Service library.", com.google.api.client.googleapis.GoogleUtils.VERSION);
54-
}
55-
5646
/**
5747
* The default encoded root URL of the service. This is determined when the library is generated
5848
* and normally should not be changed.

endpoints-framework-all/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'com.github.johnrengelman.shadow' version '5.1.0'
2+
id 'com.github.johnrengelman.shadow' version '7.1.2'
33
id 'java-library'
44
}
55

@@ -30,7 +30,7 @@ shadowJar {
3030

3131
dependencies {
3232
exclude(dependency('com.google.appengine:appengine-api-1.0-sdk:.*'))
33-
exclude(dependency('javax.servlet:servlet-api:.*'))
33+
exclude(dependency('javax.servlet:javax.servlet-api:.*'))
3434
}
3535
}
3636

@@ -41,7 +41,7 @@ artifacts {
4141
dependencies {
4242
compileOnly project(':endpoints-framework')
4343
api group: 'com.google.appengine', name: 'appengine-api-1.0-sdk', version: appengineVersion
44-
api group: 'javax.servlet', name: 'servlet-api', version: servletVersion
44+
api group: 'javax.servlet', name: 'javax.servlet-api', version: servletVersion
4545
}
4646

4747
configureMaven(project, 'Endpoints Framework', 'A framework for building RESTful web APIs.')

endpoints-framework-tools/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@ dependencies {
3939
testImplementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
4040
testImplementation group: 'com.google.truth', name: 'truth', version: truthVersion
4141
testImplementation group: 'org.springframework', name: 'spring-test', version: springtestVersion
42+
testImplementation group: 'javax.inject', name: 'javax.inject', version: javaxinjectVersion
4243
}

endpoints-framework/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ dependencies {
100100
}
101101
compileOnly group: 'org.slf4j', name: 'slf4j-nop', version: slf4jVersion
102102

103-
compileOnly group: 'javax.servlet', name: 'servlet-api', version: servletVersion
103+
compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: servletVersion
104104
compileOnly group: 'com.google.auto.value', name: 'auto-value-annotations', version: autoValueVersion
105105
annotationProcessor group: 'com.google.auto.value', name: 'auto-value', version: autoValueVersion
106106

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,6 @@
126126
},
127127
"reason": {
128128
"type": "string"
129-
},
130-
"type": {
131-
"type": "string"
132129
}
133130
}
134131
},

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@
117117
},
118118
"reason": {
119119
"type": "string"
120-
},
121-
"type": {
122-
"type": "string"
123120
}
124121
}
125122
},

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,6 @@
111111
},
112112
"reason": {
113113
"type": "string"
114-
},
115-
"type": {
116-
"type": "string"
117114
}
118115
}
119116
},

0 commit comments

Comments
 (0)