This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-build.git
The following commit(s) were added to refs/heads/master by this push:
new c16c657 Update README.md and README_SITE_STRUCTURE.md and git modules.
c16c657 is described below
commit c16c6570f514b95a49f06d41585ede9260d0a18e
Author: Georg Kallidis <[email protected]>
AuthorDate: Fri Dec 13 16:58:27 2024 +0100
Update README.md and README_SITE_STRUCTURE.md and git modules.
---
README.md | 33 ++++++++++++++++++++++++---------
README_SITE_STRUCTURE.md | 6 +++---
archetypes | 2 +-
core | 2 +-
fulcrum | 2 +-
parent | 2 +-
site | 2 +-
7 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index e51483a..06cf123 100644
--- a/README.md
+++ b/README.md
@@ -117,12 +117,17 @@ You may need to add additional profiles, e.g.
-Papache-release,java8 or add -Dgp
mvn clean site install -Papache-release
-If dependency check is skipped by default, do mvn
org.owasp:dependency-check-maven:check -Ddependency.check.skip=false
-Since Turbine Parent 8 security check is enabled by default.
+If dependency check is skipped by default, do
- mvn release:prepare -DdryRun=true -Papache-release
-Dtag=<project.artifact>-<version>-candidate
+ mvn org.owasp:dependency-check-maven:check -Ddependency.check.skip=false
-Here the tag is already set.
+Run a dry run:
+
+ mvn release:prepare -DdryRun=true -Papache-release
+
+If asked set the tag to
+
+ <project.artifact>-<version>-candidate
And finally:
@@ -135,13 +140,22 @@ As we using GIT as SCM, be sure that you execute the
steps in the *master|trunk|
Find more Information in [Turbine Release
Manual](https://cwiki.apache.org/confluence/display/TURBINE/Publishing+a+Release).
-If you have not set ssh-key or gpg authentication, the tasks may require that
you explicitely authenticate with -Dusername=<username> -Dpassword=<pw>.
-
+If you have not set ssh-key or gpg authentication, the release tasks may
require that you explicitely authenticate with
+
+ mvn release:prepare -Dusername=<username> -Dpassword=<pw>.
+
+Set it for the first task release:prepare, the plugin will save it in
release.properties.
Important: Success will be on the master build, the others are skipped.
+ mvn release:prepare -Papache-release
+
+Interactively set tag to <project.artifact>-<version>-candidate
+
- mvn release:prepare -Papache-release
-Dtag=<project.artifact>-<version>-candidate
+ Verify tag remote
+
+ git ls-remote --tags origin
3. Release Preparing
@@ -204,14 +218,15 @@ Find more Information in [Turbine Release
Manual](https://cwiki.apache.org/confl
which will delete the tag in git repo tag and revert to the pre-release state.
-Otherwise reset the commit in master in your checked out trunk/master/main
branch
+- Deprecated: Push to a previous commit is denied, that is reset the commit in
master in your checked out
+trunk/master/main branch could NOT be done.
git reflog
// find commit previous to release
git reset –hard <shacommit>
git push -f origin master
-and update master repo and delete the tag manually.
+- Delete the tag manually.
git push origin :refs/tags/<project.artifact>-<version>-candidate
diff --git a/README_SITE_STRUCTURE.md b/README_SITE_STRUCTURE.md
index a2c3b0d..fe4302c 100644
--- a/README_SITE_STRUCTURE.md
+++ b/README_SITE_STRUCTURE.md
@@ -20,11 +20,11 @@ turbine.apache.org
| /fulcrum/ | turbine-fulcrum-site.git | subdir: fulcrum | wrapper
for context path fulcrum/ |
| /fulcrum/fulcrum-intake/ | turbine-fulcrum-intake.git | subdir:
fulcrum/fulcrum-intake | Fulcrum component intake |
| /fulcrum/fulcrum-json/ | turbine-fulcrum-site.git | subdir:
fulcrum/fulcrum-json | Fulcrum component json* |
-| /fulcrum/fulcrum-<COMPONENT>/ | turbine-fulcrum-<COMPONENT>.git |
subdir: fulcrum/fulcrum-<COMPONENT> | Fulcrum component |
+| /fulcrum/fulcrum-<COMPONENT>/ |
turbine-fulcrum-<COMPONENT>.git | subdir:
fulcrum/fulcrum-<COMPONENT> | Fulcrum component |
This mechanism is possible, because once a subdir (including the root) is
published, publishing this and any nested subdir is performed as an git update,
not as a clean clone.
-TODO: Save previous versions of Fulcrums in the Turbine
/turbine/turbine->VERSION>?
+TODO: Save previous versions of Fulcrums in the Turbine
/turbine/turbine-<VERSION>?
* A multi modules component requires building the site with mvn site:stage.
@@ -58,7 +58,7 @@ to
Prepare commit and push
git add -A
- git commit "New site "
+ git commit -am "New site .."
git push
This will put the content into a new node turbine/turbine-5-1.
diff --git a/archetypes b/archetypes
index a05be1c..7115216 160000
--- a/archetypes
+++ b/archetypes
@@ -1 +1 @@
-Subproject commit a05be1cce42f9ceb50fb36cf5e3c46d298552662
+Subproject commit 7115216f364c4f263b63c23e0e6b003fed7e152a
diff --git a/core b/core
index 7bf0387..b48e92b 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 7bf0387cfc7b1ef7fbae5142f7185551fd5b82ea
+Subproject commit b48e92bfb2c0bb1b8db96fcfc78fb68362345ba4
diff --git a/fulcrum b/fulcrum
index d354982..5410aa3 160000
--- a/fulcrum
+++ b/fulcrum
@@ -1 +1 @@
-Subproject commit d3549822fccd9f75f5f4c346ff44285630d5fbd1
+Subproject commit 5410aa3449ceae99e56fbe16b832f1e75e57b1ad
diff --git a/parent b/parent
index d9a7b35..4efa2a7 160000
--- a/parent
+++ b/parent
@@ -1 +1 @@
-Subproject commit d9a7b356b157debb1aa05b04687ccffdeb12d537
+Subproject commit 4efa2a7f69c4a58fb81e203a8ae492dd991236c4
diff --git a/site b/site
index f39e87b..02d8cf8 160000
--- a/site
+++ b/site
@@ -1 +1 @@
-Subproject commit f39e87bb94e81bd0f7c528eca20de4413293f19d
+Subproject commit 02d8cf80cc8df4f55534f94003120f2ac3a460e1
