Merge pull request #4883 from apache/nouveau-dist
better integration of nouveau with make dist/release
diff --git a/Makefile b/Makefile
index 359cd19..6d73089 100644
--- a/Makefile
+++ b/Makefile
@@ -429,9 +429,9 @@
endif
ifeq ($(with_nouveau), 1)
- @mkdir -p rel/couchdb/nouveau/
- @cp nouveau/build/libs/server-*-dist.jar rel/couchdb/nouveau/
- @cp nouveau/nouveau.yaml rel/couchdb/nouveau/
+ @mkdir rel/couchdb/nouveau
+ @cd nouveau && ./gradlew installDist
+ @cp -R nouveau/build/install/nouveau rel/couchdb
endif
@echo "... done"
diff --git a/Makefile.win b/Makefile.win
index 8f214e3..0354fe2 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -387,9 +387,9 @@
endif
ifeq ($(with_nouveau), 1)
- -@mkdir -p rel\couchdb\nouveau
- @cp nouveau\build\libs\server-*-dist.jar rel\couchdb\nouveau
- @cp nouveau\nouveau.yaml rel\couchdb\nouveau
+ -@mkdir rel\couchdb\nouveau
+ @cd nouveau && .\gradlew installDist
+ @xcopy nouveau\build\install\nouveau rel\couchdb /E /I
endif
@echo ... done
diff --git a/dev/run b/dev/run
index fcafcf5..c5e0a6a 100755
--- a/dev/run
+++ b/dev/run
@@ -509,15 +509,11 @@
def boot_nouveau(ctx):
if not ctx["with_nouveau"]:
return
-
- version = "1.0-SNAPSHOT"
cmd = [
- "java",
- "-server",
- "-jar",
- "build/libs/server-%s-dist.jar" % version,
- "server",
- "nouveau.yaml",
+ "./gradlew",
+ "run",
+ "--args",
+ "server nouveau.yaml",
]
logfname = os.path.join(ctx["devdir"], "logs", "nouveau.log")
log = open(logfname, "w")
diff --git a/nouveau/build.gradle b/nouveau/build.gradle
index 119e868..68df28b 100644
--- a/nouveau/build.gradle
+++ b/nouveau/build.gradle
@@ -1,7 +1,6 @@
plugins {
id 'application'
id 'com.diffplug.spotless' version '6.18.0'
- id 'com.github.johnrengelman.shadow' version '8.1.1'
id 'jacoco'
}
@@ -43,9 +42,8 @@
testImplementation 'org.mockito:mockito-core'
}
-group = 'org.apache.couchdb.nouveau'
+group = 'org.apache.couchdb'
version = '1.0-SNAPSHOT'
-description = 'server'
java {
sourceCompatibility = "11"
@@ -72,11 +70,6 @@
}
}
-shadowJar {
- archiveClassifier.set('dist')
- mergeServiceFiles()
-}
-
tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
options.deprecation = true
diff --git a/nouveau/settings.gradle b/nouveau/settings.gradle
index 711195b..9116b3a 100644
--- a/nouveau/settings.gradle
+++ b/nouveau/settings.gradle
@@ -2,4 +2,4 @@
* This file was generated by the Gradle 'init' task.
*/
-rootProject.name = 'server'
+rootProject.name = 'nouveau'
