Merge branch 'main' into fix_5311

jeremylong · Jan 17, 2023 · 364e1b7 · 364e1b7
2 parents 8b3ecb0 + 4c375f1
commit 364e1b7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/core/src/main/resources/data/initialize_mssql.sql b/core/src/main/resources/data/initialize_mssql.sql
@@ -26,8 +26,8 @@ if exists (SELECT 1 FROM sysobjects WHERE name='insert_software' AND xtype='P')
     drop procedure insert_software;    
 if exists (SELECT 1 FROM sysobjects WHERE name='knownExploited' AND xtype='U')
     drop table knownExploited;
-if exists (SELECT 1 FROM sysobjects WHERE name='merge_knownexpoited' AND xtype='P')
-    drop procedure merge_knownexpoited;    
+if exists (SELECT 1 FROM sysobjects WHERE name='merge_knownexploited' AND xtype='P')
+    drop procedure merge_knownexploited;    
 
 CREATE TABLE vulnerability (id int identity(1,1) PRIMARY KEY, cve VARCHAR(20) UNIQUE,
 	description VARCHAR(8000), v2Severity VARCHAR(20), v2ExploitabilityScore DECIMAL(3,1), 
@@ -235,12 +235,12 @@ IF EXISTS(SELECT * FROM knownExploited WHERE cveID=@cveID)
     SET vendorProject=@vendorProject, product=@product, vulnerabilityName=@vulnerabilityName, 
         dateAdded=@dateAdded, shortDescription=@shortDescription, requiredAction=@requiredAction, 
         dueDate=@dueDate, notes=@notes
-    WHERE cveID=@cveID
+    WHERE cveID=@cveID;
 ELSE
     INSERT INTO knownExploited (vendorProject, product, vulnerabilityName,
         dateAdded, shortDescription, requiredAction, dueDate, notes, cveID) 
     VALUES (@vendorProject, @product, @vulnerabilityName,
-        @dateAdded, @shortDescription, @requiredAction, @dueDate, @notes, @cveID)
+        @dateAdded, @shortDescription, @requiredAction, @dueDate, @notes, @cveID);
 END;
 
 GO

diff --git a/core/src/main/resources/data/initialize_mysql.sql b/core/src/main/resources/data/initialize_mysql.sql
@@ -19,7 +19,7 @@ DROP PROCEDURE IF EXISTS dependencycheck.cleanup_orphans;
 DROP PROCEDURE IF EXISTS dependencycheck.update_vulnerability;
 DROP PROCEDURE IF EXISTS dependencycheck.insert_software;
 DROP PROCEDURE IF EXISTS dependencycheck.merge_ecosystem;
-DROP PROCEDURE IF EXISTS dependencycheck.merge_knownexpoited;
+DROP PROCEDURE IF EXISTS dependencycheck.merge_knownexploited;
 DROP TABLE IF EXISTS software;
 DROP TABLE IF EXISTS cpeEntry;
 DROP TABLE IF EXISTS `reference`;
@@ -307,7 +307,7 @@ INSERT INTO knownExploited (`cveID`, `vendorProject`, `product`, `vulnerabilityN
 END //
 DELIMITER ;
 
-GRANT EXECUTE ON PROCEDURE dependencycheck.merge_knownexpoited TO 'dcuser';
+GRANT EXECUTE ON PROCEDURE dependencycheck.merge_knownexploited TO 'dcuser';
 
 GRANT SELECT, INSERT, UPDATE, DELETE ON dependencycheck.* TO 'dcuser';
 

diff --git a/core/src/main/resources/data/initialize_oracle.sql b/core/src/main/resources/data/initialize_oracle.sql
@@ -238,7 +238,7 @@ EXCEPTION
 END;
 /
 
-GRANT EXECUTE ON merge_knownexpoited TO dcuser;
+GRANT EXECUTE ON merge_knownexploited TO dcuser;
 
 CREATE OR REPLACE PROCEDURE update_vulnerability(p_cveId IN vulnerability.cve%type,
                                       p_description IN vulnerability.description%type,

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -29,7 +29,7 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved.
     <inceptionYear>2013</inceptionYear>
     <properties>
         <!-- upgrading has caused publishing errors -->
-        <version.maven-plugin-plugin>3.7.0</version.maven-plugin-plugin>
+        <version.maven-plugin-plugin>3.7.1</version.maven-plugin-plugin>
     </properties>
     <scm>
         <connection>scm:git:https://github.com/jeremylong/DependencyCheck.git</connection>

diff --git a/pom.xml b/pom.xml
@@ -156,7 +156,7 @@ Copyright (c) 2012 - Jeremy Long
         <commons-compress.version>1.22</commons-compress.version>
         <org.apache.maven.shared.file-management.version>3.1.0</org.apache.maven.shared.file-management.version>
         <maven-plugin-testing-harness.version>3.3.0</maven-plugin-testing-harness.version>
-        <maven-plugin-annotations.version>3.7.0</maven-plugin-annotations.version>
+        <maven-plugin-annotations.version>3.7.1</maven-plugin-annotations.version>
         <maven-reporting-api.version>3.1.1</maven-reporting-api.version>    
         <org.apache.velocity.version>2.3</org.apache.velocity.version>
         <plexus-sec-dispatcher.version>1.4</plexus-sec-dispatcher.version>
@@ -818,7 +818,7 @@ Copyright (c) 2012 - Jeremy Long
                     <dependency>
                         <groupId>se.bjurr.violations</groupId>
                         <artifactId>violations-lib</artifactId>
-                        <version>1.155.8</version>
+                        <version>1.156.0</version>
                     </dependency>
                 </dependencies>
                 <configuration>