chore(build): Fix ci bui

Author: hypery2k

.travis.yml

@@ -7,5 +7,5 @@ jdk:
   - oraclejdk8
   - openjdk7
 
-install: mvn install -DskipTests=true -q && cd ..
-script: mvn verify -B -q && cd ..
+install: mvn install -DskipTests=true -q
+script: mvn verify -B -q

Jenkinsfile

@@ -0,0 +1,61 @@
+properties properties: [
+        [$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '30', numToKeepStr: '10']],
+        disableConcurrentBuilds()
+]
+
+@Library('mare-build-library')
+def git = new de.mare.ci.jenkins.Git()
+
+timeout(60) {
+    node {
+        def buildNumber = env.BUILD_NUMBER
+        def branchName = env.BRANCH_NAME
+        def workspace = env.WORKSPACE
+        def buildUrl = env.BUILD_URL
+
+        try {
+            withEnv(["JAVA_HOME=${tool 'JDK8'}", "PATH+MAVEN=${tool 'Maven3'}/bin:${env.JAVA_HOME}/bin"]) {
+
+                // PRINT ENVIRONMENT TO JOB
+                echo "workspace directory is $workspace"
+                echo "build URL is $buildUrl"
+                echo "build Number is $buildNumber"
+                echo "branch name is $branchName"
+                echo "PATH is $env.PATH"
+
+                stage('Checkout') {
+                    checkout scm
+                }
+                stage('Build') {
+                    sh "mvn package -DskipUnitTests=true"
+                }
+
+                stage('Unit-Tests') {
+                    sh "mvn test -Dmaven.test.failure.ignore"
+                }
+
+                stage('Integration-Tests') {
+                    // TODO add for OWASP ZAP version 2.7.0
+                }
+
+                stage('Deploy') {
+                    if (git.isProductionBranch()) {
+                        sh "mvn -Prelease package source:jar gpg:sign install:install deploy:deploy"
+                    } else {
+                        sh "mvn deploy"
+                    }
+
+                    stage('Sonar') {
+                        sh "mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=hypery2k-github -Dsonar.login=${env['sonarcloud.io.token']}"
+                    }
+                }
+
+                archiveArtifacts artifacts: '*/target/*.jar'
+                junit healthScaleFactor: 1.0, testResults: '*/target/surefire-reports/TEST*.xml'
+            }
+        } catch (e) {
+            mail subject: "${env.JOB_NAME} (${env.BUILD_NUMBER}): Error on build", to: '[email protected]', body: "Please go to ${env.BUILD_URL}."
+            throw e
+        }
+    }
+}

Jenkinsfile_release

@@ -0,0 +1,41 @@
+properties properties: [
+        [$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '30', numToKeepStr: '10']],
+        parameters([
+                string(defaultValue: '', description: '', name: 'releaseVersion')]
+        ),
+        disableConcurrentBuilds()
+]
+
+timeout(20) {
+    node {
+        def buildNumber = env.BUILD_NUMBER
+        def branchName = env.BRANCH_NAME
+        def workspace = env.WORKSPACE
+        def buildUrl = env.BUILD_URL
+
+        try {
+            withEnv(["JAVA_HOME=${tool 'JDK8'}", "PATH+MAVEN=${tool 'Maven3'}/bin:${env.JAVA_HOME}/bin"]) {
+
+                // PRINT ENVIRONMENT TO JOB
+                echo "workspace directory is $workspace"
+                echo "build URL is $buildUrl"
+                echo "build Number is $buildNumber"
+                echo "branch name is $branchName"
+                echo "PATH is $env.PATH"
+
+                stage('Checkout') {
+                    checkout scm
+                }
+
+                stage('Start Release') {
+                    echo "releaseVersion: ${releaseVersion}"
+                    sh "mvn gitflow:release -DreleaseVersion=${releaseVersion} -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}."
+            throw e
+        }
+    }
+}

README.md

@@ -1 +1,3 @@
-# zap-java
+# ZAP Java Integration
+
+[![Build Status](https://travis-ci.org/ContinuousSecurityTooling/zap-java.svg?branch=master)](https://travis-ci.org/ContinuousSecurityTooling/zap-java)

pom.xml

@@ -259,10 +259,11 @@
                         <releaseBranchPrefix>release/</releaseBranchPrefix>
                         <hotfixBranchPrefix>hotfix/</hotfixBranchPrefix>
                         <supportBranchPrefix>support/</supportBranchPrefix>
+                        <versionPrefix>v</versionPrefix>
                         <origin>origin</origin>
                     </gitFlowConfig>
                     <keepBranch>false</keepBranch>
-                    <pushReleases>true</pushReleases>
+                    <pushReleases>false</pushReleases>
                 </configuration>
             </plugin>
             <plugin>