This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch release/struts-6-7-x
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/release/struts-6-7-x by this
push:
new 5d648a62b Bump org.apache.rat:apache-rat-plugin from 0.15 to 0.17
(#1436)
5d648a62b is described below
commit 5d648a62bf1e0ef460c2ca6d1e0caf59f3721e7b
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Sun Dec 7 09:33:05 2025 +0100
Bump org.apache.rat:apache-rat-plugin from 0.15 to 0.17 (#1436)
* Bump org.apache.rat:apache-rat-plugin from 0.15 to 0.17
Bumps org.apache.rat:apache-rat-plugin from 0.15 to 0.17.
---
updated-dependencies:
- dependency-name: org.apache.rat:apache-rat-plugin
dependency-version: '0.17'
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
* Updates exclusions
* Cleans up files with missing header
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lukasz Lenart <[email protected]>
---
Jenkinsfile | 18 ++++++++++++++++
plugins/convention/README.md | 44 ++++++++++++++++++++++++++++++++++++++++
plugins/convention/design.txt | 39 -----------------------------------
pom.xml | 37 +++++++++++++--------------------
src/main/groovy/Jenkinsfile.gdsl | 18 ++++++++++++++++
5 files changed, 94 insertions(+), 62 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d35283582..6c8efef0e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,4 +1,22 @@
#!groovy
+/*
+ * 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.
+ */
pipeline {
agent none
diff --git a/plugins/convention/README.md b/plugins/convention/README.md
index b9a6a7c19..68aee4c80 100644
--- a/plugins/convention/README.md
+++ b/plugins/convention/README.md
@@ -4,3 +4,47 @@ You will find more details in
[documentation](https://struts.apache.org/plugins/
## Installation
Just drop this plugin JAR into `WEB-INF/lib` folder or add it as a Maven
dependency.
+
+## Design
+
+### Action with no annotations (all the default handlings)
+
+Action name is class name.
+
+Action package is based on the either any Namespace annotations on the class
or Java package the
+action class is defined in or the Java package name and the root Java package,
which is determined
+based on the package locators or the action package list. In either case, a
root package is
+identified and the namespace is the packages below the root up to and
including the package that
+contains the action class.
+
+Action method is execute in all cases.
+
+Results are built first from the Result annotations at the class level. Next,
they are built from
+the resources available in the web application and in the classpath based on
the result location,
+namespace of the action and action name (not anything to do with the code
element names). Results
+are found for common result codes including, success, error, input, failure,
etc. If a specific
+result doesn't exist using the result code then just the action namespace and
action name are used to
+locate results. If there are still no results found, than a redirect is added
back to the index
+action for the namespace, if one exists.
+
+### Action with Action(s) annotations
+
+If the annotation is located on any method other than execute, than the action
configuration built
+from the annotation is in addition to the action configuration built using the
default. Unless there
+is an annotation that contains no value, in which case, the method that
annotation is defined for
+becomes the default action method. If the annotation is defined on the execute
method, regardless of
+the value of the annotation, no default configuration is built for the class.
+
+If multiple annotations have no value, an error should occur.
+If multiple annotations have the same value, an error should occur.
+
+Action name is taken from the annotation value. If the value is empty, the
default action name
+is used.
+
+Action package is taken from the annotation value. If the annotation value
doesn't start with a slash
+character, the default action namespace is used.
+
+Action method is always the method that the annotation is defined on.
+Results are built first from the array of Results on the Action annotation.
Next, they are built
+from the class level Result annotations. Lastly, all default results are
created. All Results already
+created during this process should not be overridden later in the process.
diff --git a/plugins/convention/design.txt b/plugins/convention/design.txt
deleted file mode 100644
index 397956e45..000000000
--- a/plugins/convention/design.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-Design
-
-Action with no annotations (all the default handlings)
---------------------------
-
-Action name is class name.
-Action package is based on the either any Namespace annotations on the class
or Java package the
- action class is defined in or the Java package name and the root Java
package, which is determined
- based on the package locators or the action package list. In either case, a
root package is
- identified and the namespace is the packages below the root up to and
including the package that
- contains the action class.
-Action method is execute in all cases.
-Results are built first from the Result annotations at the class level. Next,
they are built from
- the resources available in the web application and in the classpath based on
the result location,
- namespace of the action and action name (not anything to do with the code
element names). Results
- are found for common result codes including, success, error, input, failure,
etc. If a specific
- result doesn't exist using the result code then just the action namespace and
action name are used to
- locate results. If there are still no results found, than a redirect is added
back to the index
- action for the namespace, if one exists.
-
-Action with Action(s) annotations
----------------------------------
-
-If the annotation is located on any method other than execute, than the action
configuration built
- from the annotation is in addition to the action configuration built using
the default. Unless there
- is an annotation that contains no value, in which case, the method that
annotation is defined for
- becomes the default action method. If the annotation is defined on the
execute method, regardless of
- the value of the annotation, no default configuration is built for the class.
-If multiple annotations have no value, an error should occur.
-If multiple annotations have the same value, an error should occur.
-
-Action name is taken from the annotation value. If the value is empty, the
default action name
- is used.
-Action package is taken from the annotation value. If the annotation value
doesn't start with a slash
- character, the default action namespace is used.
-Action method is always the method that the annotation is defined on.
-Results are built first from the array of Results on the Action annotation.
Next, they are built
- from the class level Result annotations. Lastly, all default results are
created. All Results already
- created during this process should not be overridden later in the process.
diff --git a/pom.xml b/pom.xml
index c1a28418f..f6fd84a4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -310,41 +310,32 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.15</version>
+ <version>0.17</version>
<configuration>
- <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
- <useIdeaDefaultExcludes>true</useIdeaDefaultExcludes>
- <useDefaultExcludes>true</useDefaultExcludes>
-
<addDefaultLicenseMatchers>false</addDefaultLicenseMatchers>
- <licenses>
- <licens
implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20" />
- </licenses>
- <licenseFamilies>
- <licenseFamily
implementation="org.apache.rat.license.Apache20LicenseFamily" />
- </licenseFamilies>
- <includes>
- <include>pom.xml</include>
- <include>src/**</include>
- </includes>
- <excludes>
- <exclude>Jenkinsfile</exclude>
- <exclude>src/main/groovy/Jenkinsfile.gdsl</exclude>
-
<exclude>src/main/resources/org/apache/struts2/static/domTT.js</exclude>
+ <inputExcludeStds>ALL</inputExcludeStds>
+ <inputExcludes>
+ <exclude>CLAUDE.md</exclude>
+ <exclude>CODEOWNERS</exclude>
+ <exclude>SECURITY.md</exclude>
+ <exclude>**/README.md</exclude>
+ <exclude>src/main/resources/*-LICENSE.txt</exclude>
<exclude>src/site/resources/tags/**/*.html</exclude>
- <exclude>src/main/resources/*LICENSE.txt</exclude>
<exclude>src/test/resources/**/*.txt</exclude>
+
<exclude>src/main/resources/org/apache/struts2/static/domTT.js</exclude>
<exclude>src/main/webapp/**/*.css</exclude>
<exclude>src/main/webapp/**/*.map</exclude>
<exclude>src/main/webapp/**/*.js</exclude>
<exclude>src/main/webapp/**/*.svg</exclude>
<exclude>src/main/webapp/**/*.txt</exclude>
-
<exclude>src/main/resources/**/docs-urls.txt</exclude>
+
<exclude>**/src/main/resources/**/docs-urls.txt</exclude>
<exclude>src/etc/header.txt</exclude>
<exclude>src/main/resources/static/css/**/*.css</exclude>
<exclude>src/main/resources/static/js/**/*.js</exclude>
- <exclude>src/main/resources/docs.cfg</exclude>
+ <exclude>**/src/main/resources/docs.cfg</exclude>
<exclude>src/main/webapp/fonts/**/*</exclude>
- </excludes>
+ <exclude>thoughts/**/*.md</exclude>
+ <exclude>test-output/**</exclude>
+ </inputExcludes>
</configuration>
</plugin>
<plugin>
diff --git a/src/main/groovy/Jenkinsfile.gdsl b/src/main/groovy/Jenkinsfile.gdsl
index 005f7b155..210bb1e41 100644
--- a/src/main/groovy/Jenkinsfile.gdsl
+++ b/src/main/groovy/Jenkinsfile.gdsl
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
//The global script scope
def ctx = context(scope: scriptScope())
