diff --git a/pom.xml.releaseBackup b/pom.xml.releaseBackup index a60ae2f..93448b4 100644 --- a/pom.xml.releaseBackup +++ b/pom.xml.releaseBackup @@ -2,7 +2,7 @@ 4.0.0 org.faction faction - 1.3.25-SNAPSHOT + 1.3.27-SNAPSHOT war Faction @@ -430,6 +430,13 @@ 1.18.34 provided + + com.faction.docx + faction-reporting + 1.0 + system + ${basedir}/WebContent/WEB-INF/lib/faction-reporting.jar + diff --git a/release.properties b/release.properties index dffa635..d7de4e8 100644 --- a/release.properties +++ b/release.properties @@ -1,5 +1,5 @@ #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 @@ -7,8 +7,8 @@ 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 @@ -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 diff --git a/src/com/fuse/utils/GenerateReport.java b/src/com/fuse/utils/GenerateReport.java index b868902..90ef131 100644 --- a/src/com/fuse/utils/GenerateReport.java +++ b/src/com/fuse/utils/GenerateReport.java @@ -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();