diff --git a/build.gradle b/build.gradle index 0dcf6c9ed3e7aa3718d450d5a42c65f37b0c7f95..bc0b0e8ee42cf30dc271daf075fad75b85b26505 100644 --- a/build.gradle +++ b/build.gradle @@ -94,7 +94,11 @@ gradle.taskGraph.whenReady {taskGraph -> extension: artifact.extension ) }) - publishTask.repository.url repositoryPrefix + "${isRelease ? 'releases' : 'snapshots'}" + if (isRelease) { + publishTask.repository.url repositoryReleases + } else { + publishTask.repository.url repositorySnapshots + } publishTask.publication.version = project.version } project.tasks.withType(GenerateMavenPom).each { generateMavenPomTask -> @@ -340,7 +344,7 @@ war { } if (!isRelease) { - // we add a config-test.xml for SNAPSHOT releases (so that the prefix is defined) + // we add a config-test.xml for SNAPSHOT releases (so that the cfg.tablePrefix is defined) // otherwise testing and stable version would collide on testsystem from('src/test/resources') { include 'config-test.xml' diff --git a/etc/vagrant/bootstrap.sh b/etc/vagrant/bootstrap.sh index 095fb7be30bfcf4c3c1bff5f895055d3d4790de8..6ed341116b68ec24f0dea7f0e0d550fd008b1f9b 100644 --- a/etc/vagrant/bootstrap.sh +++ b/etc/vagrant/bootstrap.sh @@ -97,10 +97,12 @@ NEO4J_FILE=neo4j-community-$NEO4J_VERSION-unix.tar.gz NEO4J_SERVICE_NAME=neo4j-service NEO4J_SPATIAL_VERSION=0.12-neo4j-2.0.1 NEXUS_BASE_URL=https://server.krismer.de/nexus -NEXUS_PATH=$NEXUS_BASE_URL/content/repositories/releases -#NEXUS_RELEASE_ISOCHRONE=$NEXUS_BASE_URL/service/local/artifact/maven/content?r=public&g=it.unibz.inf.isochrone&a=isochrone&v=0.2.2&p=war -NEXUS_RELEASE_ISOCHRONE=$NEXUS_BASE_URL/service/local/artifact/maven/content?r=public&g=it.unibz.inf.isochrone&a=isochrone&v=RELEASE&p=war -NEXUS_SNAPSHOT_ISOCHRONE=$NEXUS_BASE_URL/service/local/artifact/maven/content?r=public&g=it.unibz.inf.isochrone&a=isochrone&v=LATEST&p=war +#NEXUS_PUBLIC_REPO=public +NEXUS_PUBLIC_REPO=isochrone +#NEXUS_RELEASE_ISOCHRONE=$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=it.unibz.inf.isochrone&a=isochrone&v=0.2.2&p=war +NEXUS_RELEASE_ISOCHRONE=$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=it.unibz.inf.isochrone&a=isochrone&v=RELEASE&p=war +NEXUS_RELEASE_CANIGET2=https://server.krismer.de/nexus/service/local/artifact/maven/content?r=public&g=de.krismer&a=CanIGet2&v=0.1&p=war +NEXUS_SNAPSHOT_ISOCHRONE=$NEXUS_BASE_URL/service/local/artifact/maven/content?r=$NEXUS_PUBLIC_REPO&g=it.unibz.inf.isochrone&a=isochrone&v=LATEST&p=war NEXUS_YUM_REPO=http://www.krismer.de/files/krismer.repo #OSM_BBOX_BZ="top=46.5200 left=11.3000 bottom=46.4500 right=11.3873" #OSM_BBOX_IBK="top=47.3592 left=11.3020 bottom=47.2108 right=11.4554" @@ -140,7 +142,6 @@ TABLE_PREFIX_IT=it_ TABLE_PREFIX_SF=sf_ TABLE_PREFIX_ST=st_ TEMPLATE_VERSION_PSIPROBE=2.3.3 -TEMPLATE_FILE_CANIGET2=$NEXUS_PATH/de/krismer/CanIGet2/0.1/CanIGet2-0.1.war TEMPLATE_FILE_PSIPROBE=probe-$TEMPLATE_VERSION_PSIPROBE.zip TEMPLATE_DIR_ISOCHRONE=/vagrant TOMCAT_VERSION=7.0.52 @@ -496,7 +497,7 @@ fi if $INSTALL_PROJECT_CANIGET2; then echo "Installing template project \"CanIGet2\"" - fn_download_newer $DOWNLOAD_DIR/caniget2.war $TEMPLATE_FILE_CANIGET2 + fn_download_newer $DOWNLOAD_DIR/caniget2.war $NEXUS_RELEASE_CANIGET2 cp $DOWNLOAD_DIR/caniget2.war $TOMCAT_WEBAPP_DIR unzip -o -d $TOMCAT_WEBAPP_DIR/caniget2 $TOMCAT_WEBAPP_DIR/caniget2.war > install_caniget2.log 2>&1 rm -f $TOMCAT_WEBAPP_DIR/caniget2.war >> install_caniget2.log 2>&1 diff --git a/gradle.properties b/gradle.properties index ee8235a9a6d9ac943ca43ea870fbf5253bf950da..e485124c3da72f69ce5db0949e6bee01d549ce52 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,6 +3,7 @@ cargoHostname=dbis-isochrone.uibk.ac.at cargoPassword=secretPhdPassword#2014! cargoPort=8080 cargoUsername=admin -repositoryUsername=nexus -repositoryPassword=Nexus!190685 -repositoryPrefix=https://server.krismer.de/nexus/content/repositories/ +repositoryUsername=isochrone +repositoryPassword=secretPhdPassword#2014! +repositoryReleases=http://138.232.66.78/nexus/content/repositories/isochrone-release +repositorySnapshots=http://138.232.66.78/nexus/content/repositories/isochrone-snapshot diff --git a/gradle_krismer.properties b/gradle_krismer.properties new file mode 100644 index 0000000000000000000000000000000000000000..eb2e5f9d4a591d5589648ce1b8080d9b7d432b21 --- /dev/null +++ b/gradle_krismer.properties @@ -0,0 +1,9 @@ +cargoContainer=tomcat7x +cargoHostname=dbis-isochrone.uibk.ac.at +cargoPassword=secretPhdPassword#2014! +cargoPort=8080 +cargoUsername=admin +repositoryUsername=nexus +repositoryPassword=Nexus!190685 +repositoryReleases=https://server.krismer.de/nexus/content/repositories/releases +repositorySnapshots=https://server.krismer.de/nexus/content/repositories/snapshots