Skip to content

Update Java dependencies #801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 19, 2025
Merged

Update Java dependencies #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ scan-java-dependency-check:

.PHONY: scan-java-osv-scanner
scan-java-osv-scanner:
$(osv_scanner) scan --lockfile='$(java_dir)/pom.xml'
$(osv_scanner) scan --lockfile='$(java_dir)/pom.xml' --data-source=native

.PHONY: install-mockery
install-mockery:
Expand Down
41 changes: 23 additions & 18 deletions java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,39 +38,46 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<javaVersion>8</javaVersion>
<bouncyCastleVersion>1.79</bouncyCastleVersion>
<bouncyCastleVersion>1.81</bouncyCastleVersion>
<skipUnitTests>${skipTests}</skipUnitTests>
<pmdVersion>7.8.0</pmdVersion>
<pmdVersion>7.14.0</pmdVersion>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.cucumber</groupId>
<artifactId>cucumber-bom</artifactId>
<version>7.20.1</version>
<version>7.23.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>5.11.4</version>
<version>5.13.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-bom</artifactId>
<version>3.27.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>1.69.0</version>
<version>1.73.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- Protobuf v4 required for fabric-protos:0.3.4+ -->
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
<version>4.29.2</version>
<version>4.31.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -91,13 +98,12 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.27.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.14.2</version>
<version>5.18.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -141,12 +147,12 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.11.0</version>
<version>2.13.1</version>
</dependency>
<dependency>
<groupId>org.hyperledger.fabric</groupId>
<artifactId>fabric-protos</artifactId>
<version>0.3.4</version>
<version>0.3.7</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -198,7 +204,7 @@
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<version>3.14.0</version>
<configuration>
<source>${javaVersion}</source>
<target>${javaVersion}</target>
Expand All @@ -214,7 +220,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.2</version>
<version>3.5.3</version>
<dependencies>
<dependency>
<groupId>me.fabriciorby</groupId>
Expand All @@ -225,7 +231,7 @@
<configuration>
<properties>
<configurationParameters>
cucumber.junit-platform.naming-strategy=long
cucumber.junit-platform.naming-strategy=surefire
</configurationParameters>
</properties>
</configuration>
Expand Down Expand Up @@ -275,7 +281,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.12</version>
<version>0.8.13</version>
<executions>
<execution>
<id>default-prepare-agent</id>
Expand Down Expand Up @@ -364,7 +370,6 @@
<phase>test</phase>
<goals>
<goal>check</goal>
<goal>cpd-check</goal>
</goals>
</execution>
</executions>
Expand Down Expand Up @@ -440,14 +445,14 @@
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.43.0</version>
<version>2.44.5</version>
<configuration>
<checkSkip>${skipUnitTests}</checkSkip>
<java>
<trimTrailingWhitespace/>
<endWithNewline/>
<palantirJavaFormat>
<version>2.50.0</version>
<version>2.68.0</version>
<style>PALANTIR</style>
<formatJavadoc>false</formatJavadoc>
</palantirJavaFormat>
Expand Down Expand Up @@ -476,7 +481,7 @@
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>11.1.1</version>
<version>12.1.3</version>
<configuration>
<skipProvidedScope>true</skipProvidedScope>
<skipTestScope>true</skipTestScope>
Expand Down
1 change: 1 addition & 0 deletions java/src/main/java/org/hyperledger/fabric/client/Builder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* A builder used to create new object instances from configuration state.
* @param <T> The type of object built.
*/
@FunctionalInterface
public interface Builder<T> {
/**
* Build an instance.
Expand Down
2 changes: 1 addition & 1 deletion java/src/main/java/org/hyperledger/fabric/client/GatewayClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ private <T> CloseableIterator<T> invokeServerStreamingCall(final Supplier<Iterat
return invokeStreamingCall(context, call);
}

@SuppressWarnings({"PMD.AvoidCatchingGenericException", "PMD.AvoidCatchingGenericException"})
@SuppressWarnings("PMD.AvoidCatchingGenericException")
private <T> CloseableIterator<T> invokeStreamingCall(
final Context.CancellableContext context, final Supplier<Iterator<T>> call) {
try {
Expand Down
1 change: 0 additions & 1 deletion java/src/main/java/org/hyperledger/fabric/client/Proposal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ interface Builder extends org.hyperledger.fabric.client.Builder<Proposal> {
* @param mspids The Member Services Provider IDs of the endorsing organizations.
* @return This builder.
*/
@SuppressWarnings("PMD.LinguisticNaming")
Builder setEndorsingOrganizations(String... mspids);

/**
Expand Down
Loading