Skip to content

Commit 242d3e2

Browse files
committed
update dependencies, fix Concord 2.25.0+ compatibility
1 parent 13eb0af commit 242d3e2

File tree

3 files changed

+18
-20
lines changed

3 files changed

+18
-20
lines changed

pom.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3939
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4040

41-
<concord.version>2.1.0</concord.version>
42-
<testcontainers.version>1.19.7</testcontainers.version>
41+
<concord.version>2.25.1</concord.version>
42+
<testcontainers.version>1.21.0</testcontainers.version>
4343
<jetbrains.annotations.version>19.0.0</jetbrains.annotations.version>
44-
<junit5.version>5.8.2</junit5.version>
44+
<junit5.version>5.12.2</junit5.version>
4545

4646
<failsafe.args>
4747
--add-opens java.base/java.util=ALL-UNNAMED
@@ -107,7 +107,7 @@
107107
<plugins>
108108
<plugin>
109109
<artifactId>maven-compiler-plugin</artifactId>
110-
<version>3.11.0</version>
110+
<version>3.14.0</version>
111111
<configuration>
112112
<source>${maven.compiler.source}</source>
113113
<target>${maven.compiler.target}</target>
@@ -116,7 +116,7 @@
116116
<plugin>
117117
<groupId>org.codehaus.mojo</groupId>
118118
<artifactId>license-maven-plugin</artifactId>
119-
<version>1.14</version>
119+
<version>2.5.0</version>
120120
<executions>
121121
<execution>
122122
<id>first</id>
@@ -144,17 +144,17 @@
144144
<plugin>
145145
<groupId>org.apache.maven.plugins</groupId>
146146
<artifactId>maven-shade-plugin</artifactId>
147-
<version>3.5.0</version>
147+
<version>3.6.0</version>
148148
</plugin>
149149
<plugin>
150150
<groupId>org.apache.maven.plugins</groupId>
151151
<artifactId>maven-dependency-plugin</artifactId>
152-
<version>3.6.0</version>
152+
<version>3.8.1</version>
153153
</plugin>
154154
<plugin>
155155
<groupId>org.apache.maven.plugins</groupId>
156156
<artifactId>maven-release-plugin</artifactId>
157-
<version>2.5.3</version>
157+
<version>3.1.1</version>
158158
<configuration>
159159
<indentSize>4</indentSize>
160160
<tagNameFormat>@{project.version}</tagNameFormat>
@@ -169,7 +169,7 @@
169169
<plugin>
170170
<groupId>org.apache.maven.plugins</groupId>
171171
<artifactId>maven-source-plugin</artifactId>
172-
<version>3.3.0</version>
172+
<version>3.3.1</version>
173173
<executions>
174174
<execution>
175175
<id>attach-sources</id>
@@ -182,7 +182,7 @@
182182
<plugin>
183183
<groupId>org.apache.maven.plugins</groupId>
184184
<artifactId>maven-gpg-plugin</artifactId>
185-
<version>3.1.0</version>
185+
<version>3.2.7</version>
186186
<executions>
187187
<execution>
188188
<id>sign-artifacts</id>
@@ -199,7 +199,7 @@
199199
<plugin>
200200
<groupId>org.apache.maven.plugins</groupId>
201201
<artifactId>maven-javadoc-plugin</artifactId>
202-
<version>3.2.0</version>
202+
<version>3.11.2</version>
203203
<executions>
204204
<execution>
205205
<id>attach-javadocs</id>
@@ -216,7 +216,7 @@
216216
<plugin>
217217
<groupId>org.apache.maven.plugins</groupId>
218218
<artifactId>maven-surefire-plugin</artifactId>
219-
<version>3.1.2</version>
219+
<version>3.5.3</version>
220220
<dependencies>
221221
<dependency>
222222
<groupId>org.junit.jupiter</groupId>
@@ -228,7 +228,7 @@
228228
<plugin>
229229
<groupId>org.apache.maven.plugins</groupId>
230230
<artifactId>maven-failsafe-plugin</artifactId>
231-
<version>3.0.0-M5</version>
231+
<version>3.5.3</version>
232232
<dependencies>
233233
<dependency>
234234
<groupId>org.junit.jupiter</groupId>
@@ -257,7 +257,7 @@
257257
<plugin>
258258
<groupId>org.codehaus.mojo</groupId>
259259
<artifactId>build-helper-maven-plugin</artifactId>
260-
<version>3.4.0</version>
260+
<version>3.6.0</version>
261261
</plugin>
262262
</plugins>
263263
</pluginManagement>

testcontainers-concord-core/src/main/java/ca/ibodrov/concord/testcontainers/ConcordProcess.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,14 +214,13 @@ public List<String> getLogLines() throws ApiException {
214214

215215
public List<String> getLogLines(Predicate<String> lineFilter) throws ApiException {
216216
try {
217-
return IOUtils.readLines(
218-
new InputStreamReader(
219-
new ByteArrayInputStream(getLog())))
217+
byte[] log = getLog();
218+
return IOUtils.readLines(new InputStreamReader(new ByteArrayInputStream(log)))
220219
.stream()
221220
.filter(lineFilter)
222221
.collect(Collectors.toList());
223-
} catch (IOException ioex) {
224-
throw new RuntimeException("Failed to read log lines", ioex);
222+
} catch (UncheckedIOException e) {
223+
throw new RuntimeException("Failed to read log lines", e);
225224
}
226225
}
227226

testcontainers-concord-core/src/main/java/ca/ibodrov/concord/testcontainers/Projects.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ public ProjectOperationResponse create(String orgName, String projectName) throw
3434
ProjectEntry projectEntry = new ProjectEntry()
3535
.name(projectName)
3636
.orgName(orgName)
37-
.acceptsRawPayload(Boolean.TRUE)
3837
.rawPayloadMode(ProjectEntry.RawPayloadModeEnum.EVERYONE)
3938
.visibility(ProjectEntry.VisibilityEnum.PUBLIC);
4039

0 commit comments

Comments
 (0)