Skip to content

Commit 0725298

Browse files
InbarGazitInbarGazit
authored
Merge pull request #136 from docusign/maintenance
Maintenance
2 parents edee396 + 1213531 commit 0725298

File tree

107 files changed

+249
-353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+249
-353
lines changed

‎JWT Console App/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1616
<maven.compiler.source>11</maven.compiler.source>
1717
<maven.compiler.target>11</maven.compiler.target>
18-
<esignature.version>4.0.0-RC1</esignature.version>
18+
<esignature.version>4.6.0-RC1</esignature.version>
1919
</properties>
2020

2121
<dependencies>
2222

2323
<dependency>
2424
<groupId>commons-cli</groupId>
2525
<artifactId>commons-cli</artifactId>
26-
<version>1.5.0</version>
26+
<version>1.7.0</version>
2727
</dependency>
2828

2929
<dependency>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>commons-io</groupId>
4444
<artifactId>commons-io</artifactId>
45-
<version>2.11.0</version>
45+
<version>2.16.1</version>
4646
</dependency>
4747

4848
</dependencies>

‎Quick_ACG/pom.xml‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.5.12</version>
8+
<version>2.7.18</version>
99
<relativePath />
1010
</parent>
1111

@@ -18,13 +18,9 @@
1818
<properties>
1919
<java.version>11</java.version>
2020
<oauth2.version>2.5.6</oauth2.version>
21-
<commonsio.version>2.11.0</commonsio.version>
21+
<commonsio.version>2.16.1</commonsio.version>
2222
<docusign.version>3.17.1</docusign.version>
23-
<rooms.version>1.1.0</rooms.version>
24-
<click.version>1.0.0</click.version>
25-
<monitor.version>1.0.0</monitor.version>
26-
<admin.version>1.0.0-BETA</admin.version>
27-
<esignature.version>4.0.0-RC1</esignature.version>
23+
<esignature.version>4.6.0-RC1</esignature.version>
2824
</properties>
2925

3026
<dependencies>
@@ -50,14 +46,6 @@
5046
<groupId>org.freemarker</groupId>
5147
<artifactId>freemarker</artifactId>
5248
</dependency>
53-
<dependency>
54-
<groupId>com.google.code.gson</groupId>
55-
<artifactId>gson</artifactId>
56-
</dependency>
57-
<dependency>
58-
<groupId>com.fasterxml.jackson.datatype</groupId>
59-
<artifactId>jackson-datatype-joda</artifactId>
60-
</dependency>
6149

6250
<!-- JSTL -->
6351
<dependency>
@@ -83,30 +71,6 @@
8371
<classifier>shaded</classifier>
8472
</dependency>
8573

86-
<dependency>
87-
<groupId>com.docusign</groupId>
88-
<artifactId>docusign-rooms-java</artifactId>
89-
<version>${rooms.version}</version>
90-
</dependency>
91-
92-
<dependency>
93-
<groupId>com.docusign</groupId>
94-
<artifactId>docusign-click-java</artifactId>
95-
<version>${click.version}</version>
96-
</dependency>
97-
98-
<dependency>
99-
<groupId>com.docusign</groupId>
100-
<artifactId>docusign-monitor-java</artifactId>
101-
<version>${monitor.version}</version>
102-
</dependency>
103-
104-
<dependency>
105-
<groupId>com.docusign</groupId>
106-
<artifactId>docusign-admin-java</artifactId>
107-
<version>${admin.version}</version>
108-
</dependency>
109-
11074
<dependency>
11175
<groupId>org.projectlombok</groupId>
11276
<artifactId>lombok</artifactId>
@@ -116,7 +80,7 @@
11680
<dependency>
11781
<groupId>org.springframework.boot</groupId>
11882
<artifactId>spring-boot-autoconfigure</artifactId>
119-
<version>2.5.15</version>
83+
<version>2.7.18</version>
12084
</dependency>
12185
</dependencies>
12286

@@ -163,7 +127,6 @@
163127
<directory>../src/main/java/com/docusign</directory>
164128
<includes>
165129
<include>JsonPropertySourceLoader.java</include>
166-
<include>OSDetector.java</include>
167130
<include>EG001ControllerEmbeddedSigning.java</include>
168131
</includes>
169132
</resource>
@@ -269,6 +232,43 @@
269232
<artifactId>bcprov-jdk15on</artifactId>
270233
<version>1.69</version>
271234
</dependency>
235+
236+
<dependency>
237+
<groupId>org.yaml</groupId>
238+
<artifactId>snakeyaml</artifactId>
239+
<version>2.2</version>
240+
</dependency>
241+
242+
<dependency>
243+
<groupId>net.minidev</groupId>
244+
<artifactId>json-smart</artifactId>
245+
<version>2.5.1</version>
246+
</dependency>
247+
248+
<dependency>
249+
<groupId>com.nimbusds</groupId>
250+
<artifactId>nimbus-jose-jwt</artifactId>
251+
<version>9.37.3</version>
252+
</dependency>
253+
254+
<dependency>
255+
<groupId>org.springframework.security</groupId>
256+
<artifactId>spring-security-core</artifactId>
257+
<version>5.7.12</version>
258+
</dependency>
259+
260+
<dependency>
261+
<groupId>ch.qos.logback</groupId>
262+
<artifactId>logback-core</artifactId>
263+
<version>1.3.14</version>
264+
</dependency>
265+
266+
<dependency>
267+
<groupId>ch.qos.logback</groupId>
268+
<artifactId>logback-classic</artifactId>
269+
<version>1.3.14</version>
270+
<scope>test</scope>
271+
</dependency>
272272
</dependencies>
273273
</dependencyManagement>
274274
</project>

‎Quick_ACG/src/main/java/com/docusign/App.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import java.nio.file.FileSystemAlreadyExistsException;
66
import java.nio.file.FileSystems;
77
import java.util.Collections;
8-
import java.util.Properties;
98

109
import lombok.extern.slf4j.Slf4j;
1110
import org.springframework.boot.SpringApplication;

‎Quick_ACG/src/main/java/com/docusign/OSDetector.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.docusign;
2+
3+
/*
4+
* This class can be used to determine the user's operating system so that the
5+
* application can successfully open a web browser to run the examples.
6+
*/
7+
public class OSDetector
8+
{
9+
private static final boolean isWindows;
10+
private static final boolean isLinux;
11+
private static final boolean isMac;
12+
13+
static
14+
{
15+
String os = System.getProperty("os.name").toLowerCase();
16+
isWindows = os.contains("win");
17+
isLinux = os.contains("nux") || os.contains("nix");
18+
isMac = os.contains("mac");
19+
}
20+
21+
public static boolean isWindows() { return isWindows; }
22+
public static boolean isLinux() { return isLinux; }
23+
public static boolean isMac() { return isMac; }
24+
25+
}

‎Quick_ACG/src/main/java/com/docusign/controller/eSignature/examples/AbstractEsignatureController.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import javax.servlet.http.HttpServletResponse;
2020
import java.util.List;
2121
import java.util.Objects;
22-
import java.util.Arrays;
2322

2423
/**
2524
* Abstract base class for all eSignature controllers.

‎Quick_ACG/src/main/java/com/docusign/core/controller/IndexController.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public class IndexController {
4949
@Autowired
5050
private OAuth2AuthorizedClientService authorizedClientService;
5151

52-
@Autowired
5352
public IndexController(DSConfiguration config, Session session, User user, Optional<OAuth.Account> account) {
5453
this.config = config;
5554
this.session = session;
@@ -73,7 +72,7 @@ public ModelAndView mustAuthenticateController(ModelMap model) throws IOExceptio
7372
@GetMapping(path = "/ds-return")
7473
public String returnController(@RequestParam(value = ATTR_STATE, required = false) String state,
7574
@RequestParam(value = ATTR_EVENT, required = false) String event,
76-
@RequestParam(value = "envelopeId", required = false) String envelopeId, ModelMap model, HttpServletResponse response) throws IOException {
75+
@RequestParam(required = false) String envelopeId, ModelMap model, HttpServletResponse response) throws IOException {
7776
String site = "/eg001";
7877
response.setStatus(response.SC_MOVED_TEMPORARILY);
7978
response.setHeader("Location", site);

‎Quick_ACG/src/main/java/com/docusign/core/model/Session.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import org.springframework.web.context.WebApplicationContext;
88

99
import java.io.Serializable;
10-
import java.util.List;
1110
import java.util.UUID;
1211

1312
@Component

‎pom.xml‎

Lines changed: 57 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.boot</groupId>
99
<artifactId>spring-boot-starter-parent</artifactId>
10-
<version>2.5.12</version>
10+
<version>2.7.18</version>
1111
<relativePath />
1212
</parent>
1313

@@ -24,18 +24,18 @@
2424

2525
<java.version>11</java.version>
2626
<oauth2.version>2.5.6</oauth2.version>
27-
<commonsio.version>2.11.0</commonsio.version>
27+
<commonsio.version>2.16.1</commonsio.version>
2828

2929
<esignature.version>4.6.0-RC1</esignature.version>
3030
<rooms.version>1.4.3</rooms.version>
31-
<click.version> 1.4.0</click.version>
32-
<monitor.version>1.3.0</monitor.version>
31+
<click.version>1.5.0</click.version>
32+
<monitor.version>1.4.0</monitor.version>
3333
<admin.version>1.3.0</admin.version>
3434
<webforms.version>1.0.2-RC12</webforms.version>
3535
<maestro.version>1.0.0-RC1</maestro.version>
36-
<swagger-core-version>2.2.8</swagger-core-version>
37-
<jackson-version>2.14.2</jackson-version>
38-
<jersey2.version>3.0.9</jersey2.version>
36+
<swagger-core-version>2.2.21</swagger-core-version>
37+
<jackson-version>2.17.0</jackson-version>
38+
<jersey2.version>3.1.6</jersey2.version>
3939
</properties>
4040

4141
<dependencies>
@@ -57,13 +57,13 @@
5757
<dependency>
5858
<groupId>io.github.cdimascio</groupId>
5959
<artifactId>dotenv-java</artifactId>
60-
<version>2.2.0</version>
60+
<version>3.0.0</version>
6161
</dependency>
6262

6363
<dependency>
6464
<groupId>org.projectlombok</groupId>
6565
<artifactId>lombok</artifactId>
66-
<version>1.18.22</version>
66+
<version>1.18.32</version>
6767
<optional>true</optional>
6868
</dependency>
6969
<dependency>
@@ -106,7 +106,7 @@
106106
<dependency>
107107
<groupId>jakarta.ws.rs</groupId>
108108
<artifactId>jakarta.ws.rs-api</artifactId>
109-
<version>2.1.6</version>
109+
<version>3.1.0</version>
110110
</dependency>
111111

112112
<dependency>
@@ -123,7 +123,7 @@
123123
<dependency>
124124
<groupId>commons-codec</groupId>
125125
<artifactId>commons-codec</artifactId>
126-
<version>1.15</version>
126+
<version>1.16.1</version>
127127
</dependency>
128128

129129
<dependency>
@@ -134,7 +134,7 @@
134134
<dependency>
135135
<groupId>org.json</groupId>
136136
<artifactId>json</artifactId>
137-
<version>20231013</version>
137+
<version>20240303</version>
138138
</dependency>
139139

140140
<!-- To compile JSP files -->
@@ -166,7 +166,6 @@
166166
<groupId>com.docusign</groupId>
167167
<artifactId>docusign-click-java</artifactId>
168168
<version>${click.version}</version>
169-
<classifier>shaded</classifier>
170169
</dependency>
171170

172171
<dependency>
@@ -179,14 +178,12 @@
179178
<groupId>com.docusign</groupId>
180179
<artifactId>docusign-monitor-java</artifactId>
181180
<version>${monitor.version}</version>
182-
<classifier>shaded</classifier>
183181
</dependency>
184182

185183
<dependency>
186184
<groupId>com.docusign</groupId>
187185
<artifactId>docusign-admin-java</artifactId>
188186
<version>${admin.version}</version>
189-
<classifier>shaded</classifier>
190187
</dependency>
191188

192189
<dependency>
@@ -207,8 +204,8 @@
207204
</dependency>
208205

209206
<dependency>
210-
<groupId>junit</groupId>
211-
<artifactId>junit</artifactId>
207+
<groupId>org.junit.jupiter</groupId>
208+
<artifactId>junit-jupiter-api</artifactId>
212209
<scope>test</scope>
213210
</dependency>
214211

@@ -248,13 +245,55 @@
248245
</build>
249246

250247
<dependencyManagement>
251-
252248
<dependencies>
253249
<dependency>
254250
<groupId>org.bouncycastle</groupId>
255251
<artifactId>bcprov-jdk15on</artifactId>
256252
<version>1.69</version>
257253
</dependency>
254+
255+
<dependency>
256+
<groupId>com.fasterxml.jackson.core</groupId>
257+
<artifactId>jackson-databind</artifactId>
258+
<version>2.13.5</version>
259+
</dependency>
260+
261+
<dependency>
262+
<groupId>org.yaml</groupId>
263+
<artifactId>snakeyaml</artifactId>
264+
<version>2.2</version>
265+
</dependency>
266+
267+
<dependency>
268+
<groupId>net.minidev</groupId>
269+
<artifactId>json-smart</artifactId>
270+
<version>2.5.1</version>
271+
</dependency>
272+
273+
<dependency>
274+
<groupId>com.nimbusds</groupId>
275+
<artifactId>nimbus-jose-jwt</artifactId>
276+
<version>9.37.3</version>
277+
</dependency>
278+
279+
<dependency>
280+
<groupId>org.springframework.security</groupId>
281+
<artifactId>spring-security-core</artifactId>
282+
<version>5.7.12</version>
283+
</dependency>
284+
285+
<dependency>
286+
<groupId>ch.qos.logback</groupId>
287+
<artifactId>logback-core</artifactId>
288+
<version>1.3.14</version>
289+
</dependency>
290+
291+
<dependency>
292+
<groupId>ch.qos.logback</groupId>
293+
<artifactId>logback-classic</artifactId>
294+
<version>1.3.14</version>
295+
<scope>test</scope>
296+
</dependency>
258297
</dependencies>
259298
</dependencyManagement>
260299
</project>

0 commit comments

Comments
 (0)