Merge branch 'develop'

Author: hypery2k

Jenkinsfile

@@ -39,7 +39,7 @@ timeout(60) {
 
             stage('Deploy') {
                 if (git.isProductionBranch()) {
-                    sh "./mvnw -Prelease package source:jar gpg:sign install:install deploy:deploy"
+                    sh "GPG_TTY=\$(tty) ./mvnw -Prelease package source:jar gpg:sign install:install deploy:deploy"
                 } else {
                     sh "./mvnw deploy"
                 }

Jenkinsfile_release

@@ -29,7 +29,7 @@ timeout(20) {
 
             stage('Start Release') {
                 echo "releaseVersion: ${releaseVersion}"
-                sh "./mvnw gitflow:release -DreleaseVersion=${releaseVersion} -DdevelopmentVersion=${developmentVersion} -DskipITs=true "
+                sh "./mvnw -B gitflow:release-start gitflow:release-finish -DreleaseVersion=${releaseVersion} -DdevelopmentVersion=${developmentVersion} -DskipITs=true "
             }
         } catch (e) {
             mail subject: "${env.JOB_NAME} (${env.BUILD_NUMBER}): Error on build", to: '[email protected]', body: "Please go to ${env.BUILD_URL}."

pom.xml

@@ -4,11 +4,11 @@
 
     <groupId>net.continuous-security-tools</groupId>
     <artifactId>zap-java-integration</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
     <packaging>pom</packaging>
 
-    <name>ZAP Maven Plugin Parent</name>
-    <description>Parent project for the ZAP Maven Plugin</description>
+    <name>ZAP Java Integration</name>
+    <description>Java Integration for OWASP ZAP</description>
     <url>https://github.com/ContinuousSecurityTooling/zap-maven-plugin</url>
 
     <modules>
@@ -189,7 +189,35 @@
                     </configuration>
                 </plugin>
 
-                <!-- -->
+                <!-- Attach Javadoc and source -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>${maven-javadoc-plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <id>attach-javadocs</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>${maven-source-plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <id>attach-sources</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <!-- Snyk -->
 
                 <plugin>
                     <groupId>io.snyk</groupId>

zap-client-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.continuous-security-tools</groupId>
         <artifactId>zap-java-integration</artifactId>
-        <version>0.3.0</version>
+        <version>0.3.1</version>
         <relativePath>../</relativePath>
     </parent>
 

zap-report-parser/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.continuous-security-tools</groupId>
         <artifactId>zap-java-integration</artifactId>
-        <version>0.3.0</version>
+        <version>0.3.1</version>
         <relativePath>../</relativePath>
     </parent>
 

zap-utils/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>net.continuous-security-tools</groupId>
         <artifactId>zap-java-integration</artifactId>
-        <version>0.3.0</version>
+        <version>0.3.1</version>
         <relativePath>../</relativePath>
     </parent>