Skip to content

Commit 96aedf9

Browse files
lukaszlenartlukaszlenart
committed
[maven-release-plugin] prepare release STRUTS_6_0_0_RC1
1 parent 96f3df2 commit 96aedf9

File tree

37 files changed

+47
-43
lines changed

37 files changed

+47
-43
lines changed

‎apps/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-parent</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929
<artifactId>struts2-apps</artifactId>
3030
<packaging>pom</packaging>

‎apps/rest-showcase/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-apps</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-rest-showcase</artifactId>
3131
<packaging>war</packaging>
32-
<version>2.6-SNAPSHOT</version>
32+
<version>6.0.0-RC1</version>
3333
<name>Struts 2 Rest Showcase Webapp</name>
3434
<description>Struts 2 Rest Showcase Example</description>
3535

‎apps/showcase/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-apps</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-showcase</artifactId>

‎assembly/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-parent</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-assembly</artifactId>

‎bom/pom.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</parent>
3030

3131
<artifactId>struts2-bom</artifactId>
32-
<version>2.6-SNAPSHOT</version>
32+
<version>6.0.0-RC1</version>
3333
<packaging>pom</packaging>
3434

3535
<name>Struts 2 Bill of Materials</name>
@@ -44,7 +44,7 @@
4444
</licenses>
4545

4646
<properties>
47-
<struts-version.version>2.6-SNAPSHOT</struts-version.version>
47+
<struts-version.version>6.0.0-RC1</struts-version.version>
4848
<maven.site.skip>true</maven.site.skip>
4949
<maven.site.deploy.skip>true</maven.site.deploy.skip>
5050
</properties>
@@ -173,4 +173,8 @@
173173
</dependency>
174174
</dependencies>
175175
</dependencyManagement>
176+
177+
<scm>
178+
<tag>STRUTS_6_0_0_RC1</tag>
179+
</scm>
176180
</project>

‎bundles/admin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-osgi-bundles</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-osgi-admin-bundle</artifactId>

‎bundles/demo/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-osgi-bundles</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-osgi-demo-bundle</artifactId>

‎bundles/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-parent</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-osgi-bundles</artifactId>

‎core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-parent</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929
<artifactId>struts2-core</artifactId>
3030
<packaging>jar</packaging>

‎plugins/async/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-async-plugin</artifactId>

‎plugins/bean-validation/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929
<modelVersion>4.0.0</modelVersion>
3030

‎plugins/cdi/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>org.apache.struts</groupId>
2727
<artifactId>struts2-plugins</artifactId>
28-
<version>2.6-SNAPSHOT</version>
28+
<version>6.0.0-RC1</version>
2929
</parent>
3030

3131
<artifactId>struts2-cdi-plugin</artifactId>

‎plugins/config-browser/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-config-browser-plugin</artifactId>

‎plugins/convention/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-convention-plugin</artifactId>

‎plugins/dwr/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-dwr-plugin</artifactId>

‎plugins/embeddedjsp/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-embeddedjsp-plugin</artifactId>

‎plugins/gxp/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-gxp-plugin</artifactId>

‎plugins/jasperreports/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-jasperreports-plugin</artifactId>

‎plugins/javatemplates/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>org.apache.struts</groupId>
2727
<artifactId>struts2-plugins</artifactId>
28-
<version>2.6-SNAPSHOT</version>
28+
<version>6.0.0-RC1</version>
2929
</parent>
3030

3131
<artifactId>struts2-javatemplates-plugin</artifactId>

‎plugins/jfreechart/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-jfreechart-plugin</artifactId>

‎plugins/json/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-json-plugin</artifactId>

‎plugins/junit/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-junit-plugin</artifactId>

‎plugins/osgi/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-osgi-plugin</artifactId>

‎plugins/oval/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-oval-plugin</artifactId>

‎plugins/pell-multipart/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-pell-multipart-plugin</artifactId>

‎plugins/plexus/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-plexus-plugin</artifactId>

‎plugins/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-parent</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-plugins</artifactId>

‎plugins/portlet-mocks/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-portlet-mocks-plugin</artifactId>

‎plugins/portlet-tiles/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-portlet-tiles-plugin</artifactId>

‎plugins/portlet/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-portlet-plugin</artifactId>

‎plugins/rest/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-rest-plugin</artifactId>

‎plugins/sitemesh/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-sitemesh-plugin</artifactId>

‎plugins/spring/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-spring-plugin</artifactId>

‎plugins/testng/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-testng-plugin</artifactId>

‎plugins/tiles/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-tiles-plugin</artifactId>

‎plugins/velocity/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.struts</groupId>
2626
<artifactId>struts2-plugins</artifactId>
27-
<version>2.6-SNAPSHOT</version>
27+
<version>6.0.0-RC1</version>
2828
</parent>
2929

3030
<artifactId>struts2-velocity-plugin</artifactId>

‎pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<modelVersion>4.0.0</modelVersion>
3131
<artifactId>struts2-parent</artifactId>
32-
<version>2.6-SNAPSHOT</version>
32+
<version>6.0.0-RC1</version>
3333
<packaging>pom</packaging>
3434
<name>Struts 2</name>
3535
<url>http://struts.apache.org/</url>
@@ -51,7 +51,7 @@
5151
<connection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</connection>
5252
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/struts.git</developerConnection>
5353
<url>https://github.com/apache/struts/</url>
54-
<tag>HEAD</tag>
54+
<tag>STRUTS_6_0_0_RC1</tag>
5555
</scm>
5656

5757
<issueManagement>
@@ -104,7 +104,7 @@
104104

105105
<properties>
106106
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
107-
<project.build.outputTimestamp>2020-07-11T19:40:00Z</project.build.outputTimestamp>
107+
<project.build.outputTimestamp>2021-12-19T11:45:29Z</project.build.outputTimestamp>
108108
<java.version>1.8</java.version>
109109

110110
<!-- dependency versions in alphanumeric order -->
@@ -341,10 +341,10 @@
341341
<useDefaultExcludes>true</useDefaultExcludes>
342342
<addDefaultLicenseMatchers>false</addDefaultLicenseMatchers>
343343
<licenses>
344-
<licens implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"/>
344+
<licens implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20" />
345345
</licenses>
346346
<licenseFamilies>
347-
<licenseFamily implementation="org.apache.rat.license.Apache20LicenseFamily"/>
347+
<licenseFamily implementation="org.apache.rat.license.Apache20LicenseFamily" />
348348
</licenseFamilies>
349349
<includes>
350350
<include>pom.xml</include>

0 commit comments

Comments
 (0)