diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-09 13:11:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-09 13:11:51 +0200 |
commit | 97a0c16566defc38da2ce7d34476472455d05d05 (patch) | |
tree | 61dc137d33892651f0ba2a0e4a0f86b47e10651d | |
parent | e301e836784a8a06ab84f74e1aadda6c92283b28 (diff) | |
parent | 6bb907b40f97a78e7e1529110abbf85f9f7d8828 (diff) |
Merge pull request #30854 from vespa-engine/balder/turn-off-classfile-warnings-where-spotbugs-are-useed-transitively
Turn off classfile warnings where zookeeper is pulled in due to issue…
-rw-r--r-- | clustercontroller-core/pom.xml | 16 | ||||
-rw-r--r-- | dependency-versions/pom.xml | 1 | ||||
-rw-r--r-- | parent/pom.xml | 8 | ||||
-rw-r--r-- | renovate.json | 1 | ||||
-rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 3 | ||||
-rw-r--r-- | zkfacade/pom.xml | 5 | ||||
-rw-r--r-- | zookeeper-command-line-client/pom.xml | 17 | ||||
-rw-r--r-- | zookeeper-server/pom.xml | 6 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server-3.9.2/pom.xml | 3 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server-common/pom.xml | 6 | ||||
-rw-r--r-- | zookeeper-server/zookeeper-server/pom.xml | 3 |
11 files changed, 33 insertions, 36 deletions
diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml index 579e8dd91bb..2a47980ebf8 100644 --- a/clustercontroller-core/pom.xml +++ b/clustercontroller-core/pom.xml @@ -103,13 +103,6 @@ <scope>provided</scope> </dependency> <dependency> - <!-- Not used by this module, but compilation fails without it because zookeeper uses these annotations. - Provided scoped here to avoid dependents getting it transitively. --> - <groupId>com.github.spotbugs</groupId> - <artifactId>spotbugs-annotations</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> <scope>provided</scope> @@ -130,6 +123,15 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <compilerArgs> + <!-- Turn off classfile warnings where spotbugs is pulled in transitively. --> + <arg>-Xlint:all</arg> + <arg>-Xlint:-classfile</arg> + <arg>-Xlint:-serial</arg> + <arg>-Werror</arg> + </compilerArgs> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml index f75d15a8a44..d9c1fd5bb08 100644 --- a/dependency-versions/pom.xml +++ b/dependency-versions/pom.xml @@ -142,7 +142,6 @@ <protobuf.vespa.version>3.25.3</protobuf.vespa.version> <questdb.vespa.version>7.3.10</questdb.vespa.version> <spifly.vespa.version>1.3.7</spifly.vespa.version> - <spotbugs.vespa.version>4.8.4</spotbugs.vespa.version> <!-- Must match major version in https://github.com/apache/zookeeper/blob/master/pom.xml --> <snappy.vespa.version>1.1.10.5</snappy.vespa.version> <surefire.vespa.version>3.2.5</surefire.vespa.version> <velocity.vespa.version>2.3</velocity.vespa.version> diff --git a/parent/pom.xml b/parent/pom.xml index 4988f6e1c26..4003dd792f5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -518,14 +518,6 @@ <version>${luben.zstd.vespa.version}</version> </dependency> <dependency> - <!-- Needed by zookeeper, which has an optional dependency. - Version must be the same as the one zk uses - check the zk pom file. - https://github.com/apache/zookeeper/blob/master/pom.xml --> - <groupId>com.github.spotbugs</groupId> - <artifactId>spotbugs-annotations</artifactId> - <version>${spotbugs.vespa.version}</version> - </dependency> - <dependency> <groupId>org.vafer</groupId> <artifactId>jdependency</artifactId> <version>${vafer.jdependency.vespa.version}</version> diff --git a/renovate.json b/renovate.json index 0913e6c6458..b815ae4bf88 100644 --- a/renovate.json +++ b/renovate.json @@ -21,7 +21,6 @@ { "description": "Disable automatic PRs for artifacts, e.g. fixed version required like ZK dependencies or released to frequently. PRs can still be created manually from dependency dashboard.", "matchPackageNames": [ - "com.github.spotbugs:spotbugs-annotations", "github.com/go-json-experiment/json", "javax.servlet:javax.servlet-api", "io.dropwizard.metrics:metrics-core", diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 1ad000b6830..f8966d4fc68 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -19,7 +19,6 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jackson2.vespa.versio com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2.vespa.version} com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jackson2.vespa.version} com.github.luben:zstd-jni:${luben.zstd.vespa.version} -com.github.spotbugs:spotbugs-annotations:${spotbugs.vespa.version} com.google.code.findbugs:jsr305:${findbugs.vespa.version} com.google.errorprone:error_prone_annotations:${error-prone-annotations.vespa.version} com.google.guava:failureaccess:${failureaccess.vespa.version} @@ -30,7 +29,6 @@ com.google.jimfs:jimfs:${jimfs.vespa.version} com.google.protobuf:protobuf-java:${protobuf.vespa.version} com.ibm.icu:icu4j:${icu4j.vespa.version} com.microsoft.onnxruntime:onnxruntime:${onnxruntime.vespa.version} -de.kherud:llama:${kherud.llama.vespa.version} com.sun.activation:javax.activation:${sun.javax.activation.vespa.version} com.sun.istack:istack-commons-runtime:4.1.2 com.sun.xml.bind:jaxb-core:${jaxb-core.vespa.version} @@ -46,6 +44,7 @@ commons-cli:commons-cli:${commons-cli.vespa.version} commons-codec:commons-codec:${commons-codec.vespa.version} commons-io:commons-io:${commons-io.vespa.version} commons-logging:commons-logging:${commons-logging.vespa.version} +de.kherud:llama:${kherud.llama.vespa.version} io.airlift:aircompressor:${aircompressor.vespa.version} io.airlift:airline:${airline.vespa.version} io.dropwizard.metrics:metrics-core:${dropwizard.metrics.vespa.version} diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml index 6e46fe35801..b8f74335336 100644 --- a/zkfacade/pom.xml +++ b/zkfacade/pom.xml @@ -76,7 +76,12 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <compilerArgs> + <!-- Turn off classfile warnings where spotbugs is pulled in transitively. --> <arg>-Xlint:all</arg> + <arg>-Xlint:-classfile</arg> + <arg>-Xlint:-serial</arg> + <arg>-Xlint:-try</arg> + <arg>-Werror</arg> </compilerArgs> </configuration> </plugin> diff --git a/zookeeper-command-line-client/pom.xml b/zookeeper-command-line-client/pom.xml index 64208e283bf..719bf5aa980 100644 --- a/zookeeper-command-line-client/pom.xml +++ b/zookeeper-command-line-client/pom.xml @@ -57,11 +57,6 @@ <artifactId>log4j-over-slf4j</artifactId> <scope>compile</scope> </dependency> - <dependency> - <!-- Needed by zookeeper, which only has an optional dependency. --> - <groupId>com.github.spotbugs</groupId> - <artifactId>spotbugs-annotations</artifactId> - </dependency> </dependencies> <build> <plugins> @@ -83,6 +78,18 @@ <mainClass>com.yahoo.vespa.zookeeper.cli.Main</mainClass> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <compilerArgs> + <!-- Turn off classfile warnings where spotbugs is pulled in transitively. --> + <arg>-Xlint:all</arg> + <arg>-Xlint:-classfile</arg> + <arg>-Werror</arg> + </compilerArgs> + </configuration> + </plugin> </plugins> </build> </project> diff --git a/zookeeper-server/pom.xml b/zookeeper-server/pom.xml index b0e320047db..4b7f4be7a7f 100644 --- a/zookeeper-server/pom.xml +++ b/zookeeper-server/pom.xml @@ -35,12 +35,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgs> - <arg>-Xlint:all</arg> - <arg>-Werror</arg> - </compilerArgs> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/zookeeper-server/zookeeper-server-3.9.2/pom.xml b/zookeeper-server/zookeeper-server-3.9.2/pom.xml index 25d9cd9432b..791c026234a 100644 --- a/zookeeper-server/zookeeper-server-3.9.2/pom.xml +++ b/zookeeper-server/zookeeper-server-3.9.2/pom.xml @@ -74,7 +74,10 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <compilerArgs> + <!-- Turn off classfile warnings where spotbugs is pulled in transitively. --> <arg>-Xlint:all</arg> + <arg>-Xlint:-classfile</arg> + <arg>-Werror</arg> </compilerArgs> </configuration> </plugin> diff --git a/zookeeper-server/zookeeper-server-common/pom.xml b/zookeeper-server/zookeeper-server-common/pom.xml index 2238f6ad086..7e53866afb9 100644 --- a/zookeeper-server/zookeeper-server-common/pom.xml +++ b/zookeeper-server/zookeeper-server-common/pom.xml @@ -29,12 +29,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgs> - <arg>-Xlint:all</arg> - <arg>-Werror</arg> - </compilerArgs> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/zookeeper-server/zookeeper-server/pom.xml b/zookeeper-server/zookeeper-server/pom.xml index bb4a819b5ac..f1b33dd0ae7 100644 --- a/zookeeper-server/zookeeper-server/pom.xml +++ b/zookeeper-server/zookeeper-server/pom.xml @@ -74,7 +74,10 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <compilerArgs> + <!-- Turn off classfile warnings where spotbugs is pulled in transitively. --> <arg>-Xlint:all</arg> + <arg>-Xlint:-classfile</arg> + <arg>-Werror</arg> </compilerArgs> </configuration> </plugin> |