diff --git a/build.gradle b/build.gradle
index 4df06d6c..dcefd77c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,6 @@ allprojects {
 
   repositories {
     mavenCentral()
-    jcenter()
   }
 }
 
@@ -116,6 +115,7 @@ applicationDistribution.from("${project.buildDir}/reports/dependency-license") {
 }
 
 distTar {
+  dependsOn ':generateLicenseReport', ':javadoc', ':jsdoc'
   compression = Compression.GZIP
 
   filesMatching(textFiles) {
@@ -124,6 +124,8 @@ distTar {
 }
 
 distZip {
+  dependsOn ':generateLicenseReport', ':javadoc', ':jsdoc'
+
   filesMatching(textFiles) {
     filter(FixCrLfFilter.class, eol: FixCrLfFilter.CrLf.newInstance("crlf"))
   }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 95feb49f..1a0a0d7f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
diff --git a/modules/helma/build.gradle b/modules/helma/build.gradle
index b6cc653a..81f22c50 100644
--- a/modules/helma/build.gradle
+++ b/modules/helma/build.gradle
@@ -1,8 +1,8 @@
 dependencies {
-	runtime 'ch.ethz.ganymed:ganymed-ssh2:build208'
-	runtime 'net.sourceforge.jexcelapi:jxl:2.5.7'
-	runtime 'org.apache.lucene:lucene-analyzers:2.2.0'
-	runtime 'org.apache.lucene:lucene-core:2.2.0'
+	runtimeOnly 'ch.ethz.ganymed:ganymed-ssh2:build209'
+	runtimeOnly 'net.sourceforge.jexcelapi:jxl:2.5.7'
+	runtimeOnly 'org.apache.lucene:lucene-analyzers:2.2.0'
+	runtimeOnly 'org.apache.lucene:lucene-core:2.2.0'
 }
 
 task deps(type: Copy) {
diff --git a/modules/jala/build.gradle b/modules/jala/build.gradle
index 03af86e8..1270bd58 100644
--- a/modules/jala/build.gradle
+++ b/modules/jala/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
-	runtime 'dom4j:dom4j:1.6.1'
-	runtime 'jaxen:jaxen:1.1-beta-8'
-	runtime 'net.sf.javamusictag:jid3lib:0.5.4'
+	runtimeOnly 'dom4j:dom4j:1.6.1'
+	runtimeOnly 'jaxen:jaxen:1.1-beta-8'
+	runtimeOnly 'net.sf.javamusictag:jid3lib:0.5.4'
 
 	// FIXME: Did not find these two or appropriate replacements for them
 	//runtime 'id3:de.ueberdosis.mp3info:1.6.0d9'
diff --git a/modules/jala/util/HopKit/build.gradle b/modules/jala/util/HopKit/build.gradle
index c43ccba2..43e81a1a 100644
--- a/modules/jala/util/HopKit/build.gradle
+++ b/modules/jala/util/HopKit/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
 	// FIXME: Seems to be not used, anymore…?
-	runtime 'bsf:bsf:2.4.0'
+	runtimeOnly 'bsf:bsf:2.4.0'
 }
 
 task deps(type: Copy) {
diff --git a/modules/jala/util/Test/build.gradle b/modules/jala/util/Test/build.gradle
index cee450a6..95d4d60a 100644
--- a/modules/jala/util/Test/build.gradle
+++ b/modules/jala/util/Test/build.gradle
@@ -1,6 +1,6 @@
 dependencies {
-	runtime 'org.subethamail:subethasmtp-smtp:1.2'
-	runtime 'org.subethamail:subethasmtp-wiser:1.2'
+	runtimeOnly 'org.subethamail:subethasmtp-smtp:1.2'
+	runtimeOnly 'org.subethamail:subethasmtp-wiser:1.2'
 }
 
 task deps(type: Copy) {