Skip to content

Commit

Permalink
Updating Java packages across all code examples
Browse files Browse the repository at this point in the history
  • Loading branch information
@InbarGazit
InbarGazit committed Apr 24, 2024
1 parent 03f673c commit 497ac10
Show file tree
Hide file tree
Showing 107 changed files with 249 additions and 353 deletions.
6 changes: 3 additions & 3 deletions JWT Console App/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<esignature.version>4.0.0-RC1</esignature.version>
<esignature.version>4.6.0-RC1</esignature.version>
</properties>

<dependencies>

<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.5.0</version>
<version>1.7.0</version>
</dependency>

<dependency>
Expand All @@ -42,7 +42,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
<version>2.16.1</version>
</dependency>

</dependencies>
Expand Down
82 changes: 41 additions & 41 deletions Quick_ACG/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.12</version>
<version>2.7.18</version>
<relativePath />
</parent>

Expand All @@ -18,13 +18,9 @@
<properties>
<java.version>11</java.version>
<oauth2.version>2.5.6</oauth2.version>
<commonsio.version>2.11.0</commonsio.version>
<commonsio.version>2.16.1</commonsio.version>
<docusign.version>3.17.1</docusign.version>
<rooms.version>1.1.0</rooms.version>
<click.version>1.0.0</click.version>
<monitor.version>1.0.0</monitor.version>
<admin.version>1.0.0-BETA</admin.version>
<esignature.version>4.0.0-RC1</esignature.version>
<esignature.version>4.6.0-RC1</esignature.version>
</properties>

<dependencies>
Expand All @@ -50,14 +46,6 @@
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
</dependency>

<!-- JSTL -->
<dependency>
Expand All @@ -83,30 +71,6 @@
<classifier>shaded</classifier>
</dependency>

<dependency>
<groupId>com.docusign</groupId>
<artifactId>docusign-rooms-java</artifactId>
<version>${rooms.version}</version>
</dependency>

<dependency>
<groupId>com.docusign</groupId>
<artifactId>docusign-click-java</artifactId>
<version>${click.version}</version>
</dependency>

<dependency>
<groupId>com.docusign</groupId>
<artifactId>docusign-monitor-java</artifactId>
<version>${monitor.version}</version>
</dependency>

<dependency>
<groupId>com.docusign</groupId>
<artifactId>docusign-admin-java</artifactId>
<version>${admin.version}</version>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
Expand All @@ -116,7 +80,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
<version>2.5.15</version>
<version>2.7.18</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -163,7 +127,6 @@
<directory>../src/main/java/com/docusign</directory>
<includes>
<include>JsonPropertySourceLoader.java</include>
<include>OSDetector.java</include>
<include>EG001ControllerEmbeddedSigning.java</include>
</includes>
</resource>
Expand Down Expand Up @@ -269,6 +232,43 @@
<artifactId>bcprov-jdk15on</artifactId>
<version>1.69</version>
</dependency>

<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.2</version>
</dependency>

<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.5.1</version>
</dependency>

<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>9.37.3</version>
</dependency>

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>5.7.12</version>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.3.14</version>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.3.14</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
</project>
1 change: 0 additions & 1 deletion Quick_ACG/src/main/java/com/docusign/App.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import java.nio.file.FileSystemAlreadyExistsException;
import java.nio.file.FileSystems;
import java.util.Collections;
import java.util.Properties;

import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.SpringApplication;
Expand Down
25 changes: 25 additions & 0 deletions Quick_ACG/src/main/java/com/docusign/OSDetector.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.docusign;

/*
* This class can be used to determine the user's operating system so that the
* application can successfully open a web browser to run the examples.
*/
public class OSDetector
{
private static final boolean isWindows;
private static final boolean isLinux;
private static final boolean isMac;

static
{
String os = System.getProperty("os.name").toLowerCase();
isWindows = os.contains("win");
isLinux = os.contains("nux") || os.contains("nix");
isMac = os.contains("mac");
}

public static boolean isWindows() { return isWindows; }
public static boolean isLinux() { return isLinux; }
public static boolean isMac() { return isMac; }

}
1 change: 0 additions & 1 deletion ...c/main/java/com/docusign/controller/eSignature/examples/AbstractEsignatureController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Objects;
import java.util.Arrays;

/**
* Abstract base class for all eSignature controllers.
Expand Down
3 changes: 1 addition & 2 deletions Quick_ACG/src/main/java/com/docusign/core/controller/IndexController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ public class IndexController {
@Autowired
private OAuth2AuthorizedClientService authorizedClientService;

@Autowired
public IndexController(DSConfiguration config, Session session, User user, Optional<OAuth.Account> account) {
this.config = config;
this.session = session;
Expand All @@ -73,7 +72,7 @@ public ModelAndView mustAuthenticateController(ModelMap model) throws IOExceptio
@GetMapping(path = "/ds-return")
public String returnController(@RequestParam(value = ATTR_STATE, required = false) String state,
@RequestParam(value = ATTR_EVENT, required = false) String event,
@RequestParam(value = "envelopeId", required = false) String envelopeId, ModelMap model, HttpServletResponse response) throws IOException {
@RequestParam(required = false) String envelopeId, ModelMap model, HttpServletResponse response) throws IOException {
String site = "/eg001";
response.setStatus(response.SC_MOVED_TEMPORARILY);
response.setHeader("Location", site);
Expand Down
1 change: 0 additions & 1 deletion Quick_ACG/src/main/java/com/docusign/core/model/Session.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import org.springframework.web.context.WebApplicationContext;

import java.io.Serializable;
import java.util.List;
import java.util.UUID;

@Component
Expand Down
75 changes: 57 additions & 18 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.5.12</version>
<version>2.7.18</version>
<relativePath />
</parent>

Expand All @@ -24,18 +24,18 @@

<java.version>11</java.version>
<oauth2.version>2.5.6</oauth2.version>
<commonsio.version>2.11.0</commonsio.version>
<commonsio.version>2.16.1</commonsio.version>

<esignature.version>4.6.0-RC1</esignature.version>
<rooms.version>1.4.3</rooms.version>
<click.version> 1.4.0</click.version>
<monitor.version>1.3.0</monitor.version>
<click.version>1.5.0</click.version>
<monitor.version>1.4.0</monitor.version>
<admin.version>1.3.0</admin.version>
<webforms.version>1.0.2-RC12</webforms.version>
<maestro.version>1.0.0-RC1</maestro.version>
<swagger-core-version>2.2.8</swagger-core-version>
<jackson-version>2.14.2</jackson-version>
<jersey2.version>3.0.9</jersey2.version>
<swagger-core-version>2.2.21</swagger-core-version>
<jackson-version>2.17.0</jackson-version>
<jersey2.version>3.1.6</jersey2.version>
</properties>

<dependencies>
Expand All @@ -57,13 +57,13 @@
<dependency>
<groupId>io.github.cdimascio</groupId>
<artifactId>dotenv-java</artifactId>
<version>2.2.0</version>
<version>3.0.0</version>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.22</version>
<version>1.18.32</version>
<optional>true</optional>
</dependency>
<dependency>
Expand Down Expand Up @@ -106,7 +106,7 @@
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>2.1.6</version>
<version>3.1.0</version>
</dependency>

<dependency>
Expand All @@ -123,7 +123,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
<version>1.16.1</version>
</dependency>

<dependency>
Expand All @@ -134,7 +134,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20231013</version>
<version>20240303</version>
</dependency>

<!-- To compile JSP files -->
Expand Down Expand Up @@ -166,7 +166,6 @@
<groupId>com.docusign</groupId>
<artifactId>docusign-click-java</artifactId>
<version>${click.version}</version>
<classifier>shaded</classifier>
</dependency>

<dependency>
Expand All @@ -179,14 +178,12 @@
<groupId>com.docusign</groupId>
<artifactId>docusign-monitor-java</artifactId>
<version>${monitor.version}</version>
<classifier>shaded</classifier>
</dependency>

<dependency>
<groupId>com.docusign</groupId>
<artifactId>docusign-admin-java</artifactId>
<version>${admin.version}</version>
<classifier>shaded</classifier>
</dependency>

<dependency>
Expand All @@ -207,8 +204,8 @@
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -248,13 +245,55 @@
</build>

<dependencyManagement>

<dependencies>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.69</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.5</version>
</dependency>

<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.2</version>
</dependency>

<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.5.1</version>
</dependency>

<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>9.37.3</version>
</dependency>

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>5.7.12</version>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.3.14</version>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.3.14</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
</project>
Loading

0 comments on commit 497ac10

Please sign in to comment.