This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-chain.git
The following commit(s) were added to refs/heads/master by this push:
new 5bcf505 Add Apache license headers and check for them in the default
build.
5bcf505 is described below
commit 5bcf505ccb10790eb8714c660b8165c0229ec10f
Author: Gary Gregory <[email protected]>
AuthorDate: Fri Mar 5 13:25:14 2021 -0500
Add Apache license headers and check for them in the default build.
- No functional code changes.
- Update parent POM.
- Add GitHub build.
- Don't duplicate groupId in POM.
- Fix Javadoc link errors.
- Some tests fail.
---
.github/dependabot.yml | 25 +++++++++++
.github/workflows/maven.yml | 50 ++++++++++++++++++++++
.../org/apache/commons/chain2/CatalogFactory.java | 2 +-
.../main/java/org/apache/commons/chain2/Chain.java | 2 +-
.../java/org/apache/commons/chain2/Context.java | 2 +-
.../assembly/{NOTICE-with-deps.txt => NOTICE.txt} | 0
dist/src/main/assembly/bin.xml | 4 +-
pom.xml | 10 ++---
test-utils/pom.xml | 16 +++++++
.../commons/chain2/testutils/TestCatalog.java | 17 ++++++++
.../commons/chain2/testutils/TestContext.java | 17 ++++++++
11 files changed, 135 insertions(+), 10 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..5b47509
--- /dev/null
+++ b/.github/dependabot.yml
@@ -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"
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 0000000..25fffeb
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,50 @@
+# 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
+ - java: 17-ea
+ experimental: true
+
+ steps:
+ - uses: actions/[email protected]
+ - uses: actions/[email protected]
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+ restore-keys: |
+ ${{ runner.os }}-maven-
+ - name: Set up JDK ${{ matrix.java }}
+ uses: actions/[email protected]
+ with:
+ java-version: ${{ matrix.java }}
+ - name: Build with Maven
+ run: mvn -V -e --file pom.xml --no-transfer-progress
+
+# For Java 11, you can be more strict:
-DadditionalJOption=-Xdoclint/package:-org.apache.commons.configuration2.plist
diff --git a/api/src/main/java/org/apache/commons/chain2/CatalogFactory.java
b/api/src/main/java/org/apache/commons/chain2/CatalogFactory.java
index b458c10..c58c6f8 100644
--- a/api/src/main/java/org/apache/commons/chain2/CatalogFactory.java
+++ b/api/src/main/java/org/apache/commons/chain2/CatalogFactory.java
@@ -78,7 +78,7 @@ public interface CatalogFactory<K, V, C extends Map<K, V>> {
/**
* <p>Return an <code>Iterator</code> over the set of named
- * {@link Catalog}s known to this {@link CatalogFactoryBase}.
+ * {@link Catalog}s known to this instance.
* If there are no known catalogs, an empty Iterator is returned.</p>
* @return An Iterator of the names of the Catalogs known by this factory.
*/
diff --git a/api/src/main/java/org/apache/commons/chain2/Chain.java
b/api/src/main/java/org/apache/commons/chain2/Chain.java
index 4ff3dd2..677e752 100644
--- a/api/src/main/java/org/apache/commons/chain2/Chain.java
+++ b/api/src/main/java/org/apache/commons/chain2/Chain.java
@@ -35,7 +35,7 @@ import java.util.Map;
*
* <p>To protect applications from evolution of this interface, specialized
* implementations of {@link Chain} should generally be created by extending
- * the provided base class {@link org.apache.commons.chain2.impl.ChainBase})
+ * the provided base class {@code org.apache.commons.chain2.impl.ChainBase})
* rather than directly implementing this interface.</p>
*
* <p>{@link Chain} implementations should be designed in a thread-safe
diff --git a/api/src/main/java/org/apache/commons/chain2/Context.java
b/api/src/main/java/org/apache/commons/chain2/Context.java
index 1f53b88..364342c 100644
--- a/api/src/main/java/org/apache/commons/chain2/Context.java
+++ b/api/src/main/java/org/apache/commons/chain2/Context.java
@@ -45,7 +45,7 @@ import java.util.Map;
*
* <p>To protect applications from evolution of this interface, specialized
* implementations of {@link Context} should generally be created by extending
- * the provided base class ({@link org.apache.commons.chain2.impl.ContextBase})
+ * the provided base class ({@code org.apache.commons.chain2.impl.ContextBase})
* rather than directly implementing this interface.</p>
*
* <p>Applications should <strong>NOT</strong> assume that
diff --git a/dist/src/main/assembly/NOTICE-with-deps.txt
b/dist/src/main/assembly/NOTICE.txt
similarity index 100%
rename from dist/src/main/assembly/NOTICE-with-deps.txt
rename to dist/src/main/assembly/NOTICE.txt
diff --git a/dist/src/main/assembly/bin.xml b/dist/src/main/assembly/bin.xml
index aa433da..76e17da 100644
--- a/dist/src/main/assembly/bin.xml
+++ b/dist/src/main/assembly/bin.xml
@@ -27,11 +27,11 @@
<!-- Use the N&L files which apply to the included dependencies -->
<files>
<file>
- <source>${basedir}/src/main/assembly/LICENSE-with-deps.txt</source>
+ <source>${basedir}/src/main/assembly/LICENSE.txt</source>
<destName>LICENSE.txt</destName>
</file>
<file>
- <source>${basedir}/src/main/assembly/NOTICE-with-deps.txt</source>
+ <source>${basedir}/src/main/assembly/NOTICE.txt</source>
<destName>NOTICE.txt</destName>
</file>
<file>
diff --git a/pom.xml b/pom.xml
index b41edaf..f3786a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,10 +23,9 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>43</version>
+ <version>52</version>
</parent>
- <groupId>org.apache.commons</groupId>
<artifactId>commons-chain-parent</artifactId>
<version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -139,12 +138,12 @@
</contributors>
<properties>
- <maven.compiler.source>1.6</maven.compiler.source>
- <maven.compiler.target>1.6</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<commons.componentid>chain2</commons.componentid>
<commons.module.name>org.apache.commons.chain2</commons.module.name>
<commons.release.version>2.0</commons.release.version>
- <commons.release.desc>(minium JDK 1.6)</commons.release.desc>
+ <commons.release.desc>(minium Java 1.8)</commons.release.desc>
<commons.rc.version>RC1</commons.rc.version>
<commons.jira.id>CHAIN</commons.jira.id>
<commons.jira.pid>12310462</commons.jira.pid>
@@ -180,6 +179,7 @@
</dependencies>
<build>
+ <defaultGoal>clean apache-rat:check package</defaultGoal>
<pluginManagement>
<plugins>
<plugin>
diff --git a/test-utils/pom.xml b/test-utils/pom.xml
index d089d5c..d3e38d7 100644
--- a/test-utils/pom.xml
+++ b/test-utils/pom.xml
@@ -1,4 +1,20 @@
<?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.
+-->
<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/xsd/maven-4.0.0.xsd";>
diff --git
a/test-utils/src/test/java/org/apache/commons/chain2/testutils/TestCatalog.java
b/test-utils/src/test/java/org/apache/commons/chain2/testutils/TestCatalog.java
index 6813577..e9e69dc 100644
---
a/test-utils/src/test/java/org/apache/commons/chain2/testutils/TestCatalog.java
+++
b/test-utils/src/test/java/org/apache/commons/chain2/testutils/TestCatalog.java
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
+
package org.apache.commons.chain2.testutils;
import java.util.HashMap;
diff --git
a/test-utils/src/test/java/org/apache/commons/chain2/testutils/TestContext.java
b/test-utils/src/test/java/org/apache/commons/chain2/testutils/TestContext.java
index 4770532..af5e533 100644
---
a/test-utils/src/test/java/org/apache/commons/chain2/testutils/TestContext.java
+++
b/test-utils/src/test/java/org/apache/commons/chain2/testutils/TestContext.java
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
+
package org.apache.commons.chain2.testutils;
import java.util.HashMap;
