diff --git a/compiler/build.gradle b/compiler/build.gradle index b65e058f57..a48799297e 100644 --- a/compiler/build.gradle +++ b/compiler/build.gradle @@ -194,7 +194,7 @@ artifacts { [ install.repositories.mavenInstaller, uploadArchives.repositories.mavenDeployer, -]*.addFilter('all') {artifact, file -> +]*.setFilter {artifact, file -> ! (file.getName().endsWith('jar') || file.getName().endsWith('jar.asc')) } @@ -210,6 +210,19 @@ artifacts { } } +[ + install.repositories.mavenInstaller, + uploadArchives.repositories.mavenDeployer, +]*.pom*.whenConfigured { pom -> + pom.project { + // This isn't any sort of Java archive artifact, and OSSRH doesn't enforce + // javadoc for 'pom' packages. 'exe' would be a more appropriate packaging + // value, but it isn't clear how that will be interpreted. In addition, + // 'pom' is typically the value used when building an exe with Maven. + packaging = "pom" + } +} + test.dependsOn('testGolden', 'testNanoGolden') def configureTestTask(Task task, String suffix, String extraPackage) { diff --git a/compiler/check-artifact.sh b/compiler/check-artifact.sh index 7dbd259204..a915e2acba 100755 --- a/compiler/check-artifact.sh +++ b/compiler/check-artifact.sh @@ -125,5 +125,5 @@ checkDependencies () echo } -FILE="build/artifacts/java_pluginExecutable/protoc-gen-grpc-java.exe" +FILE="build/artifacts/java_plugin/protoc-gen-grpc-java.exe" checkArch "$FILE" && checkDependencies "$FILE"