Skip to content

Commit c05d867

Browse files
committed
Updates to build process
1 parent 3b4b6f4 commit c05d867

File tree

2 files changed

+30
-28
lines changed

2 files changed

+30
-28
lines changed

README.md

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ This Fortify SSC parser plugin allows for importing scan results from OWASP Depe
66

77
* **Downloads**:
88
_Beta versions may be unstable or non-functional. The `*-licenseReport.zip` and `*-dependencySources.zip` files are for informational purposes only and do not need to be downloaded._
9-
* **Release versions**: https://bintray.com/package/files/fortify-ps/binaries/fortify-ssc-parser-owasp-dependency-check-release?order=desc&sort=fileLastModified&basePath=&tab=files
10-
* **Beta versions**: https://bintray.com/package/files/fortify-ps/binaries/fortify-ssc-parser-owasp-dependency-check-beta?order=desc&sort=fileLastModified&basePath=&tab=files
11-
* **Sample input files**: [src/test/resources](src/test/resources)
9+
* **Release versions**: https://bintray.com/package/files/fortify-ps/binaries/fortify-ssc-parser-owasp-dependency-check-release?order=desc&sort=fileLastModified&basePath=&tab=files
10+
* **Beta versions**: https://bintray.com/package/files/fortify-ps/binaries/fortify-ssc-parser-owasp-dependency-check-beta?order=desc&sort=fileLastModified&basePath=&tab=files
11+
* **Sample input files**: [src/test/resources](src/test/resources)
1212
* **Automated builds**: https://travis-ci.com/fortify-ps/fortify-ssc-parser-owasp-dependency-check
1313
* **OWASP Dependency Check website**: https://owasp.org/www-project-dependency-check/
1414

@@ -21,23 +21,23 @@ about how to install and use SSC parser plugins, please see the Fortify SSC docu
2121
### Plugin Install & Upgrade
2222

2323
* Obtain the plugin binary jar file
24-
* Either download from Bintray (see [Related Links](#related-links))
25-
* Or by building yourself (see [Information for plugin developers](#information-for-plugin-developers))
24+
* Either download from Bintray (see [Related Links](#related-links))
25+
* Or by building yourself (see [Information for plugin developers](#information-for-plugin-developers))
2626
* If you already have another version of the plugin installed, first uninstall the plugin by following the steps in [Plugin Uninstall](#plugin-uninstall)
2727
* In Fortify Software Security Center:
28-
* Navigate to Administration->Plugins->Parsers
29-
* Click the `NEW` button
30-
* Accept the warning
31-
* Upload the plugin jar file
32-
* Enable the plugin by clicking the `ENABLE` button
28+
* Navigate to Administration->Plugins->Parsers
29+
* Click the `NEW` button
30+
* Accept the warning
31+
* Upload the plugin jar file
32+
* Enable the plugin by clicking the `ENABLE` button
3333

3434
### Plugin Uninstall
3535

3636
* In Fortify Software Security Center:
37-
* Navigate to Administration->Plugins->Parsers
38-
* Select the parser plugin that you want to uninstall
39-
* Click the `DISABLE` button
40-
* Click the `REMOVE` button
37+
* Navigate to Administration->Plugins->Parsers
38+
* Select the parser plugin that you want to uninstall
39+
* Click the `DISABLE` button
40+
* Click the `REMOVE` button
4141

4242
### Obtain results
4343

@@ -60,11 +60,11 @@ SSC clients (FortifyClient, Maven plugin, ...):
6060
* Generate a scan.info file containing a single line as follows:
6161
`engineType=OWASP_DEPCHECK`
6262
* Generate a zip file containing the following:
63-
* The scan.info file generated in the previous step
64-
* The JSON file containing scan results
63+
* The scan.info file generated in the previous step
64+
* The JSON file containing scan results
6565
* Upload the zip file generated in the previous step to SSC
66-
* Using any SSC client, for example FortifyClient
67-
* Similar to how you would upload an FPR file
66+
* Using any SSC client, for example FortifyClient
67+
* Similar to how you would upload an FPR file
6868

6969

7070

@@ -95,13 +95,13 @@ the main project directory.
9595

9696
* `./gradlew tasks --all`: List all available tasks
9797
* Build: (plugin binary will be stored in `build/libs`)
98-
* `./gradlew clean build`: Clean and build the project
99-
* `./gradlew build`: Build the project without cleaning
100-
* `./gradlew dist`: Build distribution zip
98+
* `./gradlew clean build`: Clean and build the project
99+
* `./gradlew build`: Build the project without cleaning
100+
* `./gradlew dist`: Build distribution zip
101101
* Version management:
102-
* `./gradlew printProjectVersion`: Print the current version
103-
* `./gradlew startSnapshotBranch -PnextVersion=2.0`: Start a new snapshot branch for an upcoming `2.0` version
104-
* `./gradlew releaseSnapshot`: Merge the changes from the current branch to the master branch, and create release tag
102+
* `./gradlew printProjectVersion`: Print the current version
103+
* `./gradlew startSnapshotBranch -PnextVersion=2.0`: Start a new snapshot branch for an upcoming `2.0` version
104+
* `./gradlew releaseSnapshot`: Merge the changes from the current branch to the master branch, and create release tag
105105
* `./fortify-scan.sh`: Run a Fortify scan; requires Fortify SCA to be installed
106106

107107
Note that the version management tasks operate only on the local repository; you will need to manually
@@ -114,8 +114,8 @@ The various version-related Gradle tasks assume the following versioning methodo
114114
* The `master` branch is only used for creating tagged release versions
115115
* A branch named `<version>-SNAPSHOT` contains the current snapshot state for the upcoming release
116116
* Optionally, other branches can be used to develop individual features, perform bug fixes, ...
117-
* However, note that the Gradle build may be unable to identify a correct version number for the project
118-
* As such, only builds from tagged versions or from a `<version>-SNAPSHOT` branch should be published to a Maven repository
117+
* However, note that the Gradle build may be unable to identify a correct version number for the project
118+
* As such, only builds from tagged versions or from a `<version>-SNAPSHOT` branch should be published to a Maven repository
119119

120120
### Automated Builds & publishing
121121

build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ plugins {
33
id "com.jfrog.bintray" version "1.8.4"
44
id 'org.ajoberstar.grgit' version "4.0.0"
55
id 'com.github.jk1.dependency-license-report' version '1.12'
6+
id "org.kordamp.gradle.markdown" version "2.0.0"
67
}
78

89
group 'com.fortify.ssc.parser.owasp.dependencycheck'
@@ -29,6 +30,7 @@ ext {
2930
apply from: "${gradleHelpersLocation}/ssc-parser-plugin-helper.gradle"
3031
apply from: "${gradleHelpersLocation}/dependency-sources-licenses-helper.gradle"
3132
apply from: "${gradleHelpersLocation}/bintray-binaries-helper.gradle"
33+
apply from: "${gradleHelpersLocation}/readme2html.gradle"
3234

3335
apply plugin: 'java'
3436
sourceCompatibility = 1.8
@@ -43,18 +45,18 @@ dependencies {
4345
}
4446

4547
task dist(type: Zip) {
46-
dependsOn 'build'
48+
dependsOn 'build', 'readme2html'
4749
archiveFileName = "${rootProject.name}-${project.version}.zip"
4850
destinationDirectory = file("$buildDir/dist")
4951
from("${libsDir}") {
5052
include "${rootProject.name}-${project.version}.jar"
5153
}
54+
from "${buildDir}/html"
5255
from("${projectDir}/src/test/resources") {
5356
into 'sampleData'
5457
}
5558
from("${projectDir}") {
5659
include "LICENSE.TXT"
57-
include "README.md"
5860
}
5961
}
6062

0 commit comments

Comments
 (0)