Skip to content
Snippets Groups Projects
Commit b9a5013a authored by Nikolaus Krismer's avatar Nikolaus Krismer
Browse files

minor code formatting

downgrading of postgresql-jdbc driver (from 9.3-1101-jdbc41 to
9.2-1004-jdbc41) -> should increase minex speed
parent cad89a5b
No related branches found
No related tags found
No related merge requests found
......@@ -66,8 +66,8 @@ if (project.hasProperty('releaseVersion')) {
}
gradle.taskGraph.whenReady {taskGraph ->
if (!isRelease && taskGraph.hasTask(release)) {
version = version.substring(0, version.indexOf('-SNAPSHOT'))
if (!isRelease && taskGraph.hasTask(release)) {
version = version.substring(0, version.indexOf('-SNAPSHOT'))
}
if (version.endsWith('-SNAPSHOT')) {
......@@ -92,8 +92,8 @@ repositories {
mavenCentral()
maven { url 'http://maven.geo-solutions.it' }
flatDir {
dirs 'lib'
}
dirs 'lib'
}
}
buildscript {
......@@ -127,7 +127,7 @@ dependencies {
compile group: 'com.jolbox', name: 'bonecp', version: '0.8.0.RELEASE'
compile group: 'com.tngtech.java', name: 'config-builder', version: '1.1'
compile group: 'org.postgis', name: 'postgis-jdbc', version:'2.1.0SVN'
compile group: 'org.postgresql', name: 'postgresql', version:'9.3-1101-jdbc41'
compile group: 'org.postgresql', name: 'postgresql', version:'9.2-1004-jdbc41'
runtime 'org.slf4j:jcl-over-slf4j:1.7.5'
runtime 'ch.qos.logback:logback-classic:1.0.13'
......@@ -137,7 +137,7 @@ dependencies {
tasks.withType(Compile) {
// adds support for compiler warnings generation
options.compilerArgs << '-Xlint:all,-processing'
options.compilerArgs << '-Xlint:all,-processing'
}
asciidoctor {
......@@ -180,28 +180,28 @@ eclipse {
'org.eclipse.wst.jsdt.core.jsNature'
]
file {
withXml { xmlProvider ->
Node project = xmlProvider.asNode()
Node filteredResources = project.appendNode('filteredResources');
Node filterGradle = filteredResources.appendNode('filter')
filterGradle.appendNode('id', 1392635165065)
filterGradle.appendNode('name', '')
filterGradle.appendNode('type', 30)
Node matcherGradle = filterGradle.appendNode('matcher')
matcherGradle.appendNode('id', 'org.eclipse.ui.ide.multiFilter')
matcherGradle.appendNode('arguments', '1.0-name-matches-false-false-.gradle')
Node filterVagrant = filteredResources.appendNode('filter')
filterVagrant.appendNode('id', 1392635165131)
filterVagrant.appendNode('name', '')
filterVagrant.appendNode('type', 30)
Node matcherVagrant = filterVagrant.appendNode('matcher')
matcherVagrant.appendNode('id', 'org.eclipse.ui.ide.multiFilter')
matcherVagrant.appendNode('arguments', '1.0-name-matches-false-false-.vagrant')
}
}
file {
withXml { xmlProvider ->
Node project = xmlProvider.asNode()
Node filteredResources = project.appendNode('filteredResources');
Node filterGradle = filteredResources.appendNode('filter')
filterGradle.appendNode('id', 1392635165065)
filterGradle.appendNode('name', '')
filterGradle.appendNode('type', 30)
Node matcherGradle = filterGradle.appendNode('matcher')
matcherGradle.appendNode('id', 'org.eclipse.ui.ide.multiFilter')
matcherGradle.appendNode('arguments', '1.0-name-matches-false-false-.gradle')
Node filterVagrant = filteredResources.appendNode('filter')
filterVagrant.appendNode('id', 1392635165131)
filterVagrant.appendNode('name', '')
filterVagrant.appendNode('type', 30)
Node matcherVagrant = filterVagrant.appendNode('matcher')
matcherVagrant.appendNode('id', 'org.eclipse.ui.ide.multiFilter')
matcherVagrant.appendNode('arguments', '1.0-name-matches-false-false-.vagrant')
}
}
}
wtp {
......@@ -232,8 +232,8 @@ eclipse.classpath.file {
// See: http://forums.gradle.org/gradle/topics/eclipse_wtp_deploys_testcode_to_server_example_provided
// Sets output folders for compiled classes and resources... otherwise test classes/resources would be deployed to wtp server
whenMerged { cp ->
cp.entries.findAll { it.path.startsWith("src/main/") }*.output = "bin"
cp.entries.findAll { it.path.startsWith("src/test/") }*.output = "bin-test"
cp.entries.findAll { it.path.startsWith("src/main/") }*.output = "bin"
cp.entries.findAll { it.path.startsWith("src/test/") }*.output = "bin-test"
}
}
......@@ -315,9 +315,9 @@ war {
// we add a config-test.xml for SNAPSHOT releases (so that the prefix is defined)
// otherwise testing and stable version would collide on testsystem
from('src/test/resources') {
include 'config-test.xml'
into 'WEB-INF/classes'
}
include 'config-test.xml'
into 'WEB-INF/classes'
}
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment