Skip to content

Commit 4ab9e50

Browse files
authored
Adding checklists (#5)
* added features * fixes for deployment to maven central * update readme * adding additional options to vulnerability elements * adding checklists to assessments * update ignore * cleanup * Release2.4 (#3) * added features * fixes for deployment to maven central * update readme * Release 2.5 (#4) * added features * fixes for deployment to maven central * update readme * Rebased * fixes for deployment to maven central * Release 2.5 (#4) * added features * fixes for deployment to maven central * update readme * Release 2.5 (#4) * added features * fixes for deployment to maven central * update readme
1 parent 9ce713b commit 4ab9e50

File tree

9 files changed

+210
-195
lines changed

9 files changed

+210
-195
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@
22
.DS_Store
33

44
target/
5-

pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.factionsecurity</groupId>
66
<artifactId>faction-extender</artifactId>
7-
<version>2.5</version>
7+
<version>2.7</version>
88
<packaging>jar</packaging>
99
<name>Faction Extender API</name>
1010
<description>API to interfaces for building extensions for Faction.</description>
@@ -30,7 +30,7 @@
3030
scm:git:https://github.com/factionsecurity/FactionExtender.git</connection>
3131
<developerConnection>
3232
scm:git:https://github.com/factionsecurity/FactionExtender.git</developerConnection>
33-
<tag>2.2</tag>
33+
<tag>2.6</tag>
3434
</scm>
3535
<properties>
3636
<aws.java.sdk.version>2.18.16</aws.java.sdk.version>
@@ -124,6 +124,12 @@
124124
</plugins>
125125
</build>
126126
<dependencies>
127+
<dependency>
128+
<groupId>org.projectlombok</groupId>
129+
<artifactId>lombok</artifactId>
130+
<version>1.18.36</version>
131+
<scope>provided</scope>
132+
</dependency>
127133
<dependency>
128134
<groupId>org.junit.jupiter</groupId>
129135
<artifactId>junit-jupiter-api</artifactId>

pom.xml.releaseBackup

Lines changed: 75 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
3-
<groupId>FactionSecurity</groupId>
3+
<groupId>com.factionsecurity</groupId>
44
<artifactId>faction-extender</artifactId>
5-
<version>2.3-SNAPSHOT</version>
5+
<version>2.6-SNAPSHOT</version>
66
<packaging>jar</packaging>
77
<name>Faction Extender API</name>
88
<description>API to interfaces for building extensions for Faction.</description>
@@ -14,29 +14,92 @@
1414
<distribution>repo</distribution>
1515
</license>
1616
</licenses>
17+
<developers>
18+
<developer>
19+
<name>Josh Summitt</name>
20+
<email>develop@factionsecurity.com</email>
21+
<organization>Faction Security</organization>
22+
<organizationUrl>https://www.factionsecurity.com</organizationUrl>
23+
</developer>
24+
</developers>
1725
<scm>
1826
<url>https://github.com/factionsecurity/FactionExtender.git</url>
19-
<connection>scm:git:https://github.com/factionsecurity/FactionExtender.git</connection>
27+
<connection>
28+
scm:git:https://github.com/factionsecurity/FactionExtender.git</connection>
2029
<developerConnection>
2130
scm:git:https://github.com/factionsecurity/FactionExtender.git</developerConnection>
22-
<tag>2.2</tag>
31+
<tag>2.6</tag>
2332
</scm>
2433
<properties>
2534
<aws.java.sdk.version>2.18.16</aws.java.sdk.version>
2635
<project.scm.id>github</project.scm.id>
2736
<github.global.server>github</github.global.server>
2837
</properties>
29-
<distributionManagement>
30-
<repository>
31-
<id>github</id>
32-
<name>Faction Extender</name>
33-
<url>https://maven.pkg.github.com/factionsecurity/FactionExtender</url>
34-
</repository>
35-
</distributionManagement>
3638
<build>
3739
<sourceDirectory>src/main/java</sourceDirectory>
38-
<testSourceDirectory>src/test/java</testSourceDirectory>
40+
<testSourceDirectory>src/test/java</testSourceDirectory>
3941
<plugins>
42+
<plugin>
43+
<groupId>org.apache.maven.plugins</groupId>
44+
<artifactId>maven-source-plugin</artifactId>
45+
<version>3.3.0</version>
46+
<executions>
47+
<execution>
48+
<id>attach-sources</id>
49+
<goals>
50+
<goal>jar-no-fork</goal>
51+
</goals>
52+
</execution>
53+
</executions>
54+
</plugin>
55+
<plugin>
56+
<groupId>org.apache.maven.plugins</groupId>
57+
<artifactId>maven-javadoc-plugin</artifactId>
58+
<executions>
59+
<execution>
60+
<id>attach-javadocs</id>
61+
<goals>
62+
<goal>jar</goal>
63+
</goals>
64+
</execution>
65+
</executions>
66+
</plugin>
67+
<plugin>
68+
<groupId>net.ju-n.maven.plugins</groupId>
69+
<artifactId>checksum-maven-plugin</artifactId>
70+
<version>1.2</version>
71+
<executions>
72+
<execution>
73+
<goals>
74+
<goal>artifacts</goal>
75+
</goals>
76+
</execution>
77+
</executions>
78+
</plugin>
79+
<plugin>
80+
<groupId>org.apache.maven.plugins</groupId>
81+
<artifactId>maven-gpg-plugin</artifactId>
82+
<version>3.1.0</version>
83+
<executions>
84+
<execution>
85+
<id>sign-artifacts</id>
86+
<phase>verify</phase>
87+
<goals>
88+
<goal>sign</goal>
89+
</goals>
90+
</execution>
91+
</executions>
92+
</plugin>
93+
<plugin>
94+
<groupId>org.sonatype.central</groupId>
95+
<artifactId>central-publishing-maven-plugin</artifactId>
96+
<version>0.3.0</version>
97+
<extensions>true</extensions>
98+
<configuration>
99+
<publishingServerId>sonatype</publishingServerId>
100+
<tokenAuth>true</tokenAuth>
101+
</configuration>
102+
</plugin>
40103
<plugin>
41104
<groupId>org.apache.maven.plugins</groupId>
42105
<artifactId>maven-release-plugin</artifactId>

release.properties

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
#release configuration
2-
#Sun Jan 14 16:44:12 CST 2024
3-
completedPhase=end-release
2+
#Fri Dec 20 14:11:30 CST 2024
3+
completedPhase=generate-release-poms
44
exec.additionalArguments=-Dmaven.javadoc.skip\=true -Dmaven.test.skipTests\=true -Dmaven.test.skip\=true -P github
55
exec.snapshotReleasePluginAllowed=false
66
preparationGoals=clean verify
7-
project.dev.FactionSecurity\:faction-extender=2.4-SNAPSHOT
8-
project.rel.FactionSecurity\:faction-extender=2.3
9-
project.scm.FactionSecurity\:faction-extender.connection=scm\:git\:https\://github.com/factionsecurity/FactionExtender.git
10-
project.scm.FactionSecurity\:faction-extender.developerConnection=scm\:git\:https\://github.com/factionsecurity/FactionExtender.git
11-
project.scm.FactionSecurity\:faction-extender.id=github
12-
project.scm.FactionSecurity\:faction-extender.tag=2.2
13-
project.scm.FactionSecurity\:faction-extender.url=https\://github.com/factionsecurity/FactionExtender.git
7+
project.dev.com.factionsecurity\:faction-extender=2.7-SNAPSHOT
8+
project.rel.com.factionsecurity\:faction-extender=2.6
9+
project.scm.com.factionsecurity\:faction-extender.connection=scm\:git\:https\://github.com/factionsecurity/FactionExtender.git
10+
project.scm.com.factionsecurity\:faction-extender.developerConnection=scm\:git\:https\://github.com/factionsecurity/FactionExtender.git
11+
project.scm.com.factionsecurity\:faction-extender.id=github
12+
project.scm.com.factionsecurity\:faction-extender.tag=2.6
13+
project.scm.com.factionsecurity\:faction-extender.url=https\://github.com/factionsecurity/FactionExtender.git
1414
projectVersionPolicyId=default
1515
pushChanges=true
1616
remoteTagging=true
1717
scm.commentPrefix=[maven-release-plugin]
1818
scm.id=github
19-
scm.tag=2.3
19+
scm.tag=2.6
2020
scm.tagNameFormat=@{project.version}
2121
scm.url=scm\:git\:https\://github.com/factionsecurity/FactionExtender.git
2222
scm.username=summitt

src/main/java/com/faction/elements/Assessment.java

Lines changed: 4 additions & 169 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
import com.faction.elements.User;
1010

11+
12+
import lombok.Data;
13+
1114
/**
1215
* The Assessment Class is used to store all elements of a Faction Assessment
1316
*/
@@ -34,175 +37,7 @@ public class Assessment {
3437
private String status;
3538
private Integer workflow;
3639
private List<CustomField> customFields;
37-
38-
public String getSummary() {
39-
return summary;
40-
}
41-
42-
public String getRiskAnalysis() {
43-
44-
return this.riskAnalysis;
45-
}
46-
47-
public String getName() {
48-
return name;
49-
}
50-
51-
public void setName(String name) {
52-
this.name = name;
53-
}
54-
55-
public String getAppId() {
56-
return appId;
57-
}
58-
59-
public void setAppId(String appId) {
60-
this.appId = appId;
61-
}
62-
63-
public Date getStart() {
64-
return start;
65-
}
66-
67-
public void setStart(Date start) {
68-
this.start = start;
69-
}
70-
71-
public Date getEnd() {
72-
return end;
73-
}
74-
75-
public void setEnd(Date end) {
76-
this.end = end;
77-
}
78-
79-
public Date getCompleted() {
80-
return completed;
81-
}
82-
83-
public void setCompleted(Date completed) {
84-
this.completed = completed;
85-
}
86-
87-
public String getNotes() {
88-
return Notes;
89-
}
90-
91-
public String getDistributionList() {
92-
return DistributionList;
93-
}
94-
95-
public void setDistributionList(String distributionList) {
96-
DistributionList = distributionList;
97-
}
98-
99-
public String getAccessNotes() {
100-
return AccessNotes;
101-
}
102-
103-
public String getPr_sum_notes() {
104-
return pr_sum_notes;
105-
}
106-
107-
public String getPr_risk_notes() {
108-
return pr_risk_notes;
109-
}
110-
111-
public String getType() {
112-
return type;
113-
}
114-
115-
public byte[] getFinalReport() {
116-
return finalReport;
117-
}
118-
119-
public String getCampaign() {
120-
return campaign;
121-
}
122-
123-
public User getEngagementContact() {
124-
return engagementContact;
125-
}
126-
127-
public User getRemediationContact() {
128-
return remediationContact;
129-
}
130-
131-
public void setEngagementContact(User engagementContact) {
132-
this.engagementContact = engagementContact;
133-
}
134-
135-
public void setRemediationContact(User remediationContact) {
136-
this.remediationContact = remediationContact;
137-
}
138-
139-
public List<User> getAssessors() {
140-
return assessors;
141-
}
142-
143-
public void setAssessors(List<User> assessors) {
144-
this.assessors = assessors;
145-
}
146-
147-
public String getStatus() {
148-
return status;
149-
}
150-
151-
public Integer getWorkflow() {
152-
return workflow;
153-
}
154-
155-
public void setSummary(String summary) {
156-
this.summary = summary;
157-
}
158-
159-
public void setRiskAnalysis(String riskAnalysis) {
160-
this.riskAnalysis = riskAnalysis;
161-
}
162-
163-
public void setNotes(String notes) {
164-
Notes = notes;
165-
}
166-
167-
public void setAccessNotes(String accessNotes) {
168-
AccessNotes = accessNotes;
169-
}
170-
171-
public void setType(String type) {
172-
this.type = type;
173-
}
174-
175-
public void setFinalReport(byte[] finalReport) {
176-
this.finalReport = finalReport;
177-
}
178-
179-
public void setCampaign(String campaign) {
180-
this.campaign = campaign;
181-
}
182-
183-
public void setPr_sum_notes(String pr_sum_notes) {
184-
this.pr_sum_notes = pr_sum_notes;
185-
}
186-
187-
public void setPr_risk_notes(String pr_risk_notes) {
188-
this.pr_risk_notes = pr_risk_notes;
189-
}
190-
191-
public void setStatus(String status) {
192-
this.status = status;
193-
}
194-
195-
public void setWorkflow(Integer workflow) {
196-
this.workflow = workflow;
197-
}
198-
199-
public void setCustomFields(List<CustomField> fields) {
200-
this.customFields = fields;
201-
}
202-
203-
public List<CustomField> getCustomFields() {
204-
return this.customFields;
205-
}
40+
private List<CheckList> checklists;
20641

20742

20843
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.faction.elements;
2+
3+
import java.util.List;
4+
5+
import lombok.Data;
6+
7+
@Data
8+
public class CheckList {
9+
private String name;
10+
private List<CheckListItem> checkListItems;
11+
12+
}

0 commit comments

Comments
 (0)