Skip to content
Permalink
Browse files
Merge branch 'master' into patch-1
  • Loading branch information
sebbASF committed Oct 13, 2020
2 parents c827d2c + ed73204 commit ecc99f73bb35551f0c7e8fd26ad49b06ebe6f7fd
Show file tree
Hide file tree
Showing 6 changed files with 197 additions and 8 deletions.
@@ -0,0 +1,25 @@
# 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.

version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "daily"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
@@ -0,0 +1,46 @@
# 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.

name: Java CI

on: [push, pull_request]

jobs:
build:

runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
java: [ 8, 11, 15 ]
experimental: [false]
include:
- java: 16-ea
experimental: true

steps:
- uses: actions/checkout@v2.3.3
- uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1.4.3
with:
java-version: ${{ matrix.java }}
- name: Build with Maven
run: mvn -V apache-rat:check spotbugs:check javadoc:javadoc -Ddoclint=all package --file pom.xml --no-transfer-progress
30 pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
<version>48</version>
<version>52</version>
</parent>
<artifactId>commons-build-plugin</artifactId>
<packaging>maven-plugin</packaging>
@@ -156,7 +156,22 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<!-- Version 2.2 causes an NPE with Maven 3.3.9 -->
<version>2.7</version>
<version>2.8.1</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>${commons.spotbugs.version}</version>
<dependencies>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs</artifactId>
<version>${commons.spotbugs.impl.version}</version>
</dependency>
</dependencies>
<configuration>
<!-- <excludeFilterFile>${basedir}/spotbugs-exclude-filter.xml</excludeFilterFile> -->
</configuration>
</plugin>
</plugins>
</build>
@@ -176,6 +191,15 @@
</configuration>
</plugin>

<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
<version>${commons.spotbugs.version}</version>
<configuration>
<!-- <excludeFilterFile>${basedir}/spotbugs-exclude-filter.xml</excludeFilterFile> -->
</configuration>
</plugin>

<!-- exclude surefire report -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -218,6 +242,8 @@
<commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl>
<commons.releaseManagerName>Rob Tompkins</commons.releaseManagerName>
<commons.releaseManagerKey>B6E73D84EA4FCC47166087253FAAD2CD5ECBB314</commons.releaseManagerKey>
<commons.spotbugs.version>4.1.3</commons.spotbugs.version>
<commons.spotbugs.impl.version>4.1.3</commons.spotbugs.impl.version>
</properties>
<profiles>
<profile>
@@ -25,24 +25,43 @@
</properties>

<body>
<release version="1.12" date="YYYY-MM-DD" description="Feature release">
<action dev="sebb" type="fix" issue="COMMONSSITE-137">
commons-build:all ignores commons.release.hash settings
</action>
<action dev="ggregory" type="update">
Enable GitHub build.
</action>
<action dev="ggregory" type="update" due-to="Gary Gregory, Dependabot">
Update spotbugs-maven-plugin from 4.0.0 to 4.1.3, #7, #12, #15.
</action>
<action dev="ggregory" type="update" due-to="Dependabot">
Update actions/checkout from v2.3.1 to v2.3.3 #9, #14.
</action>
<action dev="ggregory" type="update" due-to="Dependabot">
Update versions-maven-plugin from 2.7 to 2.8.1 #10.
</action>
<action dev="ggregory" type="update" due-to="Dependabot">
Update actions/setup-java from v1.4.0 to v1.4.2 #13.
</action>
</release>
<release version="1.11" date="2019-08-30" description="Feature release">
<action dev="ggregory" type="update">
versions-maven-plugin 2.5 -> 2.7.
Update versions-maven-plugin 2.5 -> 2.7.
</action>
<action dev="ggregory" type="update">
maven-plugin-plugin 3.5.2 -> 3.6.0.
Update maven-plugin-plugin 3.5.2 -> 3.6.0.
</action>
<action dev="ggregory" type="update">
maven-plugin-tools-ant 3.5.2 -> 3.6.0.
Update maven-plugin-tools-ant 3.5.2 -> 3.6.0.
</action>
<action dev="ggregory" type="update">
commons.release-plugin.version 1.5 -> 1.6.
Update commons.release-plugin.version 1.5 -> 1.6.
</action>
<action dev="ggregory" type="update">
Replace http://mail-archives.apache.org with https://mail-archives.apache.org.
</action>
</release>

<release version="1.10" date="2019-02-26" description="Feature release">
<action dev="ggregory" type="update">
Use SHA512 signatures as the default in the download page.
@@ -43,7 +43,8 @@
@NAME@
===================

[![Build Status](https://travis-ci.org/apache/commons-@ID@.svg)](https://travis-ci.org/apache/commons-@ID@)
[![Travis-CI Status](https://travis-ci.org/apache/commons-@ID@.svg)](https://travis-ci.org/apache/commons-@ID@)
[![GitHub Actions Status](https://github.com/apache/commons-@ID@/workflows/Java%20CI/badge.svg)](https://github.com/apache/commons-@ID@/actions)
[![Coverage Status](https://coveralls.io/repos/apache/commons-@ID@/badge.svg)](https://coveralls.io/r/apache/commons-@ID@)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/@GROUPID@/@ARTIFACTCOREID@/badge.svg)](https://maven-badges.herokuapp.com/maven-central/@GROUPID@/@ARTIFACTCOREID@/)
[![Javadocs](https://javadoc.io/badge/@GROUPID@/@ARTIFACTCOREID@/@VERSION@.svg)](https://javadoc.io/doc/@GROUPID@/@ARTIFACTCOREID@/@VERSION@)
@@ -145,6 +145,15 @@
<type>java.lang.String</type>
<description>Subdirectory (instead of source/binaries.)</description>
</parameter>
<parameter>
<name>commons.release.hash</name>
<property>commons.release.hash</property>
<required>false</required>
<readonly>false</readonly>
<defaultValue>${commons.release.hash}</defaultValue>
<type>java.lang.String</type>
<description>Type of hash (lower case, e.g. sha512)</description>
</parameter>
<!-- commons.release.2.* -->
<parameter>
<name>commons.release.2.version</name>
@@ -191,6 +200,15 @@
<type>java.lang.String</type>
<description>Subdirectory (instead of source/binaries.)</description>
</parameter>
<parameter>
<name>commons.release.2.hash</name>
<property>commons.release.2.hash</property>
<required>false</required>
<readonly>false</readonly>
<defaultValue>${commons.release.2.hash}</defaultValue>
<type>java.lang.String</type>
<description>Type of hash (lower case, e.g. sha512)</description>
</parameter>
<!-- commons.release.3.* -->
<parameter>
<name>commons.release.3.version</name>
@@ -237,6 +255,15 @@
<type>java.lang.String</type>
<description>Subdirectory (instead of source/binaries.)</description>
</parameter>
<parameter>
<name>commons.release.3.hash</name>
<property>commons.release.3.hash</property>
<required>false</required>
<readonly>false</readonly>
<defaultValue>${commons.release.3.hash}</defaultValue>
<type>java.lang.String</type>
<description>Type of hash (lower case, e.g. sha512)</description>
</parameter>
<!-- commons.release.4.* -->
<parameter>
<name>commons.release.4.version</name>
@@ -283,6 +310,15 @@
<type>java.lang.String</type>
<description>Subdirectory (instead of source/binaries.)</description>
</parameter>
<parameter>
<name>commons.release.4.hash</name>
<property>commons.release.4.hash</property>
<required>false</required>
<readonly>false</readonly>
<defaultValue>${commons.release.4.hash}</defaultValue>
<type>java.lang.String</type>
<description>Type of hash (lower case, e.g. sha512)</description>
</parameter>
</parameters>
</mojo>
<mojo>
@@ -390,6 +426,15 @@
<type>java.lang.String</type>
<description>Subdirectory (instead of source/binaries.)</description>
</parameter>
<parameter>
<name>commons.release.hash</name>
<property>commons.release.hash</property>
<required>false</required>
<readonly>false</readonly>
<defaultValue>${commons.release.hash}</defaultValue>
<type>java.lang.String</type>
<description>Type of hash (lower case, e.g. sha512)</description>
</parameter>
<!-- commons.release.2.* -->
<parameter>
<name>commons.release.2.version</name>
@@ -436,6 +481,15 @@
<type>java.lang.String</type>
<description>Subdirectory (instead of source/binaries.)</description>
</parameter>
<parameter>
<name>commons.release.2.hash</name>
<property>commons.release.2.hash</property>
<required>false</required>
<readonly>false</readonly>
<defaultValue>${commons.release.2.hash}</defaultValue>
<type>java.lang.String</type>
<description>Type of hash (lower case, e.g. sha512)</description>
</parameter>
<!-- commons.release.3.* -->
<parameter>
<name>commons.release.3.version</name>
@@ -482,6 +536,15 @@
<type>java.lang.String</type>
<description>Subdirectory (instead of source/binaries.)</description>
</parameter>
<parameter>
<name>commons.release.3.hash</name>
<property>commons.release.3.hash</property>
<required>false</required>
<readonly>false</readonly>
<defaultValue>${commons.release.3.hash}</defaultValue>
<type>java.lang.String</type>
<description>Type of hash (lower case, e.g. sha512)</description>
</parameter>
<!-- commons.release.4.* -->
<parameter>
<name>commons.release.4.version</name>
@@ -528,6 +591,15 @@
<type>java.lang.String</type>
<description>Subdirectory (instead of source/binaries.)</description>
</parameter>
<parameter>
<name>commons.release.4.hash</name>
<property>commons.release.4.hash</property>
<required>false</required>
<readonly>false</readonly>
<defaultValue>${commons.release.4.hash}</defaultValue>
<type>java.lang.String</type>
<description>Type of hash (lower case, e.g. sha512)</description>
</parameter>
</parameters>
</mojo>
<mojo>

0 comments on commit ecc99f7

Please sign in to comment.