diff --git a/build.gradle b/build.gradle
index 16a4fe3f..e7707aa6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -93,10 +93,12 @@ configure(subprojects - [project(":spring-cloud-services-starter-config-client")
 		options.encoding = "UTF-8"
 	}
 
-	[compileJava, compileTestJava]*.options*.compilerArgs = [
-		"-Xlint:all",
-//		"-Werror"
-	]
+	java {
+		withJavadocJar()
+		withSourcesJar()
+	}
+
+	[compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:all"]
 
 	test {
 		// enable JUnit 5
@@ -159,22 +161,6 @@ configure(subprojects - [project(":spring-cloud-services-starter-config-client")
 		options.addStringOption('Xdoclint:none', '-quiet')
 	}
 
-	task sourcesJar(type: Jar, dependsOn:classes) {
-		duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-		classifier = "sources"
-		from sourceSets.main.allJava
-	}
-
-	task javadocJar(type: Jar) {
-		classifier = "javadoc"
-		from javadoc
-	}
-
-	artifacts {
-		archives sourcesJar
-		archives javadocJar
-	}
-
 	task allDependencyInsight(type: DependencyInsightReportTask) {}
 	task allDependencies(type: DependencyReportTask) {}
 }