You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2023/03/09 11:05:10 UTC
[turbine-build] branch master updated: Update .gitmodules using relative path, use snapshot parent,
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 42aef66 Update .gitmodules using relative path, use snapshot parent,
42aef66 is described below
commit 42aef663d3a3788345d58f34ccd291cf3a65611c
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Thu Mar 9 11:42:45 2023 +0100
Update .gitmodules using relative path, use snapshot parent,
Add some more hints on how to handle git remote URLS into README_TECHNICAL_GITMODULES.md
---
.gitignore | 3 ++-
.gitmodules | 11 ++++++-----
Jenkinsfile | 9 ++++++---
README_TECHNICAL_GITMODULES.md | 41 ++++++++++++++++++++++++++++++++++++++---
core | 2 +-
fulcrum | 2 +-
parent | 2 +-
pom.xml | 2 +-
8 files changed, 56 insertions(+), 16 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7d613e9..46e9946 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ target/
.idea/
.settings/
.gdsl/
-*~
\ No newline at end of file
+*~
+.vscode/
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 9d7b511..2352486 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,20 +1,21 @@
[submodule "site"]
path = site
- url = https://github.com/apache/turbine-site.git
+ url = ../turbine-site.git
branch = master
[submodule "core"]
path = core
- url = https://github.com/apache/turbine-core.git
+ url = ../turbine-core.git
branch = trunk
[submodule "parent"]
path = parent
- url = https://github.com/apache/turbine-parent.git
+ url = ../turbine-parent.git
branch = master
[submodule "archetypes"]
path = archetypes
- url = https://github.com/apache/turbine-archetypes.git
+ url = ../turbine-archetypes.git
branch = master
[submodule "fulcrum"]
path = fulcrum
- url = https://github.com/apache/turbine-fulcrum-build.git
+ url = ../turbine-fulcrum-build.git
branch = master
+
diff --git a/Jenkinsfile b/Jenkinsfile
index 92e3442..4029a86 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -120,6 +120,7 @@ pipeline
sh "mvn $MAVEN_CLI_OPTS $MAVEN_GOALS"
// save as pipeline stash, thanks to https://cwiki.apache.org/confluence/display/INFRA/Multibranch+Pipeline+recipes
// https://docs.cloudbees.com/docs/admin-resources/latest/automating-with-jenkinsfile/using-multiple-agents
+ // Saves a set of files for later use on any node/workspace in the same Pipeline run. By default, stashed files are discarded at the end of a pipeline run.
stash includes: "${STAGING_DIR}/**/*", name: "${params.TURBINE_COMPONENT}-site"
}
}
@@ -130,13 +131,13 @@ pipeline
{
allOf
{
- not
+ /*not
{
expression
{
params.TEST_MODE
}
- }
+ }*/
anyOf
{
expression
@@ -183,13 +184,15 @@ pipeline
sh "git add .gitignore"
sh "git commit -m \"Added .gitignore\""
}
- // Remove the content (files) of the root folder and subdirectories and replace it with the content of the STAGING_DIR folder
+ // Remove the content (files) of the root folder and subdirectories and replace it with the content of the STAGING_DIR folder. Keep .asf-site and other hidden files.
sh """
git ls-files | grep -v "^\\." | xargs rm -f
"""
sh "cp -rf ./${STAGING_DIR}/* ."
// Commit the changes to the target branch BRANCH_NAME, groovy allows to omit env. prefix, available in multibranch pipeline.
env.COMMIT_MESSAGE = "${params.TURBINE_COMPONENT}: Updated site in ${DEPLOY_BRANCH} from ${env.CURRENT_BRANCH} (${env.LAST_SHA}) from ${params.MULTI_MODULE} from ${BUILD_URL}"
+
+ // input 'Proceed or Abort '
if ( params.TEST_MODE.toBoolean() == false)
{
echo "committing ..."
diff --git a/README_TECHNICAL_GITMODULES.md b/README_TECHNICAL_GITMODULES.md
index 495793d..2f6c670 100644
--- a/README_TECHNICAL_GITMODULES.md
+++ b/README_TECHNICAL_GITMODULES.md
@@ -8,13 +8,33 @@ Find the similar Git modules for Fulcrum Turbine Fulcrum Build on GitHub [here][
## G I T S U B M O D U L E S
-Show all changes for submodules (assuming your default branch is "master")
+
+### Checking out
+
+You could use git to checkout current trunk:
+
+ git clone https://gitbox.apache.org/repos/asf/turbine-build.git
+
+N.B. The submodules are included with a relative URL. If you are cloning with https + Github and you want later psuh you have to switsch either to ush) or the SSH-URL or fetching from gitbox (recommended).
+
+If you want later update the remote URLS you could use sync command to achieve this:
+
+ git submodule sync
+
+After cloning this repo (turbine-build) fetch the sub repos:
+
+ git submodule update --init --remote
+
+Update the submodule to master (assuming default branch is "master")
git submodule foreach "git checkout master || :"
- (core has default branch trunk):
+ Turbine-core has default branch trunk.
+
+ cd core
+ git checkout trunk
- git submodule update core
+#### More Examples
git submodule foreach "git diff" > all.diff.patch
@@ -50,7 +70,22 @@ This is a Git module hierarchy in itself, which requires to fetch it the same wa
Then you could just use the same commands like
+ git submodule foreach "git pull origin master"
+
+ git submodule foreach "git checkout master"
+
+ git submodule foreach "git pull"
+
git submodule foreach "git diff"
+
+### Other commands
+
+Use Maven commands with git submodule, e.g.
+
+ git submodule foreach "mvn versions:display-property-updates || :"
+
+ git submodule foreach "mvn versions:display-dependency-updates"
+
## License
diff --git a/core b/core
index cb830d6..7bf0387 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit cb830d642e82681e0b808cd306d25ef00ad41f6c
+Subproject commit 7bf0387cfc7b1ef7fbae5142f7185551fd5b82ea
diff --git a/fulcrum b/fulcrum
index fa433d4..d354982 160000
--- a/fulcrum
+++ b/fulcrum
@@ -1 +1 @@
-Subproject commit fa433d4593d38a531f56161f6ee3f356f0237932
+Subproject commit d3549822fccd9f75f5f4c346ff44285630d5fbd1
diff --git a/parent b/parent
index a8c7697..d9a7b35 160000
--- a/parent
+++ b/parent
@@ -1 +1 @@
-Subproject commit a8c76978492cb0f47d063db4f8dade4e4a847006
+Subproject commit d9a7b356b157debb1aa05b04687ccffdeb12d537
diff --git a/pom.xml b/pom.xml
index 031cc5f..438b297 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>11</version>
+ <version>12-SNAPSHOT</version>
</parent>
<artifactId>turbine-build</artifactId>
<packaging>pom</packaging>