Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 23:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1458 from apache/release/struts-6-7-x

Browse Source 
Merges changes from older release branch
This commit is contained in:
Lukasz Lenart
2025-12-11 11:33:22 +01:00
committed by GitHub
parent 80225c7169 80739da117
commit 7d7060896b
43 changed files with 156 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+18
View File
@@ -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
apps/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-apps</artifactId>
<packaging>pom</packaging>
apps/rest-showcase/pom.xml
+2 -2
View File
@@ -24,12 +24,12 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-showcase</artifactId>
<packaging>war</packaging>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
<name>Struts 2 Rest Showcase Webapp</name>
<description>Struts 2 Rest Showcase Example</description>
apps/showcase/pom.xml
+2 -2
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-apps</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-showcase</artifactId>
@@ -163,7 +163,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.5.1</version>
<version>3.5.4</version>
<configuration>
<includes>
<include>it.org.apache.struts2.showcase.*Test</include>
assembly/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-assembly</artifactId>
bom/pom.xml
+4 -4
View File
@@ -25,11 +25,11 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-bom</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2 Bill of Materials</name>
@@ -44,7 +44,7 @@
</licenses>
<properties>
<struts-version.version>6.8.0</struts-version.version>
<struts-version.version>6.8.1-SNAPSHOT</struts-version.version>
<maven.site.skip>true</maven.site.skip>
<maven.site.deploy.skip>true</maven.site.deploy.skip>
</properties>
@@ -190,7 +190,7 @@
</dependencyManagement>
<scm>
<tag>STRUTS_6_8_0</tag>
<tag>STRUTS_6_7_0</tag>
<connection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</developerConnection>
<url>https://github.com/apache/struts/</url>
bundles/admin/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-admin-bundle</artifactId>
bundles/demo/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-osgi-bundles</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-demo-bundle</artifactId>
bundles/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-bundles</artifactId>
core/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-core</artifactId>
<packaging>jar</packaging>
plugins/async/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-async-plugin</artifactId>
plugins/bean-validation/pom.xml
+1 -7
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -68,12 +68,6 @@
<version>2.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
plugins/cdi/pom.xml
+1 -1
View File
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-cdi-plugin</artifactId>
plugins/config-browser/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-config-browser-plugin</artifactId>
plugins/convention/README.md
+44
View File
@@ -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.
plugins/convention/design.txt
-39
View File
@@ -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.
plugins/convention/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-convention-plugin</artifactId>
plugins/dwr/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-dwr-plugin</artifactId>
plugins/embeddedjsp/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-embeddedjsp-plugin</artifactId>
plugins/gxp/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-gxp-plugin</artifactId>
plugins/jasperreports/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-jasperreports-plugin</artifactId>
plugins/javatemplates/pom.xml
+1 -1
View File
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-javatemplates-plugin</artifactId>
plugins/jfreechart/pom.xml
+2 -2
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-jfreechart-plugin</artifactId>
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.jfree</groupId>
<artifactId>jfreechart</artifactId>
<version>1.5.5</version>
<version>1.5.6</version>
<scope>provided</scope>
<exclusions>
<exclusion>
plugins/json/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-json-plugin</artifactId>
plugins/junit/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-junit-plugin</artifactId>
plugins/osgi/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-osgi-plugin</artifactId>
plugins/oval/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-oval-plugin</artifactId>
plugins/pell-multipart/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-pell-multipart-plugin</artifactId>
plugins/plexus/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-plexus-plugin</artifactId>
plugins/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-parent</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-plugins</artifactId>
plugins/portlet-junit/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-junit-plugin</artifactId>
plugins/portlet-mocks/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-mocks-plugin</artifactId>
plugins/portlet-tiles/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-tiles-plugin</artifactId>
plugins/portlet/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-portlet-plugin</artifactId>
plugins/rest/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-rest-plugin</artifactId>
plugins/sitemesh/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-sitemesh-plugin</artifactId>
plugins/spring/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-spring-plugin</artifactId>
plugins/testng/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-testng-plugin</artifactId>
plugins/tiles/pom.xml
+2 -2
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-tiles-plugin</artifactId>
@@ -40,7 +40,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.4.1</version>
<version>3.6.2</version>
<executions>
<execution>
<phase>compile</phase>
plugins/velocity/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-velocity-plugin</artifactId>
plugins/xslt/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-plugins</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>struts2-xslt-plugin</artifactId>
pom.xml
+31 -40
View File
@@ -29,7 +29,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-parent</artifactId>
<version>6.8.0</version>
<version>6.8.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Struts 2</name>
<url>https://struts.apache.org/</url>
@@ -51,7 +51,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</developerConnection>
<url>https://github.com/apache/struts/</url>
<tag>STRUTS_6_8_0</tag>
<tag>STRUTS_6_7_0</tag>
</scm>
<issueManagement>
@@ -104,22 +104,22 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.outputTimestamp>2025-09-15T05:41:00Z</project.build.outputTimestamp>
<project.build.outputTimestamp>2025-09-15T05:46:27Z</project.build.outputTimestamp>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<!-- dependency versions in alphanumeric order -->
<asm.version>9.7.1</asm.version>
<jackson.version>2.20.0</jackson.version>
<log4j2.version>2.25.1</log4j2.version>
<asm.version>9.9</asm.version>
<jackson.version>2.20.1</jackson.version>
<log4j2.version>2.25.2</log4j2.version>
<ognl.version>3.3.5</ognl.version>
<slf4j.version>2.0.17</slf4j.version>
<spring.platformVersion>5.3.39</spring.platformVersion>
<tiles.version>3.0.8</tiles.version>
<tiles-request.version>1.0.7</tiles-request.version>
<maven-surefire-plugin.version>3.5.1</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
<hibernate-validator.version>6.2.4.Final</hibernate-validator.version>
<freemarker.version>2.3.33</freemarker.version>
<freemarker.version>2.3.34</freemarker.version>
<!-- Site generation -->
<fluido-skin.version>1.9</fluido-skin.version>
@@ -224,7 +224,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.12</version>
<version>0.8.14</version>
<executions>
<execution>
<id>prepare-agent</id>
@@ -300,7 +300,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.8.0</version>
<version>3.9.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -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>
@@ -363,7 +354,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.2</version>
<executions>
<execution>
<id>enforce</id>
@@ -390,7 +381,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.1.1</version>
<version>3.3.0</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
@@ -429,7 +420,7 @@
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-markdown</artifactId>
<version>1.12.0</version>
<version>2.0.0</version>
</dependency>
</dependencies>
</plugin>
@@ -875,7 +866,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.17.0</version>
<version>3.20.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -901,7 +892,7 @@
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>1.9.0</version>
<version>1.10.0</version>
</dependency>
<!-- Mocks for unit testing (by Spring) -->
@@ -994,7 +985,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.27.4</version>
<version>3.27.6</version>
<scope>test</scope>
</dependency>
@@ -1064,7 +1055,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.20</version>
<version>1.4.21</version>
<exclusions>
<exclusion>
<groupId>io.github.x-stream</groupId>
src/main/groovy/Jenkinsfile.gdsl
+18
View File
@@ -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())