Updating to Alpine v2

Signed-off-by: Steve Springett <steve@springett.us>
DependencyTrack · Feb 24, 2022 · 10d9446 · 10d9446
1 parent 7a29ba0
commit 10d9446
Show file tree

Hide file tree

Showing 301 changed files with 605 additions and 344 deletions.
diff --git a/docs/images/dt-logo-black-text.svg b/docs/images/dt-logo-black-text.svg
diff --git a/docs/images/dt-logo-white-text.svg b/docs/images/dt-logo-white-text.svg
diff --git a/pom.xml b/pom.xml
@@ -17,14 +17,14 @@
   ~ SPDX-License-Identifier: Apache-2.0
   ~ Copyright (c) Steve Springett. All Rights Reserved.
   -->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>us.springett</groupId>
         <artifactId>alpine-parent</artifactId>
-        <version>1.10.4</version>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -120,7 +120,22 @@
         <!-- Alpine -->
         <dependency>
             <groupId>us.springett</groupId>
-            <artifactId>alpine</artifactId>
+            <artifactId>alpine-common</artifactId>
+            <version>${lib.alpine.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>us.springett</groupId>
+            <artifactId>alpine-model</artifactId>
+            <version>${lib.alpine.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>us.springett</groupId>
+            <artifactId>alpine-infra</artifactId>
+            <version>${lib.alpine.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>us.springett</groupId>
+            <artifactId>alpine-server</artifactId>
             <version>${lib.alpine.version}</version>
         </dependency>
         <!-- CVSS Calculator -->

diff --git a/src/main/java/org/dependencytrack/RequirementsVerifier.java b/src/main/java/org/dependencytrack/RequirementsVerifier.java
@@ -18,8 +18,9 @@
  */
 package org.dependencytrack;
 
-import alpine.logging.Logger;
+import alpine.common.logging.Logger;
 import org.dependencytrack.exception.RequirementsException;
+
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 

diff --git a/src/main/java/org/dependencytrack/common/HttpClientPool.java b/src/main/java/org/dependencytrack/common/HttpClientPool.java
@@ -18,9 +18,10 @@
  */
 package org.dependencytrack.common;
 
-import alpine.logging.Logger;
+import alpine.common.logging.Logger;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+
 import java.io.IOException;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;

diff --git a/src/main/java/org/dependencytrack/common/ManagedHttpClientFactory.java b/src/main/java/org/dependencytrack/common/ManagedHttpClientFactory.java
@@ -19,8 +19,8 @@
 package org.dependencytrack.common;
 
 import alpine.Config;
-import alpine.logging.Logger;
-import alpine.util.SystemUtil;
+import alpine.common.logging.Logger;
+import alpine.common.util.SystemUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpException;
 import org.apache.http.HttpHost;
@@ -52,6 +52,7 @@
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.ssl.SSLContextBuilder;
+
 import javax.net.ssl.SSLContext;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;

diff --git a/src/main/java/org/dependencytrack/event/AbstractVulnerabilityManagementUploadEvent.java b/src/main/java/org/dependencytrack/event/AbstractVulnerabilityManagementUploadEvent.java
@@ -19,6 +19,7 @@
 package org.dependencytrack.event;
 
 import alpine.event.framework.Event;
+
 import java.util.UUID;
 
 public abstract class AbstractVulnerabilityManagementUploadEvent implements Event {

diff --git a/src/main/java/org/dependencytrack/event/BomUploadEvent.java b/src/main/java/org/dependencytrack/event/BomUploadEvent.java
@@ -19,6 +19,7 @@
 package org.dependencytrack.event;
 
 import alpine.event.framework.AbstractChainableEvent;
+
 import java.io.File;
 import java.util.UUID;
 

diff --git a/src/main/java/org/dependencytrack/event/EventSubsystemInitializer.java b/src/main/java/org/dependencytrack/event/EventSubsystemInitializer.java
@@ -18,11 +18,11 @@
  */
 package org.dependencytrack.event;
 
+import alpine.common.logging.Logger;
 import alpine.event.LdapSyncEvent;
 import alpine.event.framework.EventService;
 import alpine.event.framework.SingleThreadedEventService;
-import alpine.logging.Logger;
-import alpine.tasks.LdapSyncTask;
+import alpine.server.tasks.LdapSyncTask;
 import org.dependencytrack.RequirementsVerifier;
 import org.dependencytrack.tasks.BomUploadProcessingTask;
 import org.dependencytrack.tasks.ClearComponentAnalysisCacheTask;
@@ -42,6 +42,7 @@
 import org.dependencytrack.tasks.scanners.InternalAnalysisTask;
 import org.dependencytrack.tasks.scanners.OssIndexAnalysisTask;
 import org.dependencytrack.tasks.scanners.VulnDbAnalysisTask;
+
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 

diff --git a/src/main/java/org/dependencytrack/event/InternalAnalysisEvent.java b/src/main/java/org/dependencytrack/event/InternalAnalysisEvent.java
@@ -19,6 +19,7 @@
 package org.dependencytrack.event;
 
 import org.dependencytrack.model.Component;
+
 import java.util.List;
 
 /**

diff --git a/src/main/java/org/dependencytrack/event/InternalComponentIdentificationEvent.java b/src/main/java/org/dependencytrack/event/InternalComponentIdentificationEvent.java
@@ -20,6 +20,7 @@
 
 import alpine.event.framework.Event;
 import org.dependencytrack.model.Component;
+
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/src/main/java/org/dependencytrack/event/MetricsUpdateEvent.java b/src/main/java/org/dependencytrack/event/MetricsUpdateEvent.java
@@ -21,6 +21,7 @@
 import alpine.event.framework.SingletonCapableEvent;
 import org.dependencytrack.model.Component;
 import org.dependencytrack.model.Project;
+
 import java.util.UUID;
 
 /**

diff --git a/src/main/java/org/dependencytrack/event/OssIndexAnalysisEvent.java b/src/main/java/org/dependencytrack/event/OssIndexAnalysisEvent.java
@@ -19,6 +19,7 @@
 package org.dependencytrack.event;
 
 import org.dependencytrack.model.Component;
+
 import java.util.List;
 
 /**

diff --git a/src/main/java/org/dependencytrack/event/VulnDbAnalysisEvent.java b/src/main/java/org/dependencytrack/event/VulnDbAnalysisEvent.java
@@ -19,6 +19,7 @@
 package org.dependencytrack.event;
 
 import org.dependencytrack.model.Component;
+
 import java.util.List;
 
 /**

diff --git a/src/main/java/org/dependencytrack/event/VulnerabilityAnalysisEvent.java b/src/main/java/org/dependencytrack/event/VulnerabilityAnalysisEvent.java
@@ -21,6 +21,7 @@
 import alpine.event.framework.AbstractChainableEvent;
 import org.dependencytrack.model.Component;
 import org.dependencytrack.model.Project;
+
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/src/main/java/org/dependencytrack/integrations/AbstractIntegrationPoint.java b/src/main/java/org/dependencytrack/integrations/AbstractIntegrationPoint.java
@@ -18,7 +18,7 @@
  */
 package org.dependencytrack.integrations;
 
-import alpine.logging.Logger;
+import alpine.common.logging.Logger;
 import alpine.notification.Notification;
 import alpine.notification.NotificationLevel;
 import org.dependencytrack.notification.NotificationConstants;

diff --git a/src/main/java/org/dependencytrack/integrations/FindingPackagingFormat.java b/src/main/java/org/dependencytrack/integrations/FindingPackagingFormat.java
@@ -25,6 +25,7 @@
 import org.dependencytrack.persistence.QueryManager;
 import org.dependencytrack.util.DateUtil;
 import org.json.JSONObject;
+
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;

diff --git a/src/main/java/org/dependencytrack/integrations/ProjectFindingUploader.java b/src/main/java/org/dependencytrack/integrations/ProjectFindingUploader.java
@@ -20,6 +20,7 @@
 
 import org.dependencytrack.model.Finding;
 import org.dependencytrack.model.Project;
+
 import java.io.InputStream;
 import java.util.List;
 

diff --git a/src/main/java/org/dependencytrack/integrations/defectdojo/DefectDojoClient.java b/src/main/java/org/dependencytrack/integrations/defectdojo/DefectDojoClient.java
@@ -18,15 +18,16 @@
  */
 package org.dependencytrack.integrations.defectdojo;
 
-import alpine.logging.Logger;
+import alpine.common.logging.Logger;
 import kong.unirest.HttpRequestWithBody;
 import kong.unirest.HttpResponse;
 import kong.unirest.UnirestInstance;
 import org.dependencytrack.common.UnirestFactory;
+
 import java.io.InputStream;
 import java.net.URL;
-import java.util.Date;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 
 public class DefectDojoClient {
 

diff --git a/src/main/java/org/dependencytrack/integrations/defectdojo/DefectDojoUploader.java b/src/main/java/org/dependencytrack/integrations/defectdojo/DefectDojoUploader.java
@@ -18,8 +18,7 @@
  */
 package org.dependencytrack.integrations.defectdojo;
 
-import alpine.crypto.DataEncryption;
-import alpine.logging.Logger;
+import alpine.common.logging.Logger;
 import alpine.model.ConfigProperty;
 import org.dependencytrack.integrations.AbstractIntegrationPoint;
 import org.dependencytrack.integrations.FindingPackagingFormat;
@@ -28,14 +27,13 @@
 import org.dependencytrack.model.Project;
 import org.dependencytrack.model.ProjectProperty;
 import org.json.JSONObject;
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.List;
 
-import static org.dependencytrack.model.ConfigPropertyConstants.DEFECTDOJO_ENABLED;
-import static org.dependencytrack.model.ConfigPropertyConstants.DEFECTDOJO_URL;
-import static org.dependencytrack.model.ConfigPropertyConstants.DEFECTDOJO_API_KEY;
+import static org.dependencytrack.model.ConfigPropertyConstants.*;
 
 public class DefectDojoUploader extends AbstractIntegrationPoint implements ProjectFindingUploader {
 

diff --git a/src/main/java/org/dependencytrack/integrations/fortifyssc/FortifySscClient.java b/src/main/java/org/dependencytrack/integrations/fortifyssc/FortifySscClient.java
@@ -18,13 +18,14 @@
  */
 package org.dependencytrack.integrations.fortifyssc;
 
-import alpine.logging.Logger;
+import alpine.common.logging.Logger;
 import kong.unirest.HttpRequestWithBody;
 import kong.unirest.HttpResponse;
 import kong.unirest.JsonNode;
 import kong.unirest.UnirestInstance;
 import kong.unirest.json.JSONObject;
 import org.dependencytrack.common.UnirestFactory;
+
 import java.io.InputStream;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;

diff --git a/src/main/java/org/dependencytrack/integrations/fortifyssc/FortifySscUploader.java b/src/main/java/org/dependencytrack/integrations/fortifyssc/FortifySscUploader.java
@@ -18,24 +18,23 @@
  */
 package org.dependencytrack.integrations.fortifyssc;
 
-import alpine.crypto.DataEncryption;
-import alpine.logging.Logger;
+import alpine.common.logging.Logger;
 import alpine.model.ConfigProperty;
+import alpine.security.crypto.DataEncryption;
 import org.dependencytrack.integrations.AbstractIntegrationPoint;
 import org.dependencytrack.integrations.FindingPackagingFormat;
 import org.dependencytrack.integrations.ProjectFindingUploader;
 import org.dependencytrack.model.Finding;
 import org.dependencytrack.model.Project;
 import org.dependencytrack.model.ProjectProperty;
 import org.json.JSONObject;
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.List;
 
-import static org.dependencytrack.model.ConfigPropertyConstants.FORTIFY_SSC_ENABLED;
-import static org.dependencytrack.model.ConfigPropertyConstants.FORTIFY_SSC_TOKEN;
-import static org.dependencytrack.model.ConfigPropertyConstants.FORTIFY_SSC_URL;
+import static org.dependencytrack.model.ConfigPropertyConstants.*;
 
 public class FortifySscUploader extends AbstractIntegrationPoint implements ProjectFindingUploader {
 

diff --git a/src/main/java/org/dependencytrack/integrations/kenna/KennaDataTransformer.java b/src/main/java/org/dependencytrack/integrations/kenna/KennaDataTransformer.java
@@ -29,6 +29,7 @@
 import org.dependencytrack.util.DateUtil;
 import org.json.JSONArray;
 import org.json.JSONObject;
+
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;

diff --git a/src/main/java/org/dependencytrack/integrations/kenna/KennaSecurityUploader.java b/src/main/java/org/dependencytrack/integrations/kenna/KennaSecurityUploader.java
@@ -18,9 +18,9 @@
  */
 package org.dependencytrack.integrations.kenna;
 
-import alpine.crypto.DataEncryption;
-import alpine.logging.Logger;
+import alpine.common.logging.Logger;
 import alpine.model.ConfigProperty;
+import alpine.security.crypto.DataEncryption;
 import kong.unirest.ContentType;
 import kong.unirest.HttpRequestWithBody;
 import kong.unirest.HttpResponse;
@@ -32,12 +32,11 @@
 import org.dependencytrack.integrations.PortfolioFindingUploader;
 import org.dependencytrack.model.Project;
 import org.dependencytrack.model.ProjectProperty;
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
-import static org.dependencytrack.model.ConfigPropertyConstants.KENNA_ENABLED;
-import static org.dependencytrack.model.ConfigPropertyConstants.KENNA_CONNECTOR_ID;
-import static org.dependencytrack.model.ConfigPropertyConstants.KENNA_TOKEN;
+import static org.dependencytrack.model.ConfigPropertyConstants.*;
 
 public class KennaSecurityUploader extends AbstractIntegrationPoint implements PortfolioFindingUploader {
 

diff --git a/src/main/java/org/dependencytrack/model/Analysis.java b/src/main/java/org/dependencytrack/model/Analysis.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.Extension;
 import javax.jdo.annotations.IdGeneratorStrategy;

diff --git a/src/main/java/org/dependencytrack/model/AnalysisComment.java b/src/main/java/org/dependencytrack/model/AnalysisComment.java
@@ -18,7 +18,7 @@
  */
 package org.dependencytrack.model;
 
-import alpine.json.TrimmedStringDeserializer;
+import alpine.server.json.TrimmedStringDeserializer;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;

diff --git a/src/main/java/org/dependencytrack/model/Bom.java b/src/main/java/org/dependencytrack/model/Bom.java
@@ -20,6 +20,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.PersistenceCapable;

diff --git a/src/main/java/org/dependencytrack/model/Component.java b/src/main/java/org/dependencytrack/model/Component.java
@@ -18,8 +18,8 @@
  */
 package org.dependencytrack.model;
 
-import alpine.json.TrimmedStringDeserializer;
-import alpine.validation.RegexSequence;
+import alpine.common.validation.RegexSequence;
+import alpine.server.json.TrimmedStringDeserializer;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -29,6 +29,7 @@
 import com.github.packageurl.PackageURL;
 import org.apache.commons.lang3.StringUtils;
 import org.dependencytrack.resources.v1.serializers.CustomPackageURLSerializer;
+
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.Element;
 import javax.jdo.annotations.Extension;

diff --git a/src/main/java/org/dependencytrack/model/ComponentAnalysisCache.java b/src/main/java/org/dependencytrack/model/ComponentAnalysisCache.java
@@ -21,6 +21,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import javax.jdo.annotations.Column;
 import javax.jdo.annotations.IdGeneratorStrategy;
 import javax.jdo.annotations.PersistenceCapable;