[java-parent-project-v3] branch master updated: INFRA-145 - Update parent project URL from Subversion to Git.
Tom Zeller
tzeller at dragonacea.biz
Fri Nov 20 19:25:45 EST 2015
This is an automated email from the git hooks/post-receive script.
tzeller pushed a commit to branch master
in repository java-parent-project-v3.
The following commit(s) were added to refs/heads/master by this push:
new ce3f99d INFRA-145 - Update parent project URL from Subversion to Git.
ce3f99d is described below
commit ce3f99d5f17bdd52ce86a0bd5ddf44839c29abf0
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Fri Nov 20 18:27:01 2015 -0600
INFRA-145 - Update parent project URL from Subversion to Git.
Update create-project-monolithic-local.sh, other scripts remain to be
updated.
---
bin/create-project-common.sh | 32 ++++++++++++++++----------------
bin/create-project-monolithic-local.sh | 3 +--
2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/bin/create-project-common.sh b/bin/create-project-common.sh
index 5e781c7..451e92e 100755
--- a/bin/create-project-common.sh
+++ b/bin/create-project-common.sh
@@ -16,7 +16,7 @@ declare -r FIND=${FIND:-"/usr/bin/find"}
# URL to the java parent project from which everything inherits
# we start with the trunk version and then use the *-lock-version commands before
# we do a release in order to lock this project to a specific parent project version
-declare -r PARENT_PROJ_URL="https://svn.shibboleth.net/java-parent-projects/java-parent-project-v3/trunk"
+declare -r PARENT_PROJ_URL="https://git.shibboleth.net/view/?p=java-parent-project-v3.git;a=blob_plain;hb=HEAD;f="
# Checks that the given return value was 0 and, if not, prints a given error messages and exits
#
@@ -75,7 +75,7 @@ function create_src {
$MKDIR -p "$1/src/main/java" "$1/src/main/resources" "$1/src/test/java" "$1/src/test/resources"
check_retval $? "Unable to create Maven src directories"
- download_file "$PARENT_PROJ_URL/resources/logback/logback-test.xml" "$1/src/test/resources/logback-test.xml"
+ download_file $PARENT_PROJ_URL"resources/logback/logback-test.xml" "$1/src/test/resources/logback-test.xml"
check_retval $? "Unable to download logback-text.xml into src/test/resources"
}
@@ -86,7 +86,7 @@ function create_assembly {
$MKDIR -p "$1/src/main/assembly"
check_retval $? "Unable to create src/main/assembly directory"
- download_file "$PARENT_PROJ_URL/resources/maven/assembly-bin.xml" "$1/src/main/assembly/bin.xml"
+ download_file $PARENT_PROJ_URL"resources/maven/assembly-bin.xml" "$1/src/main/assembly/bin.xml"
}
# Creates the doc directory with an empty RELEASE-NOTES.txt file and Apache 2 license
@@ -96,7 +96,7 @@ function create_doc {
$MKDIR "$1/doc"
check_retval $? "Unable to create doc directory"
- download_file "$PARENT_PROJ_URL/resources/doc/LICENSE.txt" "$1/doc/LICENSE.txt"
+ download_file $PARENT_PROJ_URL"resources/doc/LICENSE.txt" "$1/doc/LICENSE.txt"
$TOUCH "$1/doc/RELEASE-NOTES.txt"
check_retval $? "Unable to create empty RELEASE-NOTES.txt"
@@ -107,9 +107,9 @@ function create_doc {
# $1 directory in which the Eclipse settings files will be placed
# $2 project/artifact ID
function create_eclipse_files {
- download_file "$PARENT_PROJ_URL/resources/eclipse/checkstyle" "$1/.checkstyle"
- download_file "$PARENT_PROJ_URL/resources/eclipse/classpath" "$1/.classpath"
- download_file "$PARENT_PROJ_URL/resources/eclipse/project.tmpl" "$1/.project"
+ download_file $PARENT_PROJ_URL"resources/eclipse/checkstyle" "$1/.checkstyle"
+ download_file $PARENT_PROJ_URL"resources/eclipse/classpath" "$1/.classpath"
+ download_file $PARENT_PROJ_URL"resources/eclipse/project.tmpl" "$1/.project"
expand_macro $1/.project "MVN_ARTF_ID" $2
}
@@ -127,10 +127,10 @@ function create_eclipse_settings_files {
#
# $1 directory in which the Eclipse settings files will be placed
function download_eclipse_settings_files {
- download_file "$PARENT_PROJ_URL/resources/eclipse/settings/org.eclipse.core.resources.prefs" "$1/.settings/org.eclipse.core.resources.prefs"
- download_file "$PARENT_PROJ_URL/resources/eclipse/settings/org.eclipse.jdt.core.prefs" "$1/.settings/org.eclipse.jdt.core.prefs"
- download_file "$PARENT_PROJ_URL/resources/eclipse/settings/org.eclipse.jdt.ui.prefs" "$1/.settings/org.eclipse.jdt.ui.prefs"
- download_file "$PARENT_PROJ_URL/resources/eclipse/settings/org.eclipse.m2e.core.prefs" "$1/.settings/org.eclipse.m2e.core.prefs"
+ download_file $PARENT_PROJ_URL"resources/eclipse/settings/org.eclipse.core.resources.prefs" "$1/.settings/org.eclipse.core.resources.prefs"
+ download_file $PARENT_PROJ_URL"resources/eclipse/settings/org.eclipse.jdt.core.prefs" "$1/.settings/org.eclipse.jdt.core.prefs"
+ download_file $PARENT_PROJ_URL"resources/eclipse/settings/org.eclipse.jdt.ui.prefs" "$1/.settings/org.eclipse.jdt.ui.prefs"
+ download_file $PARENT_PROJ_URL"resources/eclipse/settings/org.eclipse.m2e.core.prefs" "$1/.settings/org.eclipse.m2e.core.prefs"
}
# Creates Eclipse defaults in multi-module parent
@@ -143,10 +143,10 @@ function create_eclipse_defaults {
check_retval $? "Unable to create project directory $1/resources/eclipse"
$MKDIR $1/resources/eclipse/settings
check_retval $? "Unable to create project directory $1/resources/eclipse/settings"
- download_file "$PARENT_PROJ_URL/resources/eclipse/settings/org.eclipse.core.resources.prefs" "$1/resources/eclipse/settings/org.eclipse.core.resources.prefs"
- download_file "$PARENT_PROJ_URL/resources/eclipse/settings/org.eclipse.jdt.core.prefs" "$1/resources/eclipse/settings/org.eclipse.jdt.core.prefs"
- download_file "$PARENT_PROJ_URL/resources/eclipse/settings/org.eclipse.jdt.ui.prefs" "$1/resources/eclipse/settings/org.eclipse.jdt.ui.prefs"
- download_file "$PARENT_PROJ_URL/resources/eclipse/settings/org.eclipse.m2e.core.prefs" "$1/resources/eclipse/settings/org.eclipse.m2e.core.prefs"
+ download_file $PARENT_PROJ_URL"resources/eclipse/settings/org.eclipse.core.resources.prefs" "$1/resources/eclipse/settings/org.eclipse.core.resources.prefs"
+ download_file $PARENT_PROJ_URL"resources/eclipse/settings/org.eclipse.jdt.core.prefs" "$1/resources/eclipse/settings/org.eclipse.jdt.core.prefs"
+ download_file $PARENT_PROJ_URL"resources/eclipse/settings/org.eclipse.jdt.ui.prefs" "$1/resources/eclipse/settings/org.eclipse.jdt.ui.prefs"
+ download_file $PARENT_PROJ_URL"resources/eclipse/settings/org.eclipse.m2e.core.prefs" "$1/resources/eclipse/settings/org.eclipse.m2e.core.prefs"
}
# Fetchs the template POM file and populates its macros.
@@ -168,7 +168,7 @@ function create_site_file {
$MKDIR -p "$1/src/site"
check_retval $? "Unable to create site source directory"
- download_file "$PARENT_PROJ_URL/resources/maven/site.xml" "$1/src/site/site.xml"
+ download_file $PARENT_PROJ_URL"resources/maven/site.xml" "$1/src/site/site.xml"
check_retval $? "Unable to download site descriptor"
}
diff --git a/bin/create-project-monolithic-local.sh b/bin/create-project-monolithic-local.sh
index c555f46..2177d44 100755
--- a/bin/create-project-monolithic-local.sh
+++ b/bin/create-project-monolithic-local.sh
@@ -6,7 +6,6 @@ LOCATION=${LOCATION%/*}
source $LOCATION/create-project-common.sh
$ECHO "This script will create a new monolithic project locally."
-$ECHO "Eclipse .settings are downloaded directly instead of via svn:externals."
$ECHO ""
read -p "Please enter the project name, e.g. java-artifactId: " PROJ_NAME
@@ -38,7 +37,7 @@ create_assembly $PROJ_DIR
create_doc $PROJ_DIR
create_eclipse_files $PROJ_DIR $MVN_ARTF_ID
create_eclipse_settings_files $PROJ_DIR
-create_pom_file $PROJ_DIR $PARENT_PROJ_URL/resources/maven/pom.xml.tmpl $MVN_GROUP_ID $MVN_ARTF_ID
+create_pom_file $PROJ_DIR $PARENT_PROJ_URL"resources/maven/pom.xml.tmpl" $MVN_GROUP_ID $MVN_ARTF_ID
create_site_file $PROJ_DIR
$ECHO "Creation of project $MVN_ARTF_ID completed and is located at $PROJ_DIR"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list