diff --git a/.classpath b/.classpath index 8c11177..5519e78 100644 --- a/.classpath +++ b/.classpath @@ -16,6 +16,7 @@ + diff --git a/.project b/.project index dfa812d..737bd0e 100644 --- a/.project +++ b/.project @@ -5,6 +5,11 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder @@ -15,9 +20,17 @@ + + org.eclipse.wst.validation.validationbuilder + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 2f5cc74..cac0df4 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component new file mode 100644 index 0000000..0ebf5b4 --- /dev/null +++ b/.settings/org.eclipse.wst.common.component @@ -0,0 +1,6 @@ + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 0000000..fb95c45 --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/FactionExtender/src/META-INF/MANIFEST.MF b/FactionExtender/src/META-INF/MANIFEST.MF new file mode 100644 index 0000000..5e94951 --- /dev/null +++ b/FactionExtender/src/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + diff --git a/pom.xml.releaseBackup b/pom.xml.releaseBackup new file mode 100644 index 0000000..4036946 --- /dev/null +++ b/pom.xml.releaseBackup @@ -0,0 +1,73 @@ + + 4.0.0 + FactionSecurity + faction-extender + 2.0-SNAPSHOT + jar + Faction Extender API + API to reference when building extensions for Faction. + https://www.factionsecurity.com + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + https://github.com/factionsecurity/FactionExtender.git + scm:git:https://github.com/factionsecurity/FactionExtender.git + + scm:git:https://github.com/factionsecurity/FactionExtender.git + 1.1.0 + + + 2.18.16 + github + github + + + + github + Faction Extender + https://maven.pkg.github.com/factionsecurity/FactionExtender + + + + src + + + org.apache.maven.plugins + maven-release-plugin + 2.5.3 + + @{project.version} + + pom.xml + + + + + maven-compiler-plugin + 3.10.1 + + 8 + 8 + + + + + + + com.googlecode.json-simple + json-simple + 1.1 + + + org.codehaus.mojo + build-helper-maven-plugin + 3.2.0 + maven-plugin + + + diff --git a/release.properties b/release.properties index 871d982..a8e66b0 100644 --- a/release.properties +++ b/release.properties @@ -1,14 +1,22 @@ #release configuration -#Thu Dec 21 01:12:43 CST 2023 -completedPhase=check-poms +#Thu Dec 21 01:15:15 CST 2023 +completedPhase=end-release exec.additionalArguments=-Dmaven.javadoc.skip\=true -Dmaven.test.skipTests\=true -Dmaven.test.skip\=true -P github exec.snapshotReleasePluginAllowed=false preparationGoals=clean verify +project.dev.FactionSecurity\:faction-extender=2.1-SNAPSHOT +project.rel.FactionSecurity\:faction-extender=2.0 +project.scm.FactionSecurity\:faction-extender.connection=scm\:git\:https\://github.com/factionsecurity/FactionExtender.git +project.scm.FactionSecurity\:faction-extender.developerConnection=scm\:git\:https\://github.com/factionsecurity/FactionExtender.git +project.scm.FactionSecurity\:faction-extender.id=github +project.scm.FactionSecurity\:faction-extender.tag=1.1.0 +project.scm.FactionSecurity\:faction-extender.url=https\://github.com/factionsecurity/FactionExtender.git projectVersionPolicyId=default pushChanges=true remoteTagging=true scm.commentPrefix=[maven-release-plugin] scm.id=github +scm.tag=2.0 scm.tagNameFormat=@{project.version} scm.url=scm\:git\:https\://github.com/factionsecurity/FactionExtender.git scm.username=summitt diff --git a/src/com/faction/extender/VerificationManager.java b/src/com/faction/extender/VerificationManager.java index 4ed1249..1bdaa60 100644 --- a/src/com/faction/extender/VerificationManager.java +++ b/src/com/faction/extender/VerificationManager.java @@ -1,26 +1,21 @@ package com.faction.extender; -import java.util.Date; - -import com.faction.elements.Assessment; import com.faction.elements.User; +import com.faction.elements.Verification; import com.faction.elements.Vulnerability; -import com.faction.extender.AssessmentManager.Operation; public interface VerificationManager { static public enum Operation { Cancel, PASS,FAIL,Assigned}; /** - * @param changer This is the user that changed the vulnerability - * @param vuln This the vulnerability that is being modified - * @param notes This is the added notes when verification is passed or failed. - * @param start The start date for the verification - * @param end The expected end date of the end date for the verification - * @param operation An Enum operation. Values are Cancel, PASS, FAIL, or Assigned - * @return All Operations return the updated vulnerability. If return value is null then - * Faction will not update the internal database. + * @param changer This is the user that changed the vulnerability + * @param vulnerability This the vulnerability that is being modified + * @param verification This is the verification object + * @param operation An Enum operation. Values are Cancel, PASS, FAIL, or Assigned + * @return All Operations return the updated vulnerability. If return value is null then + * Faction will not update the internal database. */ - public Vulnerability verificationChange(User changer, Vulnerability vuln, String AssessorNotes, Date start, Date end, Operation Operation); + public Vulnerability verificationChange(User changer, Vulnerability vulnerability, Verification verification, Operation Operation); }