Skip to content

Commit 6c92ba2

Browse files
TayGovTayGov
authored
Merge pull request #36 from bcgov/feature/FLA-1566
FLA-1566 Critical Vulnerabilies. Bumped Java -> 17, Sprint -> 3
2 parents c3f8cfc + 5de7555 commit 6c92ba2

File tree

12 files changed

+66
-50
lines changed

12 files changed

+66
-50
lines changed

‎.github/workflows/maven-test.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99

1010
steps:
1111
- uses: actions/checkout@v1
12-
- name: Set up JDK 1.8
12+
- name: Set up JDK 17
1313
uses: actions/setup-java@v1
1414
with:
15-
java-version: 1.8
15+
java-version: 17
1616
- uses: actions/cache@v1
1717
with:
1818
path: ~/.m2/repository

‎.github/workflows/publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@v2
1212
- uses: actions/setup-java@v1
1313
with:
14-
java-version: 1.8
14+
java-version: 17
1515
- uses: actions/cache@v1
1616
with:
1717
path: ~/.m2/repository

‎src/bambora-payment-starter/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
<groupId>ca.bc.gov.open</groupId>
77
<artifactId>bambora-payment-starter</artifactId>
8-
<version>0.2.2</version>
8+
<version>1.0.0</version>
99

1010
<properties>
11-
<java.version>1.8</java.version>
12-
<spring-boot.version>2.2.4.RELEASE</spring-boot.version>
11+
<java.version>17</java.version>
12+
<spring-boot.version>3.1.3</spring-boot.version>
1313
<log4j2.version>2.17.1</log4j2.version>
1414
</properties>
1515

@@ -69,7 +69,7 @@
6969
<dependency>
7070
<groupId>ca.bc.gov.open</groupId>
7171
<artifactId>spring-starters-bom</artifactId>
72-
<version>0.2.2</version>
72+
<version>1.0.0</version>
7373
<type>pom</type>
7474
<scope>import</scope>
7575
</dependency>

‎src/bambora-payment-starter/src/main/java/ca/bc/gov/open/bambora/payment/starter/managment/BamboraCardService.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package ca.bc.gov.open.bambora.payment.starter.managment;
22

3+
import java.net.URI;
4+
35
import ca.bc.gov.open.bambora.payment.starter.managment.models.RecurringPaymentDetails;
4-
import com.sun.jndi.toolkit.url.Uri;
56

67
public interface BamboraCardService {
7-
Uri setupRecurringPayment(RecurringPaymentDetails recurringPaymentDetails);
8+
9+
URI setupRecurringPayment(RecurringPaymentDetails recurringPaymentDetails);
810

911
}

‎src/bambora-payment-starter/src/main/java/ca/bc/gov/open/bambora/payment/starter/managment/BamboraCardServiceImpl.java

+15-11
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
package ca.bc.gov.open.bambora.payment.starter.managment;
22

3-
import ca.bc.gov.open.bambora.payment.starter.BamboraConstants;
4-
import ca.bc.gov.open.bambora.payment.starter.BamboraException;
5-
import ca.bc.gov.open.bambora.payment.starter.BamboraProperties;
6-
import ca.bc.gov.open.bambora.payment.starter.managment.models.RecurringPaymentDetails;
7-
import com.sun.jndi.toolkit.url.Uri;
8-
import org.apache.commons.codec.digest.DigestUtils;
9-
103
import java.net.MalformedURLException;
4+
import java.net.URI;
5+
import java.net.URISyntaxException;
116
import java.text.MessageFormat;
127
import java.text.SimpleDateFormat;
138
import java.util.Calendar;
149
import java.util.Date;
1510

11+
import org.apache.commons.codec.digest.DigestUtils;
12+
13+
import ca.bc.gov.open.bambora.payment.starter.BamboraConstants;
14+
import ca.bc.gov.open.bambora.payment.starter.BamboraException;
15+
import ca.bc.gov.open.bambora.payment.starter.BamboraProperties;
16+
import ca.bc.gov.open.bambora.payment.starter.managment.models.RecurringPaymentDetails;
17+
1618
public class BamboraCardServiceImpl implements BamboraCardService {
1719

1820
private final BamboraProperties bamboraProperties;
@@ -22,16 +24,18 @@ public BamboraCardServiceImpl(BamboraProperties bamboraProperties) {
2224
}
2325

2426
@Override
25-
public Uri setupRecurringPayment(RecurringPaymentDetails recurringPaymentDetails) {
27+
public URI setupRecurringPayment(RecurringPaymentDetails recurringPaymentDetails) {
2628
try {
2729
return buildRecurringPaymentUrl(recurringPaymentDetails);
2830
} catch (MalformedURLException e) {
2931
throw new BamboraException("Url construction failed", e.getCause());
30-
}
32+
} catch (URISyntaxException e) {
33+
throw new BamboraException("Url construction failed", e.getCause());
34+
}
3135
}
3236

3337

34-
private Uri buildRecurringPaymentUrl(RecurringPaymentDetails recurringPaymentDetails) throws MalformedURLException {
38+
private URI buildRecurringPaymentUrl(RecurringPaymentDetails recurringPaymentDetails) throws MalformedURLException, URISyntaxException {
3539

3640
String operationType = (recurringPaymentDetails.getEndUserId() != null ? BamboraConstants.OperationTypes.M.toString() : BamboraConstants.OperationTypes.N.toString());
3741

@@ -56,7 +60,7 @@ private Uri buildRecurringPaymentUrl(RecurringPaymentDetails recurringPaymentDet
5660

5761
paramString.append(MessageFormat.format("&{0}={1}&{2}={3}", BamboraConstants.PARAM_TRANS_HASH_VALUE, getHash(paramString.toString()), BamboraConstants.PARAM_TRANS_HASH_EXPIRY, getExpiry()));
5862

59-
return new Uri(MessageFormat.format("{0}?{1}", bamboraProperties.getHostedProfileUrl(), paramString.toString()));
63+
return new URI(MessageFormat.format("{0}?{1}", bamboraProperties.getHostedProfileUrl(), paramString.toString()));
6064

6165
}
6266

‎src/bambora-payment-starter/src/test/java/ca/bc/gov/open/bambora/payment/starter/managment/BamboraCardServiceImplTest.java

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
package ca.bc.gov.open.bambora.payment.starter.managment;
22

3+
import java.net.URI;
4+
5+
import org.junit.jupiter.api.Assertions;
6+
import org.junit.jupiter.api.BeforeEach;
7+
import org.junit.jupiter.api.DisplayName;
8+
import org.junit.jupiter.api.Test;
9+
import org.junit.jupiter.api.TestInstance;
10+
311
import ca.bc.gov.open.bambora.payment.starter.BamboraException;
412
import ca.bc.gov.open.bambora.payment.starter.BamboraProperties;
513
import ca.bc.gov.open.bambora.payment.starter.managment.models.RecurringPaymentDetails;
6-
import com.sun.jndi.toolkit.url.Uri;
7-
import org.junit.jupiter.api.*;
814

915
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
1016
@DisplayName("Test BamboraCardServiceImpl")
@@ -42,7 +48,7 @@ public void init() {
4248
public void withClientIdCreateUpdateUrl() {
4349
sut = new BamboraCardServiceImpl(bamboraProperties);
4450

45-
Uri actual = sut.setupRecurringPayment(createPaymentDetail(END_USER_ID));
51+
URI actual = sut.setupRecurringPayment(createPaymentDetail(END_USER_ID));
4652

4753
Assertions.assertNotNull(actual);
4854
Assertions.assertTrue(actual.toString().contains(BAMBORA_CLIENT_URL));
@@ -54,7 +60,7 @@ public void withClientIdCreateUpdateUrl() {
5460
public void withoutClientIdCreateUpdateUrl() {
5561
sut = new BamboraCardServiceImpl(bamboraProperties);
5662

57-
Uri actual = sut.setupRecurringPayment(createPaymentDetail(null));
63+
URI actual = sut.setupRecurringPayment(createPaymentDetail(null));
5864

5965
Assertions.assertNotNull(actual);
6066
Assertions.assertTrue(actual.toString().contains(BAMBORA_NEW_URL));

‎src/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55

66
<groupId>ca.bc.gov.open</groupId>
77
<artifactId>spring-starters</artifactId>
8-
<version>0.2.2</version>
8+
<version>1.0.0</version>
99

1010
<name>spring-starters</name>
1111
<packaging>pom</packaging>
1212
<url>https://github.com/bcgov/spring-boot-starters</url>
1313

1414
<properties>
15-
<java.version>1.8</java.version>
15+
<java.version>17</java.version>
1616
<log4j2.version>2.17.1</log4j2.version>
1717
</properties>
1818

‎src/spring-bceid-starter/pom.xml

+11-7
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,20 @@
66

77
<groupId>ca.bc.gov.open</groupId>
88
<artifactId>spring-bceid-starter</artifactId>
9-
<version>0.2.2</version>
9+
<version>1.0.0</version>
1010

1111
<properties>
12-
<java.version>1.8</java.version>
12+
<java.version>17</java.version>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14-
<maven.compiler.source>1.8</maven.compiler.source>
15-
<maven.compiler.target>1.8</maven.compiler.target>
16-
<spring-boot.version>2.2.4.RELEASE</spring-boot.version>
14+
<maven.compiler.source>17</maven.compiler.source>
15+
<maven.compiler.target>17</maven.compiler.target>
16+
<spring-boot.version>3.1.3</spring-boot.version>
1717
<org.mapstruct.version>1.3.1.Final</org.mapstruct.version>
1818
<log4j2.version>2.17.1</log4j2.version>
19+
<org.apache.cxf.version>4.0.1</org.apache.cxf.version>
20+
21+
<!-- automatically run annotation processors within the incremental compilation (Eclipse) -->
22+
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
1923
</properties>
2024

2125
<distributionManagement>
@@ -95,7 +99,7 @@
9599
<dependency>
96100
<groupId>ca.bc.gov.open</groupId>
97101
<artifactId>spring-starters-bom</artifactId>
98-
<version>0.2.2</version>
102+
<version>1.0.0</version>
99103
<type>pom</type>
100104
<scope>import</scope>
101105
</dependency>
@@ -126,7 +130,7 @@
126130
<plugin>
127131
<groupId>org.apache.cxf</groupId>
128132
<artifactId>cxf-codegen-plugin</artifactId>
129-
<version>3.3.7</version>
133+
<version>${org.apache.cxf.version}</version>
130134
<executions>
131135
<execution>
132136
<id>generate-sources</id>

‎src/spring-clamav-starter/pom.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66

77
<groupId>ca.bc.gov.open</groupId>
88
<artifactId>spring-clamav-starter</artifactId>
9-
<version>0.2.2</version>
9+
<version>1.0.0</version>
1010

1111
<properties>
12-
<java.version>1.8</java.version>
13-
<maven.compiler.source>1.8</maven.compiler.source>
14-
<maven.compiler.target>1.8</maven.compiler.target>
15-
<spring-boot.version>2.2.4.RELEASE</spring-boot.version>
16-
<org.apache.maven.plugins.version.version>2.22.0</org.apache.maven.plugins.version.version>
12+
<java.version>17</java.version>
13+
<maven.compiler.source>17</maven.compiler.source>
14+
<maven.compiler.target>17</maven.compiler.target>
15+
<spring-boot.version>3.1.3</spring-boot.version>
16+
<org.apache.maven.plugins.version.version>3.1.2</org.apache.maven.plugins.version.version>
1717
<log4j2.version>2.17.1</log4j2.version>
1818
</properties>
1919

@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>ca.bc.gov.open</groupId>
6565
<artifactId>spring-starters-bom</artifactId>
66-
<version>0.2.2</version>
66+
<version>1.0.0</version>
6767
<type>pom</type>
6868
<scope>import</scope>
6969
</dependency>
@@ -87,7 +87,7 @@
8787
<plugin>
8888
<groupId>org.jacoco</groupId>
8989
<artifactId>jacoco-maven-plugin</artifactId>
90-
<version>0.8.2</version>
90+
<version>0.8.7</version>
9191
<executions>
9292
<execution>
9393
<goals>

‎src/spring-clamav-starter/src/test/java/ca/bc/gov/open/clamav/starter/ClamAvServiceImplTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ClamAvServiceImplTest {
2323
@BeforeEach
2424
void setUp() throws IOException {
2525

26-
MockitoAnnotations.initMocks(this);
26+
MockitoAnnotations.openMocks(this);
2727
sut = new ClamAvServiceImpl(clamAvClient);
2828

2929
}

‎src/spring-sftp-starter/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
<groupId>ca.bc.gov.open</groupId>
99
<artifactId>spring-sftp-starter</artifactId>
10-
<version>0.2.2</version>
10+
<version>1.0.0</version>
1111

1212
<properties>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14-
<maven.compiler.source>1.8</maven.compiler.source>
15-
<maven.compiler.target>1.8</maven.compiler.target>
16-
<spring-boot.version>2.2.4.RELEASE</spring-boot.version>
14+
<maven.compiler.source>17</maven.compiler.source>
15+
<maven.compiler.target>17</maven.compiler.target>
16+
<spring-boot.version>3.1.3</spring-boot.version>
1717
<log4j2.version>2.17.1</log4j2.version>
1818
</properties>
1919

@@ -79,7 +79,7 @@
7979
<dependency>
8080
<groupId>ca.bc.gov.open</groupId>
8181
<artifactId>spring-starters-bom</artifactId>
82-
<version>0.2.2</version>
82+
<version>1.0.0</version>
8383
<type>pom</type>
8484
<scope>import</scope>
8585
</dependency>

‎src/spring-starters-bom/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
<groupId>ca.bc.gov.open</groupId>
99
<artifactId>spring-starters-bom</artifactId>
10-
<version>0.2.2</version>
10+
<version>1.0.0</version>
1111

1212
<properties>
13-
<org.apache.cxf.version>3.3.7</org.apache.cxf.version>
13+
<org.apache.cxf.version>4.0.1</org.apache.cxf.version>
1414
<com.fasterxml.jackson.core.version>2.11.2</com.fasterxml.jackson.core.version>
1515
<javax.xml.bind.version>2.3.1</javax.xml.bind.version>
16-
<commons.io.version>1.4</commons.io.version>
16+
<commons.io.version>2.13.0</commons.io.version>
1717
<joda-time.version>2.10.6</joda-time.version>
1818
<org.mapstruct.version>1.3.1.Final</org.mapstruct.version>
1919
<fi.solita.clamav>1.0.1</fi.solita.clamav>

0 commit comments

Comments
 (0)