Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

make the artifact-names right (neo4j-*)

  • Loading branch information...
commit 23739d31e936bd27ca169c90c7866618cc98af64 1 parent 25124c6
@tbaum tbaum authored
View
19 build.gradle
@@ -8,14 +8,7 @@ zookeeperVersion = "3.3.2"
junitVersion = "4.8.2"
log4jVersion = "1.2.16"
-sourceCompatibility = 1.6
-
-apply plugin: 'java'
-apply plugin: 'idea'
-apply plugin: 'eclipse'
-apply plugin: 'maven'
-
-subprojects {
+allprojects {
group = 'org.neo4j'
version = '1.3-SNAPSHOT'
@@ -28,13 +21,14 @@ subprojects {
repositories {
mavenLocal()
+ mavenRepo urls: "https://repo.neo4j.org/content/groups/dev/"
mavenCentral()
mavenRepo urls: "http://repository.jboss.org/nexus/content/groups/public/"
}
dependencies {
testCompile "junit:junit:$junitVersion"
- // javadoc "junit:junit:$junitVersion"
+ compile "junit:junit:$junitVersion"
}
[compileJava, compileTestJava, javadoc]*.options.collect { options ->
@@ -64,6 +58,7 @@ subprojects {
}
artifacts {
+ archives jar
archives sourcesJar
archives javadocJar
archives testsJar
@@ -100,13 +95,9 @@ subprojects {
testClassesDir = sourceSets.integrationTest.classesDir
classpath += sourceSets.integrationTest.runtimeClasspath
}
+ install.dependsOn ':build'
}
-ideaModule.downloadJavadoc = true
-ideaModule.downloadSources = true
-ideaModule.outputDir = project.sourceSets.main.classesDir
-ideaModule.testOutputDir = project.sourceSets.test.classesDir
-
ideaProject {
withXml { provider ->
provider.node.component.find { it.@name == 'VcsDirectoryMappings' }.mapping.@vcs = 'Git'
View
7 buildSrc/src/main/groovy/GenerateVersionClass.groovy
@@ -17,16 +17,17 @@ class GenerateVersionClass implements Plugin<Project> {
Process git2 = "git describe".execute([], project.projectDir)
git2.waitFor()
- if (git2.exitValue() != 0) throw new RuntimeException("unable fetch 'git2 describe' " + git2.err.text);
+ if (git2.exitValue() != 0) throw new RuntimeException("unable fetch 'git describe' " + git2.err.text);
def gitVersion = git2.text.readLines()[0];
println "Version: ${project.name}, ${project.version}, $gitVersion"
- def outFilename = project.group.replace('.', '/') + "/" + project.name + "/impl/ComponentVersion.java"
+ def packageName = "org.neo4j.kernel.impl"
+ def outFilename = packageName.replace('.', '/') + "/ComponentVersion.java"
def outFile = new File(generatedSrcDir, outFilename)
outFile.parentFile.mkdirs()
def f = new FileWriter(outFile)
- f.write("""package ${project.group}.${project.name}.impl;
+ f.write("""package $packageName;
import org.neo4j.kernel.Version;
import org.neo4j.helpers.Service;
View
4 com/build.gradle
@@ -1,11 +1,11 @@
dependencies {
- compile project(":kernel"), "org.jboss.netty:netty:$nettyVersion"
+ compile project(":neo4j-kernel"), "org.jboss.netty:netty:$nettyVersion"
testCompile "commons-io:commons-io:$commonsIoVersion"
}
sourceSets {
test {
- classpath += project(':kernel').sourceSets.test.classes
+ classpath += project(':neo4j-kernel').sourceSets.test.classes
}
}
View
2  graph-algo/build.gradle
@@ -1,3 +1,3 @@
dependencies {
- compile project(":kernel")
+ compile project(":neo4j-kernel")
}
View
10 ha/build.gradle
@@ -1,8 +1,8 @@
dependencies {
- compile project(":kernel"),
- project(":com"),
- project(":lucene-index"),
- project(":management")
+ compile project(":neo4j-kernel"),
+ project(":neo4j-com"),
+ project(":neo4j-lucene-index"),
+ project(":neo4j-management")
compile("org.apache.zookeeper:zookeeper:$zookeeperVersion") {
exclude module: "jline"
@@ -15,6 +15,6 @@ dependencies {
sourceSets {
test {
- classpath += project(':kernel').sourceSets.test.classes
+ classpath += project(':neo4j-kernel').sourceSets.test.classes
}
}
View
2  integration-test/build.gradle
@@ -1,3 +1,3 @@
dependencies {
- compile project(":kernel")
+ compile project(":neo4j-kernel")
}
View
4 lucene-index/build.gradle
@@ -1,5 +1,5 @@
dependencies {
- compile project(":kernel"),
+ compile project(":neo4j-kernel"),
"org.apache.servicemix.bundles:org.apache.servicemix.bundles.lucene:$luceneBundleVersion"
testCompile "commons-io:commons-io:$commonsIoVersion"
@@ -7,6 +7,6 @@ dependencies {
sourceSets {
test {
- classpath += project(':kernel').sourceSets.test.classes
+ classpath += project(':neo4j-kernel').sourceSets.test.classes
}
}
View
2  management/build.gradle
@@ -1,4 +1,4 @@
dependencies {
- compile project(":kernel"),
+ compile project(":neo4j-kernel"),
files("${System.getenv('JAVA_HOME')}/lib/jconsole.jar")
}
View
14 neo4j/build.gradle
@@ -1,9 +1,9 @@
dependencies {
- compile project(":kernel"),
- project(":com"),
- project(":lucene-index"),
- project(":graph-algo"),
- project(":ha"),
- project(":management"),
- project(":udc")
+ compile project(":neo4j-kernel"),
+ project(":neo4j-com"),
+ project(":neo4j-lucene-index"),
+ project(":neo4j-graph-algo"),
+ project(":neo4j-ha"),
+ project(":neo4j-management"),
+ project(":neo4j-udc")
}
View
5 settings.gradle
@@ -1 +1,4 @@
-include "kernel", "graph-algo", "lucene-index", "udc", "ha", "management", "integration-test", "com"
+["kernel", "graph-algo", "lucene-index", "udc", "ha", "management", "integration-test", "com"].each { p ->
+ include "neo4j-$p"
+ project(":neo4j-$p").projectDir = new File(rootDir, p)
+}
View
2  udc/build.gradle
@@ -1,5 +1,5 @@
dependencies {
- compile project(":kernel"),
+ compile project(":neo4j-kernel"),
"org.apache.httpcomponents:httpcore:$httpComponentsVersion",
"commons-io:commons-io:$commonsIoVersion"
Please sign in to comment.
Something went wrong with that request. Please try again.