Merge pull request #321 from jboss-fuse/ENTESB-20693

[ENTESB-20693] Use only serializable objects in patch metadata
jboss-fuse · Jan 20, 2023 · 1e5a9b0 · 1e5a9b0
2 parents 46d2631 + ee2d701
commit 1e5a9b0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/...aven-plugin/src/main/java/org/jboss/fuse/mvnplugins/patch/SecureDependencyManagement.java b/...aven-plugin/src/main/java/org/jboss/fuse/mvnplugins/patch/SecureDependencyManagement.java
@@ -276,8 +276,8 @@ public void afterProjectsRead(MavenSession session) throws MavenExecutionExcepti
                         Map<String, Object> specData = new LinkedHashMap<>();
                         specData.put("groupId", spec.getGroupIdSpec());
                         specData.put("artifactId", spec.getArtifactIdSpec());
-                        specData.put("versions", spec.getVersionRange());
-                        specData.put("fix", spec.getFixVersion());
+                        specData.put("versions", spec.getVersionRangeString());
+                        specData.put("fix", spec.getFixVersionString());
                         changesData.add(specData);
                     }
                 }
@@ -292,8 +292,8 @@ public void afterProjectsRead(MavenSession session) throws MavenExecutionExcepti
                         Map<String, Object> specData = new LinkedHashMap<>();
                         specData.put("groupId", spec.getGroupIdSpec());
                         specData.put("artifactId", spec.getArtifactIdSpec());
-                        specData.put("versions", spec.getVersionRange());
-                        specData.put("fix", spec.getFixVersion());
+                        specData.put("versions", spec.getVersionRangeString());
+                        specData.put("fix", spec.getFixVersionString());
                         changesData.add(specData);
                     }
                 }

diff --git a/...aven-plugin/src/main/java/org/jboss/fuse/mvnplugins/patch/model/AffectedArtifactSpec.java b/...aven-plugin/src/main/java/org/jboss/fuse/mvnplugins/patch/model/AffectedArtifactSpec.java
@@ -33,11 +33,13 @@ public class AffectedArtifactSpec {
     private String groupIdSpec;
     private String artifactIdSpec;
     // TOCHECK: for now we're sticking to version ranges and no direct version
-    private VersionRange versionRange;
-    private Version fixVersion;
+    private transient VersionRange versionRange;
+    private String versionRangeString;
+    private transient Version fixVersion;
+    private String fixVersionString;
 
-    private Pattern groupIdSpecPattern;
-    private Pattern artifactIdSpecPattern;
+    private transient Pattern groupIdSpecPattern;
+    private transient Pattern artifactIdSpecPattern;
 
     public boolean matches(Dependency dependency) {
         String g = dependency.getGroupId();
@@ -89,16 +91,26 @@ public VersionRange getVersionRange() {
         return versionRange;
     }
 
+    public String getVersionRangeString() {
+        return versionRangeString;
+    }
+
     public void setVersionRange(VersionRange versionRange) {
         this.versionRange = versionRange;
+        this.versionRangeString = versionRange == null ? null : versionRange.toString();
     }
 
     public Version getFixVersion() {
         return fixVersion;
     }
 
+    public String getFixVersionString() {
+        return fixVersionString;
+    }
+
     public void setFixVersion(Version fixVersion) {
         this.fixVersion = fixVersion;
+        this.fixVersionString = fixVersion == null ? null : fixVersion.toString();
     }
 
     @Override