diff --git a/CHANGELOG.md b/CHANGELOG.md index 13f07931d8ca0f07b57f914721d0931526324406..68ef466bfddf72fbbe64fcdfc37dd61373f3fd00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ Upcoming version: ----------------- + - fixed problems with filenames in config (Nikolaus Krismer) - merged (Nikolaus Krismer) - re-activated Neo4J-spatial (with help from Robert Bierbauer's and his master thesis) (Nikolaus Krismer) - now creating node_densities for updated datasets (Nikolaus Krismer) diff --git a/bootstrap/prepareEnvironment.sh b/bootstrap/prepareEnvironment.sh index a55c3e6c061344371a241b72ee6bcd56b7c3da3f..c125d40daa583870923ae9125f1096a70c72456b 100755 --- a/bootstrap/prepareEnvironment.sh +++ b/bootstrap/prepareEnvironment.sh @@ -603,7 +603,7 @@ if $INSTALL_NEO4J; then echo " - enabling neo4j network access (without user)" echo "org.neo4j.server.webserver.address=0.0.0.0" >> $DEPLOY_DIR/neo4j/conf/neo4j-server.properties - sed -i "s/dbms\.security\.auth\_enabled=true/dbms\.security\.auth\_enabled=false/" $DEPLOY_DIR/neo4j/conf/neo4-server.properties + sed -i "s/dbms\.security\.auth\_enabled=true/dbms\.security\.auth\_enabled=false/" $DEPLOY_DIR/neo4j/conf/neo4j-server.properties echo " - creating systemd service" cp "$SHARED_CONF_DIR/neo4j.service" "/etc/systemd/system/neo4j.service" >> $DEPLOY_DIR/neo4j/conf/neo4j-server.properties diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e8c6bf7bb47dff6b81c2cf7a349eb7e912c9fbe2..05ef575b0cd0173fc735f2857ce4bd594ce4f6bd 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 25e6c8a2935228db37482b2b92ea7617b8b33448..1cba21a6b1f76644e62782ac200fd78df3123ff1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Sep 15 13:21:57 CEST 2015 +#Wed Oct 21 11:13:11 CEST 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip diff --git a/gradlew b/gradlew index 97fac783e1c8d8241ec7394569867ec3aca58b39..9d82f78915133e1c35a6ea51252590fb38efac2f 100755 --- a/gradlew +++ b/gradlew @@ -56,9 +56,9 @@ while [ -h "$PRG" ] ; do fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar