Continued:

- generalized .gitignore
- added jcore-utils project (derived from jcoreee)
- added "git prune"

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/.gitignore b/.gitignore
index 1653e829d756e1a9d547743c494dc8559e8fe9b6..22aa21b220e8555c5c69f9a41aac85e1cdb5ec46 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,14 @@
-/nbproject/private/
-/nbproject/faces-config.NavData
-/nbproject/genfiles.properties
-/nbproject/*~
+nbproject/private/
+nbproject/faces-config.NavData
+nbproject/genfiles.properties
+nbproject/*~
 /manifest.mf
 /build/
 /dist/
 /data/*
 /*.properties
 .~lock*
-*.tmp
 .gitcommits
 
+# Local i18n strings
+local_*.properties

diff --git a/.jprojects.sh b/.jprojects.sh
index 07fd2ccc91d835748fa6e8d6332e2516164ef947..4f2740b5cd58cc9e8836bd8972bd33576da12dde 100644 (file)
--- a/.jprojects.sh
+++ b/.jprojects.sh
@@ -4,7 +4,7 @@
 THIS="jprojects-scripts"
 
 # Libraries and EJBs
-LIBRARIES="jcore jcoreee \
+LIBRARIES="jcore-utils jcore jcoreee \
        jcore-logger-lib jcore-logger-ejb \
        jcountry-core jcountry-lib \
        jphone-core jphone-lib \

diff --git a/cherry-jprojects.sh b/cherry-jprojects.sh
index 627d59d5daa7135c18eadb73c29f6cd7ec19d530..c04438e7de0c2b80a15cb98d61333e9423869fd0 100755 (executable)
--- a/cherry-jprojects.sh
+++ b/cherry-jprojects.sh
@@ -25,6 +25,7 @@ for project in ${LIST}; do
        then
                cd "${JPROJECTS_HOME}/${project}"
                echo "$0: Fetching all for project '${project}' ..."
+               git prune
                git fetch --all
        else
                echo "$0: Nothing to cherry-pick for '${project}'."