This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch m02
in repository https://gitbox.apache.org/repos/asf/struts.git
commit c065da4ef2e0211cf6b5b1f154baf8852a4708f2
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Fri Apr 12 17:37:06 2024 +1000
Atlassian fork preparation
---
README.md | 34 ++++++++++++++++++++++++++++++++++
plugins/pom.xml | 50 +++++++++++++++++++++++++-------------------------
pom.xml | 32 +++++++++++++++++++-------------
3 files changed, 78 insertions(+), 38 deletions(-)
diff --git a/README.md b/README.md
index cdabef1fc..d4ad3907a 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,40 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
+# This branch is an Atlassian fork of Apache Struts
+
+# This fork/6.4 branch no longer contains Atlassian modifications and is
effectively a pre-release version of Struts 6.5.
+
+## Updating this branch fork with upstream master
+
+1. Clone this repo and checkout this branch
+2. Add upstream repo as a remote: `git remote add apache
https://github.com/apache/struts.git`
+3. Fetch the upstream repo: `git fetch --all`
+4. Merge upstream master into this branch, eg. `git merge apache/master`
+
+## Updating this branch fork for a new patch release
+
+1. Clone this repo and checkout this branch
+2. Add upstream repo as a remote: `git remote add apache
https://github.com/apache/struts.git`
+3. Fetch the upstream tags: `git fetch --tags apache`
+4. Merge latest patch version tag into this branch, eg. `git merge
STRUTS_6_4_1`
+
+## Creating a new branch fork for a new major/minor release
+
+1. Clone this repo and checkout this branch
+2. Add upstream repo as a remote: `git remote add apache
https://github.com/apache/struts.git`
+3. Fetch the upstream tags: `git fetch --tags apache`
+4. Checkout a new branch from the desired tag, eg. `git checkout -b fork/6.5
STRUTS_6_5_0`
+5. Merge previous forked branch into new branch, eg. `git merge
origin/fork/6.4`
+
+## Releasing a new version
+
+1. Ensure correct snapshot version, eg. `mvn versions:set
-DnewVersion=6.4.0-atlassian-1-SNAPSHOT`
+2. Ensure that the `scm` and `distributionManagement` sections in `pom.xml`
are consistent with previous releases
+3. Grant yourself Artifactory write permission: `atlas packages permission
grant`
+4. Commence release: `mvn -B release:clean release:prepare release:perform`
+
The Apache Struts web framework
-------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 27f729071..17884a949 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -32,34 +32,34 @@
<name>Struts 2 Plugins</name>
<modules>
- <module>async</module>
- <module>bean-validation</module>
- <module>cdi</module>
- <module>config-browser</module>
- <module>convention</module>
- <module>dwr</module>
- <module>embeddedjsp</module>
- <module>gxp</module>
- <module>jasperreports</module>
- <module>javatemplates</module>
- <module>jfreechart</module>
- <module>json</module>
+<!-- <module>async</module>-->
+<!-- <module>bean-validation</module>-->
+<!-- <module>cdi</module>-->
+<!-- <module>config-browser</module>-->
+<!-- <module>convention</module>-->
+<!-- <module>dwr</module>-->
+<!-- <module>embeddedjsp</module>-->
+<!-- <module>gxp</module>-->
+<!-- <module>jasperreports</module>-->
+<!-- <module>javatemplates</module>-->
+<!-- <module>jfreechart</module>-->
+<!-- <module>json</module>-->
<module>junit</module>
- <module>osgi</module>
- <module>oval</module>
- <module>pell-multipart</module>
- <module>plexus</module>
- <module>portlet</module>
- <module>portlet-junit</module>
- <module>portlet-mocks</module>
- <module>portlet-tiles</module>
- <module>rest</module>
- <module>sitemesh</module>
+<!-- <module>osgi</module>-->
+<!-- <module>oval</module>-->
+<!-- <module>pell-multipart</module>-->
+<!-- <module>plexus</module>-->
+<!-- <module>portlet</module>-->
+<!-- <module>portlet-junit</module>-->
+<!-- <module>portlet-mocks</module>-->
+<!-- <module>portlet-tiles</module>-->
+<!-- <module>rest</module>-->
+<!-- <module>sitemesh</module>-->
<module>spring</module>
- <module>testng</module>
- <module>tiles</module>
+<!-- <module>testng</module>-->
+<!-- <module>tiles</module>-->
<module>velocity</module>
- <module>xslt</module>
+<!-- <module>xslt</module>-->
</modules>
<dependencies>
diff --git a/pom.xml b/pom.xml
index 34490d5e3..a992167f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,10 +48,10 @@
-->
<scm>
-
<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_3_0_1</tag>
+
<connection>scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git</connection>
+
<developerConnection>scm:git:ssh://g...@stash.atlassian.com:7997/bam/struts2-atlassian.git</developerConnection>
+
<url>https://stash.atlassian.com/projects/BAM/repos/struts2-atlassian/browse</url>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
@@ -73,19 +73,22 @@
</ciManagement>
<distributionManagement>
- <site>
- <id>struts-site</id>
- <name>Apache Struts</name>
- <url>https://struts.apache.org/maven/</url>
- </site>
+<!-- <repository>-->
+<!-- <id>atlassian-restricted</id>-->
+<!--
<url>https://packages.atlassian.com/mvn/maven-restricted</url>-->
+<!-- </repository>-->
+ <repository>
+ <id>atlassian-3rdparty</id>
+ <url>https://packages.atlassian.com/mvn/maven-3rdparty</url>
+ </repository>
</distributionManagement>
<modules>
- <module>bom</module>
+<!-- <module>bom</module>-->
<module>core</module>
<module>plugins</module>
- <module>bundles</module>
- <module>apps</module>
+<!-- <module>bundles</module>-->
+<!-- <module>apps</module>-->
</modules>
<licenses>
@@ -138,7 +141,7 @@
<id>includeAssembly</id>
<activation>
<property>
- <name>!skipAssembly</name>
+ <name>includeAssembly</name>
</property>
</activation>
<modules>
@@ -382,6 +385,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.1</version>
+ <configuration>
+ <arguments>-Dmaven.test.skip -Dgpg.skip</arguments>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
