Skip to content

Commit 4b70ab9

Browse files
mmallis87automation
andauthored
Version 3.7.0-BETA release (#150)
* Version 3.7.0-BETA-v2.1-20.2.00 release * Java 9 is no longer supported by Oracle * misc changes Co-authored-by: automation <[email protected]>
1 parent 68a5e64 commit 4b70ab9

35 files changed

+1533
-793
lines changed

.gitignore

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,28 @@
1-
*.DS_Store
2-
.idea/
3-
target/
1+
# Mobile Tools for Java (J2ME)
2+
.mtj.tmp/
3+
4+
# Package Files #
5+
*.jar
6+
*.war
7+
*.ear
8+
9+
# exclude jar for gradle wrapper
10+
!gradle/wrapper/*.jar
11+
12+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
13+
hs_err_pid*
14+
15+
# build files
16+
**/target
17+
target
18+
.gradle
19+
build
20+
*.class
421
.classpath
522
.settings
623
.project
24+
25+
# others
26+
.idea/
27+
*.iml
28+
.DS_Store

.swagger-codegen-ignore

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Swagger Codegen Ignore
2+
3+
# Use this file to prevent files from being overwritten by the generator.
4+
# The patterns follow closely to .gitignore or .dockerignore.
5+
6+
# As an example, the C# client generator defines ApiClient.cs.
7+
# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
8+
#ApiClient.cs
9+
10+
# You can match any string of characters against a directory, file or extension with a single asterisk (*):
11+
#foo/*/qux
12+
# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
13+
14+
# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
15+
#foo/**/qux
16+
# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
17+
18+
# You can also negate patterns with an exclamation (!).
19+
# For example, you can ignore all files in a docs folder with the file extension .md:
20+
#docs/*.md
21+
# Then explicitly reverse the ignore rule for a single file:
22+
#!docs/README.md
23+
24+
# Swagger and Git files
25+
.swagger-codegen-ignore
26+
git_push.sh
27+
28+
# Project files
29+
LICENSE
30+
gradle*
31+
build.sbt

.swagger-codegen/VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.4.13-SNAPSHOT

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ notifications:
1616
on_failure: change
1717

1818
jdk:
19-
- oraclejdk9
2019
- oraclejdk11
20+
- oraclejdk12
21+
- oraclejdk13
2122

2223
script: mvn -X clean test
2324

2425
after_failure: "cat /home/travis/build/docusign/docusign-java-client/target/surefire-reports/SdkUnitTests.txt && cat /home/travis/build/docusign/docusign-java-client/target/surefire-reports/TEST-SdkUnitTests.xml"
26+

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
# DocuSign Java Client Changelog
22
See [DocuSign Support Center](https://support.docusign.com/en/releasenotes/) for Product Release Notes.
33

4+
## [3.7.0-BETA] - Upgrade to Jersey2 - 2020-07-02
5+
### Changed
6+
- Upgraded the HTTP client from Jersey1 to Jersey 2. This resulted in a non-breaking change but the dependency list
7+
has largely been changed. (DCM-3324)
8+
- Added support for version v2.1-20.2.00 of the DocuSign eSignature API.
9+
- Updated the SDK release version.
10+
411
## [v3.6.0] - eSignature API v2.1-20.1.02 - 2020-06-02
512
### Changed
613
- Added support for version v2.1-20.1.02 of the DocuSign eSignature API.

README.md

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
## Compatibility
1212

13-
- Java 1.7+
13+
- Java 1.9+
1414

1515
## Note
1616

@@ -34,7 +34,7 @@ Note: DocuSign uses **Eclipse** with **Maven** for testing purposes.
3434
<dependency>
3535
<groupId>com.docusign</groupId>
3636
<artifactId>docusign-esign-java</artifactId>
37-
<version>3.6.0</version>
37+
<version>3.7.0-BETA</version>
3838
</dependency>
3939
```
4040

@@ -44,18 +44,19 @@ Note: DocuSign uses **Eclipse** with **Maven** for testing purposes.
4444

4545
This client has the following external dependencies:
4646

47-
- swagger:swagger-annotations:jar:1.5.8
48-
- sun.jersey:jersey-client:jar:1.19.1
49-
- sun.jersey.contribs:jersey-multipart:jar:1.19.1
50-
- fasterxml.jackson.core:jackson-core:jar:2.9.9
51-
- fasterxml.jackson.core:jackson-annotations:jar:2.9.9
52-
- fasterxml.jackson.core:jackson-databind:jar:2.9.9
53-
- fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:jar:2.9.9
54-
- fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.1.5
55-
- joda-time:joda-time:jar:2.9.3
56-
- brsanthu:migbase64:jar:2.2
57-
- apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.2
47+
- io.swagger:swagger-annotations:jar:1.5.17
48+
- org.glassfish.jersey.core:jersey-client:jar:2.29.1
49+
- org.glassfish.jersey.media:jersey-media-multipart:jar:2.29.1
50+
- org.glassfish.jersey.media:jersey-media-json-jackson:2.29.1
51+
- com.fasterxml.jackson.core:jackson-core:jar:2.10.1
52+
- com.fasterxml.jackson.core:jackson-annotations:jar:2.10.1
53+
- com.fasterxml.jackson.core:jackson-databind:2.10.1
54+
- com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.10.1
55+
- com.brsanthu:migbase64:2.2
5856
- junit:junit:jar:4.12
57+
- com.apache.oltu.oauth2:org.apache.oltu.oauth2.client:1.0.2
58+
- com.auth0:java-jwt:3.4.1
59+
- org.bouncycastle:bcprov-jdk15on:1.60
5960

6061
## Code Examples
6162

build.gradle

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ apply plugin: 'idea'
22
apply plugin: 'eclipse'
33

44
group = 'com.docusign'
5-
version = '3.6.0'
5+
version = '3.7.0-BETA'
66

77
buildscript {
88
repositories {
99
jcenter()
1010
}
1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:1.2.2'
13-
classpath 'com.github.dcendents:android-maven-plugin:1.2'
12+
classpath 'com.android.tools.build:gradle:2.3.+'
13+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1414
classpath 'ch.raffael.pegdown-doclet:pegdown-doclet:1.3'
1515
}
1616
}
@@ -27,11 +27,11 @@ if(hasProperty('target') && target == 'android') {
2727
apply plugin: 'com.github.dcendents.android-maven'
2828

2929
android {
30-
compileSdkVersion 22
31-
buildToolsVersion '22.0.0'
30+
compileSdkVersion 25
31+
buildToolsVersion '25.0.2'
3232
defaultConfig {
3333
minSdkVersion 14
34-
targetSdkVersion 22
34+
targetSdkVersion 25
3535
}
3636
compileOptions {
3737
sourceCompatibility JavaVersion.VERSION_1_7
@@ -93,6 +93,21 @@ if(hasProperty('target') && target == 'android') {
9393
main = System.getProperty('mainClass')
9494
classpath = sourceSets.main.runtimeClasspath
9595
}
96+
97+
task sourcesJar(type: Jar, dependsOn: classes) {
98+
classifier = 'sources'
99+
from sourceSets.main.allSource
100+
}
101+
102+
task javadocJar(type: Jar, dependsOn: javadoc) {
103+
classifier = 'javadoc'
104+
from javadoc.destinationDir
105+
}
106+
107+
artifacts {
108+
archives sourcesJar
109+
archives javadocJar
110+
}
96111
}
97112

98113
task getDeps(type: Copy) {
@@ -101,10 +116,9 @@ task getDeps(type: Copy) {
101116
}
102117

103118
ext {
104-
swagger_annotations_version = "1.5.8"
105-
jackson_version = "2.9.9"
106-
jersey_version = "1.19.1"
107-
jodatime_version = "2.9.3"
119+
swagger_annotations_version = "1.5.17"
120+
jackson_version = "2.10.1"
121+
jersey_version = "2.29.1"
108122
junit_version = "4.12"
109123
oltu_version = "1.0.2"
110124
jwt_version = "3.4.1"
@@ -113,17 +127,17 @@ ext {
113127

114128
dependencies {
115129
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
116-
compile "com.sun.jersey:jersey-client:$jersey_version"
117-
compile "com.sun.jersey.contribs:jersey-multipart:$jersey_version"
130+
compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
131+
compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
132+
compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
118133
compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
119134
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
120135
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
121-
compile "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
122-
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.1.5"
123-
compile "joda-time:joda-time:$jodatime_version"
136+
compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
124137
compile "com.brsanthu:migbase64:2.2"
125-
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
126138
testCompile "junit:junit:$junit_version"
139+
compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
127140
compile "com.auth0:java-jwt:$jwt_version"
128141
compile "org.bouncycastle:bcprov-jdk15on:$bouncy_version"
129142
}
143+

gradle.properties

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)