fix(deps): bump vegardit-maven-parent from 3.1.7 to 6.1.0

vegardit · Sep 17, 2024 · f99b168 · f99b168
1 parent 8c5d14f
commit f99b168
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/eea-all/pom.xml b/eea-all/pom.xml
@@ -17,6 +17,10 @@ SPDX-ArtifactOfProjectHomePage: https://github.com/vegardit/no-npe
 
   <artifactId>no-npe-eea-all</artifactId>
 
+  <properties>
+    <failIfNoTests>false</failIfNoTests>
+  </properties>
+
   <build>
     <plugins>
 

diff --git a/eea-generator/pom.xml b/eea-generator/pom.xml
@@ -31,6 +31,13 @@ SPDX-ArtifactOfProjectHomePage: https://github.com/vegardit/no-npe
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>com.vegardit.no-npe</groupId>
+      <artifactId>no-npe-eea-all</artifactId>
+      <version>1.1.0</version>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.eclipse.jdt</groupId>
       <artifactId>org.eclipse.jdt.annotation</artifactId>

diff --git a/eea-generator/src/main/java/com/vegardit/no_npe/eea_generator/EEAFile.java b/eea-generator/src/main/java/com/vegardit/no_npe/eea_generator/EEAFile.java
@@ -17,9 +17,9 @@
 import java.nio.file.StandardOpenOption;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Deque;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
@@ -593,7 +593,13 @@ && contains(member.annotatedSignature.comment, MARKER_OVERRIDES)) {
     * @return true if modifications where written to disk, false was already up-to-date
     */
    public boolean save(final Path rootPath, final @Nullable SaveOption... opts) throws IOException {
-      return save(rootPath, Arrays.stream(opts).filter(Objects::nonNull).collect(Collectors.toSet()));
+      final var uniqueOpts = new HashSet<SaveOption>();
+      for (final var opt : opts) {
+         if (opt != null) {
+            uniqueOpts.add(opt);
+         }
+      }
+      return save(rootPath, uniqueOpts);
    }
 
    /**

diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@ check for new dependency/plugin updates using:
   <parent>
     <groupId>com.vegardit.maven</groupId>
     <artifactId>vegardit-maven-parent</artifactId>
-    <version>3.1.7</version>
+    <version>6.1.0</version>
   </parent>
 
   <groupId>com.vegardit.no-npe</groupId>
@@ -118,6 +118,10 @@ check for new dependency/plugin updates using:
         </file>
       </activation>
 
+      <properties>
+        <failIfNoTests>false</failIfNoTests>
+      </properties>
+
       <build>
         <resources>
           <resource>