Merge branch 'release/1.4.8'

jenkinsci · Feb 8, 2020 · c540cd3 · c540cd3
2 parents 6d86fd5 + bc278e5
commit c540cd3
Show file tree

Hide file tree

Showing 24 changed files with 355 additions and 133 deletions.
diff --git a/docker-build-images.sh → .bin/docker-build-images.sh b/docker-build-images.sh → .bin/docker-build-images.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-source ./docker-env.sh
+source ./.bin/docker-env.sh
 
 docker-compose create
diff --git a/docker-env.sh → .bin/docker-env.sh b/docker-env.sh → .bin/docker-env.sh
@@ -2,7 +2,7 @@
 
 export MONGO_PORT=27017
 export RC_PORT=44443
-export RC_VERSION=${RC_VERSION:-"develop"}
+export RC_VERSION=${RC_VERSION:-"0.74.3"}
 
 # Rocket
 

diff --git a/docker-run.sh → .bin/docker-run.sh b/docker-run.sh → .bin/docker-run.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source ./docker-env.sh
+source ./.bin/docker-env.sh
 
 # Starts all applications. Run 'mvn docker:build' in platform and webapp before this script to create docker images.
 
@@ -12,9 +12,10 @@ docker-compose rm -f
 
 docker-compose up -d
 
+while ! echo exit | nc localhost ${MONGO_PORT}; do sleep 30; done
+echo "MongoDB up and running"
 
-# Show logs. Hit 'Ctrl + c' to exit.
-# docker-compose logs -f
+while ! echo exit | nc localhost ${RC_PORT}; do sleep 30; done
+echo "RocketChat up and running"
 
-while ! echo exit | nc localhost ${RC_PORT}; do sleep 10; done
 sleep 30
diff --git a/docker-stop.sh → .bin/docker-stop.sh b/docker-stop.sh → .bin/docker-stop.sh
@@ -1,10 +1,9 @@
 #!/usr/bin/env bash
 
-source ./docker-env.sh
+source ./.bin/docker-env.sh
 
 # Starts all applications. Run 'mvn docker:build' in platform and webapp before this script to create docker images.
 
 # Remove existing containers
 docker-compose stop
 docker-compose rm -f
-
diff --git a/release.sh → .bin/release.sh b/release.sh → .bin/release.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 git checkout develop
+git branch -D master
 mvn gitflow:release-start && \
  conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && \
  git add CHANGELOG.md && \

diff --git a/.bin/run-docker-itest.sh b/.bin/run-docker-itest.sh
@@ -0,0 +1 @@
+./docker-build-images.sh && ./docker-run.sh
diff --git a/.factorypath b/.factorypath
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,27 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build with Maven
+        run: ./mvnw clean install -U
+
+  deploy:
+    needs: [build]
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: publish release package
+      if: github.ref == 'master'
+      env:
+        JENKINS_MAVEN_PASS: ${{ secrets.JENKINS_MAVEN_PASS }}
+      run: ./mvnw -s .github/workflows/m2.settings.xml deploy -DskipTests=true
diff --git a/.github/workflows/m2.settings.xml b/.github/workflows/m2.settings.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
+  See the NOTICE file distributed with this work for additional information regarding copyright ownership.
+  The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not
+  use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software distributed under the License is
+  distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and limitations under the License. -->
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+    <pluginGroups>
+        <pluginGroup>org.jenkins-ci.tools</pluginGroup>
+    </pluginGroups>
+
+    <servers>
+
+        <server>
+            <id>maven.jenkins-ci.org</id>
+            <username>mreinhardt</username>
+            <password>${JENKINS_MAVEN_PASS}</password>
+        </server>
+    </servers>
+
+    <mirrors>
+        <mirror>
+            <id>maven.jenkins-ci.org</id>
+            <url>https://repo.jenkins-ci.org/public/</url>
+            <mirrorOf>m.g.o-public</mirrorOf>
+        </mirror>
+    </mirrors>
+
+    <activeProfiles>
+        <activeProfile>profile-default</activeProfile>
+    </activeProfiles>
+
+    <profiles>
+
+        <profile>
+            <id>profile-default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+
+            <repositories>
+                <repository>
+                    <id>mare-maven</id>
+                    <name>Mirror Nexus Repository</name>
+                    <url>https://devtools.martinreinhardt-online.de/nexus/content/repositories/maven/</url>
+                    <releases>
+                        <enabled>true</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                </repository>
+                <repository>
+                    <id>maven.jenkins-ci.org</id>
+                    <url>https://repo.jenkins-ci.org/public/</url>
+                    <releases>
+                        <enabled>true</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                </repository>
+            </repositories>
+
+
+            <pluginRepositories>
+                <pluginRepository>
+                    <pluginRepository>
+                        <id>maven.jenkins-ci.org</id>
+                        <url>https://repo.jenkins-ci.org/public/</url>
+                    </pluginRepository>
+                    <pluginRepository>
+                        <id>central</id>
+                        <name>Maven Repository</name>
+                        <url>http://repo1.maven.org/maven2/</url>
+                        <releases>
+                            <enabled>true</enabled>
+                        </releases>
+                        <snapshots>
+                            <enabled>true</enabled>
+                        </snapshots>
+                    </pluginRepository>
+                </pluginRepositories>
+            </profile>
+        </profiles>
+
+        <!-- activeProfiles | List of profiles that are active for all builds. | <activeProfiles> <activeProfile>alwaysActiveProfile</activeProfile>
+    <activeProfile>anotherAlwaysActiveProfile</activeProfile> </activeProfiles> -->
+    </settings>
diff --git a/.travis.yml b/.travis.yml
@@ -5,44 +5,27 @@ services:
 
 language: java
 
+jdk:
+  - openjdk8
+
 env:
   matrix:
    - RC_VERSION=latest
    - RC_VERSION=develop
-   - RC_VERSION=2.0.0-rc.2
+   - RC_VERSION=2.4.7
+   - RC_VERSION=2.3.3
+   - RC_VERSION=2.2.1
+   - RC_VERSION=2.1.3
+   - RC_VERSION=2.0.0
    - RC_VERSION=1.3.2
    - RC_VERSION=1.2.1
    - RC_VERSION=1.1.3
    - RC_VERSION=1.0.3
    - RC_VERSION=0.74.3
-   - RC_VERSION=0.73.2
-   - RC_VERSION=0.72.3
-   - RC_VERSION=0.71.2
-   - RC_VERSION=0.70.4
-   - RC_VERSION=0.69.2
-   - RC_VERSION=0.68.5
-   - RC_VERSION=0.67.0
-   - RC_VERSION=0.66.3
-   - RC_VERSION=0.65.2
-   - RC_VERSION=0.64.2
-   - RC_VERSION=0.63.3
-   - RC_VERSION=0.64.1
-   - RC_VERSION=0.63.3
-   - RC_VERSION=0.62.2
-   - RC_VERSION=0.61.2
-   - RC_VERSION=0.60.2
-   - RC_VERSION=0.59.6
-   - RC_VERSION=0.58.4
-   - RC_VERSION=0.57.4
-   - RC_VERSION=0.56.0
-   - RC_VERSION=0.55.1
-   - RC_VERSION=0.54.2
-   - RC_VERSION=0.53.0
-   - RC_VERSION=0.52.0
 
 script:
   - mvn clean package --quiet
-  - ./docker-build-images.sh && ./docker-run.sh
+  - .bin/docker-build-images.sh && .bin/docker-run.sh
   - travis_retry mvn -Pdocker -Djava.awt.headless=true -Dmaven.test.redirectTestOutputToFile=true -Dcobertura.report.format=xml --fail-at-end --batch-mode cobertura:cobertura verify
 
 cache:
@@ -56,4 +39,3 @@ after_success:
 
 install:
   -
-
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# [](https://github.com/jenkinsci/rocketchatnotifier-plugin/compare/v1.4.0...v) (2019-10-31)
+# [](https://github.com/jenkinsci/rocketchatnotifier-plugin/compare/v1.4.0...v) (2020-02-08)
 
 
 ### Bug Fixes
@@ -8,19 +8,24 @@
 * **Config:** Resolve config param naming error [JENKINS-59503] ([f35f535](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/f35f535))
 * **Config:** Resolve config save error [JENKINS-59149] ([05c758f](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/05c758f))
 * **deps:** Fix enforcer failure due to credentials upgrade ([#55](https://github.com/jenkinsci/rocketchatnotifier-plugin/issues/55)) ([d39d9d1](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/d39d9d1))
+* **Error Handlung:** Add error string to response for further logging ([#100](https://github.com/jenkinsci/rocketchatnotifier-plugin/issues/100)) ([9dd4d3e](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/9dd4d3e))
 * **Jenkins URL:** use JenkinsLocationConfiguration.get() (JENKINS-59153) ([#54](https://github.com/jenkinsci/rocketchatnotifier-plugin/issues/54)) ([1ec2e45](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/1ec2e45))
-* pom.xml to reduce vulnerabilities ([42593b6](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/42593b6))
-* pom.xml to reduce vulnerabilities ([3a410e6](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/3a410e6))
 * **Logging:** Improve logging for JENKINS-59149 ([c74509b](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/c74509b))
 * **Message sent:** Improve error handling ([ec36a79](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/ec36a79))
 * **RocketChatClientCallBuilder:** fix proxy access without credentials (JENKINS-55890) ([4d27927](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/4d27927))
 * **Security:** pom.xml to reduce vulnerabilities ([#73](https://github.com/jenkinsci/rocketchatnotifier-plugin/issues/73)) ([3d886e6](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/3d886e6))
+* **Settings:** Fixes not being able to save custom message ([940eb15](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/940eb15))
+* pom.xml to reduce vulnerabilities ([42593b6](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/42593b6))
+* pom.xml to reduce vulnerabilities ([3a410e6](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/3a410e6))
 
 
 ### Features
 
 * **Authentication:** Adding support for personal token login ([4108174](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/4108174))
+* **Build:** Using GitHub Actions ([7145223](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/7145223))
 * **JCasC:** Adding old branch for JCasC compatibility ([9544fe5](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/9544fe5))
+* **JDK:** Support for Java 11 ([c0712bc](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/c0712bc))
+* **Message:** Adding color support ([2c69a63](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/2c69a63))
 * **Pipeline:** Allow to customize server while using rocketSend step ([7bea98c](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/7bea98c))
 * **Pipeline:** Allow to customize server while using rocketSend step([JENKINS-58315](https://issues.jenkins-ci.org/browse/JENKINS-58315)) ([f97d1fa](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/f97d1fa))
 * **Testing:** Adding most recent rocketchat versions ([89c5381](https://github.com/jenkinsci/rocketchatnotifier-plugin/commit/89c5381))

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,9 +1,6 @@
-#!groovy
-
-// only 20 builds
-properties([
-  disableConcurrentBuilds(),
-  buildDiscarder(logRotator(artifactNumToKeepStr: '20', numToKeepStr: '20'))
-])
-
-buildPlugin(platforms: ['linux'], jdkVersions: [7, 8], findbugs: [archive: true, unstableTotalAll: '0'], checkstyle: [run: true, archive: true])
+// Builds a module using https://github.com/jenkins-infra/pipeline-library
+def configurations = [
+        [ platform: "linux", jdk: "8", jenkins: null ],
+        //[ platform: "linux", jdk: "11", jenkins: null, javaLevel: "8" ]
+]
+buildPlugin(configurations: configurations, useAci: true)
diff --git a/Jenkinsfile_dev b/Jenkinsfile_dev
diff --git a/RELEASE.md b/RELEASE.md
@@ -10,4 +10,4 @@ mvn jgitflow:release-start && \
  git checkout develop
 ```
 
-or just run `release.sh`
+or just run `.bin/release.sh`
diff --git a/pom.xml b/pom.xml
@@ -1,15 +1,14 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>3.47</version>
+    <version>3.48</version>
   </parent>
 
   <properties>
-    <jenkins.version>2.138.1</jenkins.version>
+    <jenkins.version>2.164.3</jenkins.version>
 
     <java.level>8</java.level>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -40,7 +39,7 @@
 
   <name>RocketChat Notifier</name>
   <artifactId>rocketchatnotifier</artifactId>
-  <version>1.4.7</version>
+  <version>1.4.8</version>
   <packaging>hpi</packaging>
 
   <licenses>