Merge branch 'develop'

wcm-io-devops · May 11, 2022 · 1efec8d · 1efec8d
2 parents 3a06fcc + f1f9b56
commit 1efec8d
Show file tree

Hide file tree

Showing 47 changed files with 975 additions and 355 deletions.
diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
@@ -0,0 +1,44 @@
+# Build validation
+
+name: Build
+
+on:
+  push:
+    branches-ignore:
+      - master
+      - experimental/**
+  pull_request:
+    types: [opened, synchronize, reopened]
+    branches-ignore:
+      - master
+      - experimental/**
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        java: [8, 11, 17]
+        os: [ubuntu-latest]
+        distribution: [temurin]
+        include:
+          - java: 11
+            os: windows-latest
+            distribution: temurin
+          - java: 11
+            os: macos-latest
+            distribution: temurin
+
+    steps:
+      - name: Maven Build with SonarCloud
+        uses: wcm-io-devops/github-action-maven-build-sonar@v1
+        with:
+          os: ${{ matrix.os }}
+          java-version: ${{ matrix.java }}
+          maven-executable: ./mvnw
+          sonar-run-on-os: ubuntu-latest
+          sonar-run-on-java-version: 11
+          sonar-token: ${{ secrets.SONAR_TOKEN }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/maven-deploy.yml b/.github/workflows/maven-deploy.yml
@@ -0,0 +1,43 @@
+# Deploy snapshots to Sonatpe OSS repository and deploy site to GitHub Pages
+
+name: Deploy
+
+on:
+  push:
+    branches:
+      - develop
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Configure GIT
+        run: |
+          git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
+          git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
+
+      - name: Setup JDK
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 8
+          cache: 'maven'
+
+      - name: Build, verify, deploy, generate site
+        env:
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+        run: ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean deploy site
+
+      - name: Stage and deploy site
+        run: >
+          ./mvnw -s ./.maven-settings.xml -Pcontinuous-integration -B site:stage scm-publish:publish-scm
+          -Dscmpublish.checkinComment="Maven site: ${{ github.repository }}"
+          -Dusername=${{ secrets.GH_SITE_DEPLOY_USERNAME }}
+          -Dpassword=${{ secrets.GH_SITE_DEPLOY_PAT }}
diff --git a/.github/workflows/release-from-tag.yml b/.github/workflows/release-from-tag.yml
@@ -0,0 +1,19 @@
+name: Release from Tag
+
+on:
+  push:
+    tags:
+      - '*'
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ncipollo/release-action@v1
+      with:
+        body: 'Changes: https://devops.wcm.io/conga/plugins/ansible/changes-report.html'
+        token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.travis.maven-settings.xml → .maven-settings.xml b/.travis.maven-settings.xml → .maven-settings.xml
@@ -42,32 +42,6 @@
           </snapshots>
         </repository>
 
-        <repository>
-          <id>adobe-public-releases</id>
-          <name>Adobe Public Repository</name>
-          <url>https://repo.adobe.com/nexus/content/groups/public/</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-
-        <repository>
-          <id>wcm-io-apache-intermediate-release</id>
-          <url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-
         <repository>
           <id>oss-snapshots</id>
           <url>https://oss.sonatype.org/content/repositories/snapshots</url>
@@ -111,32 +85,6 @@
           </snapshots>
         </pluginRepository>
 
-        <pluginRepository>
-          <id>adobe-public-releases</id>
-          <name>Adobe Public Repository</name>
-          <url>https://repo.adobe.com/nexus/content/groups/public/</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </pluginRepository>
-
-        <pluginRepository>
-          <id>wcm-io-apache-intermediate-release</id>
-          <url>https://wcm.io/maven/repositories/apache-intermediate-release</url>
-          <layout>default</layout>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </pluginRepository>
-
         <pluginRepository>
           <id>oss-snapshots</id>
           <url>https://oss.sonatype.org/content/repositories/snapshots</url>
@@ -173,4 +121,12 @@
     <activeProfile>default</activeProfile>
   </activeProfiles>
 
+  <servers>
+    <server>
+      <id>ossrh</id>
+      <username>${env.SONATYPE_USERNAME}</username>
+      <password>${env.SONATYPE_PASSWORD}</password>
+    </server>
+  </servers>
+
 </settings>
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,18 @@
+# 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.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
diff --git a/.travis.yml b/.travis.yml
diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/README.md b/README.md
@@ -1,20 +1,21 @@
 <img src="https://wcm.io/images/[email protected]"/> CONGA Plugin for Ansible
 ======
-[![Build Status](https://travis-ci.org/wcm-io-devops/conga-ansible-plugin.png?branch=develop)](https://travis-ci.org/wcm-io-devops/conga-ansible-plugin)
-[![Code Coverage](https://codecov.io/gh/wcm-io-devops/conga-ansible-plugin/branch/develop/graph/badge.svg)](https://codecov.io/gh/wcm-io-devops/conga-ansible-plugin)
+[![Build](https://github.com/wcm-io-devops/conga-ansible-plugin/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io-devops/conga-ansible-plugin/actions?query=workflow%3ABuild+branch%3Adevelop)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga.plugins/io.wcm.devops.conga.plugins.ansible/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.wcm.devops.conga.plugins/io.wcm.devops.conga.plugins.ansible)
+[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=wcm-io-devops_conga-ansible-plugin&metric=coverage)](https://sonarcloud.io/summary/new_code?id=wcm-io-devops_conga-ansible-plugin)
 
 Documentation: https://devops.wcm.io/conga/plugins/ansible/<br/>
 Issues: https://wcm-io.atlassian.net/projects/WDCONGA<br/>
 Wiki: https://wcm-io.atlassian.net/wiki/<br/>
-Continuous Integration: https://travis-ci.org/conga-ansible-plugin<br/>
+Continuous Integration: https://github.com/wcm-io-devops/conga-ansible-plugin/actions<br/>
 Commercial support: https://wcm.io/commercial-support.html
 
 
 ## Build from sources
 
 If you want to build from sources make sure you have configured all [Maven Repositories](https://devops.wcm.io/maven.html) in your settings.xml.
 
-See [Travis Maven settings.xml](https://github.com/conga-ansible-plugin/blob/master/.travis.maven-settings.xml) for an example with a full configuration.
+See [Maven Settings](https://github.com/wcm-io-devops/conga-ansible-plugin/blob/develop/.maven-settings.xml) for an example with a full configuration.
 
 Then you can build using
 

diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.4.0" date="2022-05-11">
+      <action type="add" dev="trichter">
+        Support retrieving Ansible vault password from ANSIBLE_VAULT_PASSWORD environment variable.
+      </action>
+    </release>
+
     <release version="1.3.2" date="2020-07-10">
       <action type="update" dev="sseifert">
         Lower log level for vault encryption handling to "trace".