bump up bouncy-castle to 1.77, fix checkstyle violations

adorsys · Jan 19, 2024 · 190d067 · 190d067
1 parent 4d5fd7b
commit 190d067
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 23 deletions.
diff --git a/...java/de/adorsys/keymanagement/api/types/template/generated/KeyPairEncryptionTemplate.java b/...java/de/adorsys/keymanagement/api/types/template/generated/KeyPairEncryptionTemplate.java
@@ -28,6 +28,7 @@ public interface ExcludeToBuilder {
         KeyPairEncryptionTemplate toBuilder();
     }
 
+    @SuppressWarnings("checkstyle:ParameterNumber") // Is a builder method
     static KeyPairEncryptionTemplate of(String algo, Integer size, String sigAlgo, String commonName,
                                         AlgorithmParameterSpec paramSpec) {
         KeyPairEncryptionTemplate result = KeyPairEncryptionTemplate.builder().build();

diff --git a/core/src/main/java/de/adorsys/keymanagement/core/view/EntryViewImpl.java b/core/src/main/java/de/adorsys/keymanagement/core/view/EntryViewImpl.java
@@ -25,7 +25,6 @@
 
 import java.util.Collection;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import static com.googlecode.cqengine.query.QueryFactory.and;
 import static com.googlecode.cqengine.query.QueryFactory.attribute;
@@ -53,7 +52,8 @@ public class EntryViewImpl extends BaseUpdatingView<Query<KeyEntry>, KeyEntry> i
                     "is_meta", IS_META,
                     "is_private", attribute(KeyEntry.class, Boolean.class, "is_private", KeyEntry::isPrivate),
                     "is_secret", attribute(KeyEntry.class, Boolean.class, "is_secret", KeyEntry::isSecret),
-                    "is_trusted_cert", attribute(KeyEntry.class, Boolean.class, "is_trusted_cert", KeyEntry::isTrustedCert)
+                    "is_trusted_cert", attribute(KeyEntry.class, Boolean.class, "is_trusted_cert",
+                            KeyEntry::isTrustedCert)
             )
     );
 
@@ -75,7 +75,7 @@ public EntryViewImpl(KeySource source, Query<KeyEntry> viewFilter, Collection<In
         keys.addAll(
                 source.aliasesFor(ProvidedKeyEntry.class)
                         .map(it -> new KeyEntry(it.getKey(), source.asEntry(it.getKey())))
-                        .collect(Collectors.toList())
+                        .toList()
         );
 
         this.keys.addIndex(RadixTreeIndex.onAttribute(A_ID));

diff --git a/pom.xml b/pom.xml
@@ -60,13 +60,11 @@
         <doclint>none</doclint>
         <src.dir>src/main/java</src.dir>
         <test.src.dir>src/test/java</test.src.dir>
-        <!-- TODO: should be maven.multiModuleProjectDirectory but not using it because Intellij does not support it -->
-        <jacoco.reportPath>${basedir}/../../target/jacoco.exec</jacoco.reportPath>
-
+        <jacoco.reportPath>${maven.multiModuleProjectDirectory}/target/jacoco.exec</jacoco.reportPath>
         <maven.compiler.plugin.version>3.12.1</maven.compiler.plugin.version>
         <maven.dependency.plugin.version>3.6.1</maven.dependency.plugin.version>
         <lombok.version>1.18.30</lombok.version>
-        <bouncycastle.version>1.74</bouncycastle.version>
+        <bouncycastle.version>1.77</bouncycastle.version>
         <dagger.version>2.50</dagger.version>
         <shedlock.version>5.10.2</shedlock.version>
         <mongo.version>4.11.1</mongo.version>
@@ -108,12 +106,12 @@
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcpkix-jdk15to18</artifactId>
+                <artifactId>bcpkix-jdk18on</artifactId>
                 <version>${bouncycastle.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
-                <artifactId>bcprov-jdk15to18</artifactId>
+                <artifactId>bcprov-jdk18on</artifactId>
                 <version>${bouncycastle.version}</version>
             </dependency>
             <dependency>
@@ -372,10 +370,9 @@
                 <version>${checkstyle-plugin.version}</version>
                 <configuration>
                     <configLocation>checkstyle.xml</configLocation>
-                    <encoding>UTF-8</encoding>
                     <consoleOutput>true</consoleOutput>
                     <failsOnError>false</failsOnError>
-                    <failOnViolation>false</failOnViolation>
+<!--                    <failOnViolation>false</failOnViolation>-->
                     <linkXRef>false</linkXRef>
                 </configuration>
                 <executions>
@@ -457,7 +454,7 @@
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.13</version>
+                        <version>${nexus-staging-maven-plugin.version}</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>sonatype</serverId>
@@ -483,11 +480,6 @@
                         <artifactId>maven-gpg-plugin</artifactId>
                         <version>${maven-gpg-plugin.version}</version>
                         <configuration>
-                            <keyname>opensource@adorsys.de</keyname>
-                            <gpgArguments>
-                                <arg>--pinentry-mode</arg>
-                                <arg>loopback</arg>
-                            </gpgArguments>
                         </configuration>
                         <executions>
                             <execution>
@@ -496,12 +488,6 @@
                                 <goals>
                                     <goal>sign</goal>
                                 </goals>
-                                <configuration>
-                                    <gpgArguments>
-                                        <arg>--pinentry-mode</arg>
-                                        <arg>loopback</arg>
-                                    </gpgArguments>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>