Skip to content

Commit

Permalink
Merge pull request #25 from digicert/dependabot/maven/all-dependencie…
Browse files Browse the repository at this point in the history
…s-a2b102e069

Bump the all-dependencies group across 1 directory with 28 updates
  • Loading branch information
jadams2911 authored Dec 19, 2024
2 parents fe432a2 + 2bc7449 commit e189978
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 39 deletions.
50 changes: 30 additions & 20 deletions example-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<spring.boot.version>3.4.0</spring.boot.version>
<slf4j.version>2.0.16</slf4j.version>
<h2.version>2.3.232</h2.version>
<junit-jupiter.version>5.11.4</junit-jupiter.version>
<projectreactor.version>3.7.1</projectreactor.version>
<jackson.version>2.18.2</jackson.version>
<httpclient5.version>5.4.1</httpclient5.version>
<bouncycastle.version>1.79</bouncycastle.version>
<mysql-connector.version>9.1.0</mysql-connector.version>
</properties>

<dependencies>
Expand All @@ -28,59 +38,59 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>3.3.4</version>
<version>${spring.boot.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
<version>3.3.4</version>
<version>${spring.boot.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.16</version>
<version>${slf4j.version}</version>
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>2.3.232</version>
<version>${h2.version}</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.11.2</version>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.11.2</version>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.11.2</version>
<version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
<version>3.3.4</version>
<version>${spring.boot.version}</version>
</dependency>

<!-- Spring Boot Starter Test (includes JUnit 5, WebTestClient, etc.) -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<version>3.3.4</version>
<version>${spring.boot.version}</version>
<exclusions>
<!-- Exclude JUnit Vintage Engine to use JUnit 5 only -->
<exclusion>
Expand All @@ -95,44 +105,44 @@
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<scope>test</scope>
<version>3.6.10</version>
<version>${projectreactor.version}</version>
</dependency>

<!-- Need a mysql driver dependency -->
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>9.0.0</version>
<version>${mysql-connector.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.18.0</version> <!-- or a later version -->
<version>${jackson.version}</version> <!-- or a later version -->
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.18.0</version> <!-- or a later version -->
<version>${jackson.version}</version> <!-- or a later version -->
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.18.0</version> <!-- or a later version -->
<version>${jackson.version}</version> <!-- or a later version -->
</dependency>

<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.4</version>
<version>${httpclient5.version}</version>
</dependency>

<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
<version>1.78.1</version>
<version>${bouncycastle.version}</version>
</dependency>

</dependencies>
Expand All @@ -149,7 +159,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
<configuration>
<includes>
<include>**/*Test.java</include>
Expand All @@ -161,7 +171,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<version>3.4.2</version>
<configuration>
<archive>
<manifest>
Expand All @@ -176,7 +186,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>3.3.4</version>
<version>${spring.boot.version}</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -220,7 +230,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
<executions>
<execution>
<goals>
Expand Down
13 changes: 13 additions & 0 deletions example-app/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="300 seconds">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<root level="INFO">
<appender-ref ref="STDOUT" />
</root>

</configuration>
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.springframework.web.client.RestTemplate;

import java.io.IOException;
import java.net.URI;
import java.util.List;

@Service
Expand All @@ -25,14 +26,7 @@ public PdnsClient() {
.defaultHeader("X-API-Key", "secret")
.build();
restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory());
restTemplate.setErrorHandler(new DefaultResponseErrorHandler() {
@Override
public void handleError(ClientHttpResponse response) throws IOException {
if (response.getStatusCode() != HttpStatus.NOT_FOUND) {
super.handleError(response);
}
}
});
restTemplate.setErrorHandler(new Ignore404StatusResponseErrorHandler());
}

public void createLocalhostARecord(String domain) {
Expand Down Expand Up @@ -153,4 +147,20 @@ public enum PdnsRecordType {
CNAME,
A,
}

static class Ignore404StatusResponseErrorHandler extends DefaultResponseErrorHandler {
@Override
public void handleError(URI url, HttpMethod method, ClientHttpResponse response) throws IOException {
if (response.getStatusCode() != HttpStatus.NOT_FOUND) {
super.handleError(url, method, response);
}
}

@Override
public void handleError(ClientHttpResponse response) throws IOException {
if (response.getStatusCode() != HttpStatus.NOT_FOUND) {
super.handleError(response);
}
}
}
}
22 changes: 11 additions & 11 deletions library/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@
<!-- Dependency versions-->
<commons-net.version>3.11.1</commons-net.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
<projectlombok.version>1.18.34</projectlombok.version>
<projectlombok.version>1.18.36</projectlombok.version>
<dnsjava.version>3.6.2</dnsjava.version>
<httpcomponents.version>5.4</httpcomponents.version>
<httpcomponents.version>5.4.1</httpcomponents.version>
<slf4j.version>2.0.16</slf4j.version>
<logback.version>1.5.9</logback.version>
<bouncycastle.version>1.78.1</bouncycastle.version>
<logback.version>1.5.13</logback.version>
<bouncycastle.version>1.79</bouncycastle.version>
<guava.version>33.2.1-jre</guava.version>
<icu.version>75.1</icu.version>
<icu.version>76.1</icu.version>
<!-- TEST versions -->
<mockito.version>5.14.1</mockito.version>
<jupiter.version>5.11.2</jupiter.version>
<mockito.version>5.14.2</mockito.version>
<jupiter.version>5.11.4</jupiter.version>
<mock-server.version>5.15.0</mock-server.version>
<sonar.coverage.jacoco.xmlReportPaths>./target/site/jacoco-aggregate/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
</properties>
Expand Down Expand Up @@ -174,7 +174,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
</plugin>
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
Expand Down Expand Up @@ -235,7 +235,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -250,7 +250,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.10.1</version>
<version>3.11.2</version>
<configuration>
<source>21</source>
<show>private</show>
Expand All @@ -269,7 +269,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.2.6</version>
<version>3.2.7</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down

0 comments on commit e189978

Please sign in to comment.