Skip to content

Commit

Permalink
allowing additional report options
Browse files Browse the repository at this point in the history
  • Loading branch information
summitt committed Oct 18, 2024
1 parent 3645710 commit 5ec1fda
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
9 changes: 8 additions & 1 deletion pom.xml.releaseBackup
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.faction</groupId>
<artifactId>faction</artifactId>
<version>1.3.25-SNAPSHOT</version>
<version>1.3.27-SNAPSHOT</version>
<packaging>war</packaging>
<name>Faction</name>
<scm>
Expand Down Expand Up @@ -430,6 +430,13 @@
<version>1.18.34</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.faction.docx</groupId>
<artifactId>faction-reporting</artifactId>
<version>1.0</version>
<scope>system</scope>
<systemPath>${basedir}/WebContent/WEB-INF/lib/faction-reporting.jar</systemPath>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
Expand Down
8 changes: 4 additions & 4 deletions release.properties
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#release configuration
#Tue Oct 08 01:02:07 CDT 2024
#Mon Oct 14 08:40:10 CDT 2024
completedPhase=end-release
exec.activateProfiles=github
exec.additionalArguments=-Dmaven.javadoc.skip\=true -Dmaven.test.skipTests\=true -Dmaven.test.skip\=true
exec.pomFileName=pom.xml
exec.snapshotReleasePluginAllowed=false
pinExternals=false
preparationGoals=clean verify
project.dev.org.faction\:faction=1.3.26-SNAPSHOT
project.rel.org.faction\:faction=1.3.25
project.dev.org.faction\:faction=1.3.28-SNAPSHOT
project.rel.org.faction\:faction=1.3.27
project.scm.org.faction\:faction.connection=scm\:git\:https\://github.com/factionsecurity/faction.git
project.scm.org.faction\:faction.developerConnection=scm\:git\:https\://github.com/factionsecurity/faction.git
project.scm.org.faction\:faction.tag=1.3.14
Expand All @@ -24,7 +24,7 @@ scm.developmentCommitComment=@{prefix} prepare for next development iteration
scm.id=faction-web
scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel}
scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel}
scm.tag=1.3.25
scm.tag=1.3.27
scm.tagNameFormat=@{project.version}
scm.url=scm\:git\:https\://github.com/factionsecurity/faction.git
scm.username=summitt
2 changes: 1 addition & 1 deletion src/com/fuse/utils/GenerateReport.java
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ public byte[] testDocxPage(EntityManager em, Long teamId, Long typeId, boolean r

byte[] finalReport = (baos.toByteArray());

return FinalizeReport.finalizeReport(finalReport);
return FinalizeReport.finalizeReport(finalReport, "pdf");

} catch (Exception ex) {
ex.printStackTrace();
Expand Down

0 comments on commit 5ec1fda

Please sign in to comment.