From 1647d2a33340f69f4998ab6f300ef107342c879e Mon Sep 17 00:00:00 2001 From: Jendrik Johannes Date: Thu, 13 Feb 2025 08:50:03 +0100 Subject: [PATCH] build: bump hiero-gradle-conventions to 0.3.4 / correct requires static The dependency analysis - through the update of the plugin to 2.8.x - now does a better job analyzing "requires static" dependencies. That's why the update makes the check fail. This PR changes: - 'requires static com.github.spotbugs.annotations' for 'main' code to 'requires static transitive com.github.spotbugs.annotations' - Removes 'requiresStatic("com.github.spotbugs.annotations")' for unit tests as this is inherited from main code dependencies Signed-off-by: Jendrik Johannes --- hapi/src/main/java/module-info.java | 2 +- hapi/src/testFixtures/java/module-info.java | 18 ++++++++++++++++- .../hapi-fees/src/main/java/module-info.java | 18 ++++++++++++++++- .../hapi-utils/src/main/java/module-info.java | 18 ++++++++++++++++- .../build.gradle.kts | 1 - .../src/main/java/module-info.java | 2 +- .../src/main/java/module-info.java | 18 ++++++++++++++++- hedera-node/hedera-app-spi/build.gradle.kts | 1 - .../src/main/java/module-info.java | 20 +++++++++++++++++-- .../src/testFixtures/java/module-info.java | 20 +++++++++++++++++-- hedera-node/hedera-app/build.gradle.kts | 1 - .../hedera-app/src/main/java/module-info.java | 2 +- .../src/testFixtures/java/module-info.java | 2 +- hedera-node/hedera-config/build.gradle.kts | 18 +++++++++++++++-- .../src/main/java/module-info.java | 20 +++++++++++++++++-- .../src/testFixtures/java/module-info.java | 18 ++++++++++++++++- .../build.gradle.kts | 1 - .../src/main/java/module-info.java | 2 +- .../src/main/java/module-info.java | 18 ++++++++++++++++- .../hedera-file-service-impl/build.gradle.kts | 18 +++++++++++++++-- .../src/main/java/module-info.java | 2 +- .../src/main/java/module-info.java | 18 ++++++++++++++++- .../build.gradle.kts | 18 +++++++++++++++-- .../src/main/java/module-info.java | 2 +- .../src/main/java/module-info.java | 18 ++++++++++++++++- .../build.gradle.kts | 1 - .../src/main/java/module-info.java | 2 +- .../src/main/java/module-info.java | 18 ++++++++++++++++- .../build.gradle.kts | 18 +++++++++++++++-- .../src/main/java/module-info.java | 2 +- .../src/main/java/module-info.java | 18 ++++++++++++++++- .../build.gradle.kts | 18 +++++++++++++++-- .../src/main/java/module-info.java | 20 +++++++++++++++++-- .../src/testFixtures/java/module-info.java | 18 ++++++++++++++++- .../hedera-util-service-impl/build.gradle.kts | 18 +++++++++++++++-- .../src/main/java/module-info.java | 2 +- .../src/main/java/module-info.java | 20 +++++++++++++++++-- .../src/main/java/module-info.java | 18 ++++++++++++++++- platform-sdk/swirlds-common/build.gradle.kts | 18 +++++++++++++++-- .../build.gradle.kts | 1 - .../src/main/java/module-info.java | 2 +- .../build.gradle.kts | 18 +++++++++++++++-- .../swirlds-platform-core/build.gradle.kts | 1 - .../swirlds-state-api/build.gradle.kts | 18 +++++++++++++++-- .../swirlds-state-impl/build.gradle.kts | 18 +++++++++++++++-- .../swirlds-platform-test/build.gradle.kts | 1 - settings.gradle.kts | 10 +--------- 47 files changed, 466 insertions(+), 70 deletions(-) diff --git a/hapi/src/main/java/module-info.java b/hapi/src/main/java/module-info.java index 16fbe2f11c45..2a53b25598a7 100644 --- a/hapi/src/main/java/module-info.java +++ b/hapi/src/main/java/module-info.java @@ -99,5 +99,5 @@ requires transitive io.grpc; requires io.grpc.protobuf; requires org.antlr.antlr4.runtime; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; } diff --git a/hapi/src/testFixtures/java/module-info.java b/hapi/src/testFixtures/java/module-info.java index 00cf480dde3a..85f501f54795 100644 --- a/hapi/src/testFixtures/java/module-info.java +++ b/hapi/src/testFixtures/java/module-info.java @@ -1,7 +1,23 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + module com.hedera.node.hapi.test.fixtures { exports com.hedera.node.hapi.fixtures; requires transitive com.hedera.node.hapi; requires transitive com.hedera.pbj.runtime; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; } diff --git a/hedera-node/hapi-fees/src/main/java/module-info.java b/hedera-node/hapi-fees/src/main/java/module-info.java index 310be3db19bf..51296063da2e 100644 --- a/hedera-node/hapi-fees/src/main/java/module-info.java +++ b/hedera-node/hapi-fees/src/main/java/module-info.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + module com.hedera.node.app.hapi.fees { exports com.hedera.node.app.hapi.fees.pricing; exports com.hedera.node.app.hapi.fees.usage.crypto; @@ -24,5 +40,5 @@ requires com.fasterxml.jackson.databind; requires org.apache.commons.lang3; requires org.apache.logging.log4j; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; } diff --git a/hedera-node/hapi-utils/src/main/java/module-info.java b/hedera-node/hapi-utils/src/main/java/module-info.java index c86fcb960ade..980118dc759f 100644 --- a/hedera-node/hapi-utils/src/main/java/module-info.java +++ b/hedera-node/hapi-utils/src/main/java/module-info.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + module com.hedera.node.app.hapi.utils { exports com.hedera.node.app.hapi.utils.fee; exports com.hedera.node.app.hapi.utils.forensics; @@ -37,5 +53,5 @@ requires org.apache.logging.log4j; requires org.bouncycastle.pkix; requires org.bouncycastle.provider; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; } diff --git a/hedera-node/hedera-addressbook-service-impl/build.gradle.kts b/hedera-node/hedera-addressbook-service-impl/build.gradle.kts index e4ac4cdfc518..19dfa1d24566 100644 --- a/hedera-node/hedera-addressbook-service-impl/build.gradle.kts +++ b/hedera-node/hedera-addressbook-service-impl/build.gradle.kts @@ -32,5 +32,4 @@ testModuleInfo { requires("org.junit.jupiter.api") requires("org.mockito") requires("org.mockito.junit.jupiter") - requiresStatic("com.github.spotbugs.annotations") } diff --git a/hedera-node/hedera-addressbook-service-impl/src/main/java/module-info.java b/hedera-node/hedera-addressbook-service-impl/src/main/java/module-info.java index 6c8a1602f335..e395a3b19adc 100644 --- a/hedera-node/hedera-addressbook-service-impl/src/main/java/module-info.java +++ b/hedera-node/hedera-addressbook-service-impl/src/main/java/module-info.java @@ -33,8 +33,8 @@ requires com.swirlds.platform.core; requires com.fasterxml.jackson.core; requires com.fasterxml.jackson.databind; + requires static transitive com.github.spotbugs.annotations; requires static transitive java.compiler; - requires static com.github.spotbugs.annotations; provides com.hedera.node.app.service.addressbook.AddressBookService with AddressBookServiceImpl; diff --git a/hedera-node/hedera-addressbook-service/src/main/java/module-info.java b/hedera-node/hedera-addressbook-service/src/main/java/module-info.java index 87f866ecc9f8..e095dbdbe163 100644 --- a/hedera-node/hedera-addressbook-service/src/main/java/module-info.java +++ b/hedera-node/hedera-addressbook-service/src/main/java/module-info.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + module com.hedera.node.app.service.addressbook { exports com.hedera.node.app.service.addressbook; @@ -10,5 +26,5 @@ requires com.swirlds.config.api; requires org.bouncycastle.pkix; requires org.bouncycastle.provider; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; } diff --git a/hedera-node/hedera-app-spi/build.gradle.kts b/hedera-node/hedera-app-spi/build.gradle.kts index dcb3e42389f9..f794deee1290 100644 --- a/hedera-node/hedera-app-spi/build.gradle.kts +++ b/hedera-node/hedera-app-spi/build.gradle.kts @@ -30,5 +30,4 @@ testModuleInfo { requires("org.junit.jupiter.params") requires("org.mockito") requires("org.mockito.junit.jupiter") - requiresStatic("com.github.spotbugs.annotations") } diff --git a/hedera-node/hedera-app-spi/src/main/java/module-info.java b/hedera-node/hedera-app-spi/src/main/java/module-info.java index 2a24fb583ebf..01cabaea20e6 100644 --- a/hedera-node/hedera-app-spi/src/main/java/module-info.java +++ b/hedera-node/hedera-app-spi/src/main/java/module-info.java @@ -1,12 +1,28 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + module com.hedera.node.app.spi { requires transitive com.hedera.node.app.hapi.utils; requires transitive com.hedera.node.hapi; + requires transitive com.hedera.pbj.runtime; requires transitive com.swirlds.common; requires transitive com.swirlds.config.api; requires transitive com.swirlds.metrics.api; requires transitive com.swirlds.state.api; - requires transitive com.hedera.pbj.runtime; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; exports com.hedera.node.app.spi; exports com.hedera.node.app.spi.fees; diff --git a/hedera-node/hedera-app-spi/src/testFixtures/java/module-info.java b/hedera-node/hedera-app-spi/src/testFixtures/java/module-info.java index df0a12deb1a2..48ec9081512e 100644 --- a/hedera-node/hedera-app-spi/src/testFixtures/java/module-info.java +++ b/hedera-node/hedera-app-spi/src/testFixtures/java/module-info.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + module com.hedera.node.app.spi.test.fixtures { exports com.hedera.node.app.spi.fixtures; exports com.hedera.node.app.spi.fixtures.workflows; @@ -7,11 +23,11 @@ requires transitive com.hedera.node.app.service.token; // TMP until FakePreHandleContext can be removed requires transitive com.hedera.node.app.spi; requires transitive com.hedera.node.hapi; + requires transitive com.hedera.pbj.runtime; requires transitive com.swirlds.config.api; requires transitive com.swirlds.state.api.test.fixtures; requires transitive com.swirlds.state.api; requires transitive com.swirlds.state.impl.test.fixtures; - requires transitive com.hedera.pbj.runtime; requires transitive org.apache.logging.log4j; requires transitive org.assertj.core; requires transitive org.junit.jupiter.api; @@ -19,5 +35,5 @@ requires com.swirlds.common; requires com.swirlds.platform.core; requires org.apache.logging.log4j.core; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; } diff --git a/hedera-node/hedera-app/build.gradle.kts b/hedera-node/hedera-app/build.gradle.kts index 8821c04eda34..a6ff62526837 100644 --- a/hedera-node/hedera-app/build.gradle.kts +++ b/hedera-node/hedera-app/build.gradle.kts @@ -58,7 +58,6 @@ testModuleInfo { requires("tuweni.bytes") requires("uk.org.webcompere.systemstubs.core") requires("uk.org.webcompere.systemstubs.jupiter") - requiresStatic("com.github.spotbugs.annotations") } jmhModuleInfo { diff --git a/hedera-node/hedera-app/src/main/java/module-info.java b/hedera-node/hedera-app/src/main/java/module-info.java index f485e7c78e82..2e4ba99da158 100644 --- a/hedera-node/hedera-app/src/main/java/module-info.java +++ b/hedera-node/hedera-app/src/main/java/module-info.java @@ -68,7 +68,7 @@ requires io.netty.transport.classes.epoll; requires io.netty.transport; requires org.apache.commons.lang3; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; requires static com.google.auto.service; requires static java.compiler; // javax.annotation.processing.Generated diff --git a/hedera-node/hedera-app/src/testFixtures/java/module-info.java b/hedera-node/hedera-app/src/testFixtures/java/module-info.java index ceeac96459bc..90581086c603 100644 --- a/hedera-node/hedera-app/src/testFixtures/java/module-info.java +++ b/hedera-node/hedera-app/src/testFixtures/java/module-info.java @@ -39,5 +39,5 @@ requires com.swirlds.state.impl.test.fixtures; requires org.apache.logging.log4j; requires org.assertj.core; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; } diff --git a/hedera-node/hedera-config/build.gradle.kts b/hedera-node/hedera-config/build.gradle.kts index 2c631f903e67..570752516335 100644 --- a/hedera-node/hedera-config/build.gradle.kts +++ b/hedera-node/hedera-config/build.gradle.kts @@ -1,4 +1,19 @@ -// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + plugins { id("org.hiero.gradle.module.library") id("org.hiero.gradle.feature.test-fixtures") @@ -12,5 +27,4 @@ testModuleInfo { requires("org.assertj.core") requires("org.junit.jupiter.api") requires("org.junit.jupiter.params") - requiresStatic("com.github.spotbugs.annotations") } diff --git a/hedera-node/hedera-config/src/main/java/module-info.java b/hedera-node/hedera-config/src/main/java/module-info.java index c65433a3a721..ff5fbe542cbe 100644 --- a/hedera-node/hedera-config/src/main/java/module-info.java +++ b/hedera-node/hedera-config/src/main/java/module-info.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + module com.hedera.node.config { exports com.hedera.node.config; exports com.hedera.node.config.converter; @@ -8,11 +24,11 @@ requires transitive com.hedera.node.app.hapi.utils; requires transitive com.hedera.node.hapi; + requires transitive com.hedera.pbj.runtime; requires transitive com.swirlds.config.api; requires transitive com.swirlds.config.extensions; - requires transitive com.hedera.pbj.runtime; requires com.swirlds.common; requires org.apache.commons.lang3; requires org.apache.logging.log4j; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; } diff --git a/hedera-node/hedera-config/src/testFixtures/java/module-info.java b/hedera-node/hedera-config/src/testFixtures/java/module-info.java index cf8b4b803136..9d43c4aa5257 100644 --- a/hedera-node/hedera-config/src/testFixtures/java/module-info.java +++ b/hedera-node/hedera-config/src/testFixtures/java/module-info.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + module com.hedera.node.config.test.fixtures { exports com.hedera.node.config.testfixtures; @@ -10,5 +26,5 @@ requires com.swirlds.merkledb; requires com.swirlds.platform.core; requires com.swirlds.virtualmap; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; } diff --git a/hedera-node/hedera-consensus-service-impl/build.gradle.kts b/hedera-node/hedera-consensus-service-impl/build.gradle.kts index 34612a79c329..cf0933722fb8 100644 --- a/hedera-node/hedera-consensus-service-impl/build.gradle.kts +++ b/hedera-node/hedera-consensus-service-impl/build.gradle.kts @@ -31,5 +31,4 @@ testModuleInfo { requires("org.junit.jupiter.api") requires("org.mockito") requires("org.mockito.junit.jupiter") - requiresStatic("com.github.spotbugs.annotations") } diff --git a/hedera-node/hedera-consensus-service-impl/src/main/java/module-info.java b/hedera-node/hedera-consensus-service-impl/src/main/java/module-info.java index e60459601e86..18aa157afce5 100644 --- a/hedera-node/hedera-consensus-service-impl/src/main/java/module-info.java +++ b/hedera-node/hedera-consensus-service-impl/src/main/java/module-info.java @@ -35,7 +35,7 @@ requires com.swirlds.config.api; requires com.google.common; requires org.apache.logging.log4j; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; provides com.hedera.node.app.service.consensus.ConsensusService with ConsensusServiceImpl; diff --git a/hedera-node/hedera-consensus-service/src/main/java/module-info.java b/hedera-node/hedera-consensus-service/src/main/java/module-info.java index d99764e9213d..f9a3fbacb08e 100644 --- a/hedera-node/hedera-consensus-service/src/main/java/module-info.java +++ b/hedera-node/hedera-consensus-service/src/main/java/module-info.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * Provides the classes necessary to manage Hedera Consensus Service. */ @@ -10,5 +26,5 @@ requires transitive com.hedera.node.hapi; requires transitive com.hedera.pbj.runtime; requires com.hedera.node.app.hapi.utils; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; } diff --git a/hedera-node/hedera-file-service-impl/build.gradle.kts b/hedera-node/hedera-file-service-impl/build.gradle.kts index 70616c177b01..6d6c94fdef48 100644 --- a/hedera-node/hedera-file-service-impl/build.gradle.kts +++ b/hedera-node/hedera-file-service-impl/build.gradle.kts @@ -1,4 +1,19 @@ -// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + plugins { id("org.hiero.gradle.module.library") } description = "Default Hedera File Service Implementation" @@ -16,5 +31,4 @@ testModuleInfo { requires("org.junit.jupiter.api") requires("org.mockito") requires("org.mockito.junit.jupiter") - requiresStatic("com.github.spotbugs.annotations") } diff --git a/hedera-node/hedera-file-service-impl/src/main/java/module-info.java b/hedera-node/hedera-file-service-impl/src/main/java/module-info.java index 1d5446027af9..06895043c217 100644 --- a/hedera-node/hedera-file-service-impl/src/main/java/module-info.java +++ b/hedera-node/hedera-file-service-impl/src/main/java/module-info.java @@ -33,7 +33,7 @@ requires com.google.protobuf; requires org.apache.commons.lang3; requires org.apache.logging.log4j; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; exports com.hedera.node.app.service.file.impl.handlers; exports com.hedera.node.app.service.file.impl.records; diff --git a/hedera-node/hedera-file-service/src/main/java/module-info.java b/hedera-node/hedera-file-service/src/main/java/module-info.java index d99e5d272e76..294a856cda31 100644 --- a/hedera-node/hedera-file-service/src/main/java/module-info.java +++ b/hedera-node/hedera-file-service/src/main/java/module-info.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + module com.hedera.node.app.service.file { exports com.hedera.node.app.service.file; @@ -8,5 +24,5 @@ requires transitive com.hedera.pbj.runtime; requires com.hedera.node.app.hapi.utils; requires com.swirlds.state.api; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; } diff --git a/hedera-node/hedera-network-admin-service-impl/build.gradle.kts b/hedera-node/hedera-network-admin-service-impl/build.gradle.kts index 1ee96862d441..932d8e79dfca 100644 --- a/hedera-node/hedera-network-admin-service-impl/build.gradle.kts +++ b/hedera-node/hedera-network-admin-service-impl/build.gradle.kts @@ -1,4 +1,19 @@ -// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + plugins { id("org.hiero.gradle.module.library") } description = "Default Hedera Network Admin Service Implementation" @@ -31,5 +46,4 @@ testModuleInfo { requires("org.junit.jupiter.api") requires("org.mockito") requires("org.mockito.junit.jupiter") - requiresStatic("com.github.spotbugs.annotations") } diff --git a/hedera-node/hedera-network-admin-service-impl/src/main/java/module-info.java b/hedera-node/hedera-network-admin-service-impl/src/main/java/module-info.java index d8cf6fafee8d..29d340213c6a 100644 --- a/hedera-node/hedera-network-admin-service-impl/src/main/java/module-info.java +++ b/hedera-node/hedera-network-admin-service-impl/src/main/java/module-info.java @@ -38,7 +38,7 @@ requires com.google.common; requires org.apache.commons.io; requires org.apache.logging.log4j; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; provides com.hedera.node.app.service.networkadmin.FreezeService with FreezeServiceImpl; diff --git a/hedera-node/hedera-network-admin-service/src/main/java/module-info.java b/hedera-node/hedera-network-admin-service/src/main/java/module-info.java index 90b45e0f596f..a4f7a36bfcfb 100644 --- a/hedera-node/hedera-network-admin-service/src/main/java/module-info.java +++ b/hedera-node/hedera-network-admin-service/src/main/java/module-info.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + module com.hedera.node.app.service.network.admin { exports com.hedera.node.app.service.networkadmin; @@ -8,5 +24,5 @@ requires transitive com.hedera.node.hapi; requires transitive com.hedera.pbj.runtime; requires com.hedera.node.app.hapi.utils; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; } diff --git a/hedera-node/hedera-schedule-service-impl/build.gradle.kts b/hedera-node/hedera-schedule-service-impl/build.gradle.kts index 90c154ad6f7c..f8c055686b55 100644 --- a/hedera-node/hedera-schedule-service-impl/build.gradle.kts +++ b/hedera-node/hedera-schedule-service-impl/build.gradle.kts @@ -32,5 +32,4 @@ testModuleInfo { requires("org.junit.jupiter.api") requires("org.mockito") requires("org.mockito.junit.jupiter") - requiresStatic("com.github.spotbugs.annotations") } diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/module-info.java b/hedera-node/hedera-schedule-service-impl/src/main/java/module-info.java index d983e9a30299..7f640948fe70 100644 --- a/hedera-node/hedera-schedule-service-impl/src/main/java/module-info.java +++ b/hedera-node/hedera-schedule-service-impl/src/main/java/module-info.java @@ -30,7 +30,7 @@ requires com.swirlds.config.api; requires com.google.common; requires org.apache.logging.log4j; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; exports com.hedera.node.app.service.schedule.impl; exports com.hedera.node.app.service.schedule.impl.handlers; diff --git a/hedera-node/hedera-schedule-service/src/main/java/module-info.java b/hedera-node/hedera-schedule-service/src/main/java/module-info.java index 1bc47d168006..26f891a7a5e3 100644 --- a/hedera-node/hedera-schedule-service/src/main/java/module-info.java +++ b/hedera-node/hedera-schedule-service/src/main/java/module-info.java @@ -1,9 +1,25 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + module com.hedera.node.app.service.schedule { requires transitive com.hedera.node.app.spi; requires transitive com.hedera.node.hapi; requires transitive com.hedera.pbj.runtime; requires com.hedera.node.app.hapi.utils; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; exports com.hedera.node.app.service.schedule; diff --git a/hedera-node/hedera-smart-contract-service-impl/build.gradle.kts b/hedera-node/hedera-smart-contract-service-impl/build.gradle.kts index 55fad9948bde..57ccc773dd27 100644 --- a/hedera-node/hedera-smart-contract-service-impl/build.gradle.kts +++ b/hedera-node/hedera-smart-contract-service-impl/build.gradle.kts @@ -1,4 +1,19 @@ -// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + plugins { id("org.hiero.gradle.module.library") } description = "Default Hedera Smart Contract Service Implementation" @@ -19,5 +34,4 @@ testModuleInfo { requires("org.junit.jupiter.params") requires("org.mockito") requires("org.mockito.junit.jupiter") - requiresStatic("com.github.spotbugs.annotations") } diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/module-info.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/module-info.java index fb069d3658a6..853759569315 100644 --- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/module-info.java +++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/module-info.java @@ -46,7 +46,7 @@ requires com.google.protobuf; requires org.apache.commons.lang3; requires org.bouncycastle.provider; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; requires static java.compiler; exports com.hedera.node.app.service.contract.impl; diff --git a/hedera-node/hedera-smart-contract-service/src/main/java/module-info.java b/hedera-node/hedera-smart-contract-service/src/main/java/module-info.java index 469095ad6fbf..a7e326443011 100644 --- a/hedera-node/hedera-smart-contract-service/src/main/java/module-info.java +++ b/hedera-node/hedera-smart-contract-service/src/main/java/module-info.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * Provides the classes necessary to manage Hedera Smart Contract Service. */ @@ -9,5 +25,5 @@ requires transitive com.hedera.node.app.spi; requires transitive com.hedera.pbj.runtime; requires com.hedera.node.hapi; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; } diff --git a/hedera-node/hedera-token-service-impl/build.gradle.kts b/hedera-node/hedera-token-service-impl/build.gradle.kts index 57f0dc52559c..c3b58a147c76 100644 --- a/hedera-node/hedera-token-service-impl/build.gradle.kts +++ b/hedera-node/hedera-token-service-impl/build.gradle.kts @@ -1,4 +1,19 @@ -// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + plugins { id("org.hiero.gradle.module.library") } description = "Default Hedera Token Service Implementation" @@ -20,6 +35,5 @@ testModuleInfo { requires("org.junit.jupiter.params") requires("org.mockito") requires("org.mockito.junit.jupiter") - requiresStatic("com.github.spotbugs.annotations") requires("com.google.protobuf") } diff --git a/hedera-node/hedera-token-service-impl/src/main/java/module-info.java b/hedera-node/hedera-token-service-impl/src/main/java/module-info.java index 38a7899b2705..a395648da4dc 100644 --- a/hedera-node/hedera-token-service-impl/src/main/java/module-info.java +++ b/hedera-node/hedera-token-service-impl/src/main/java/module-info.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * Module that provides the implementation of the Hedera Token Service. */ @@ -8,10 +24,10 @@ requires transitive com.hedera.node.app.spi; requires transitive com.hedera.node.config; requires transitive com.hedera.node.hapi; + requires transitive com.hedera.pbj.runtime; requires transitive com.swirlds.config.api; requires transitive com.swirlds.metrics.api; requires transitive com.swirlds.state.api; - requires transitive com.hedera.pbj.runtime; requires transitive dagger; requires transitive javax.inject; requires com.swirlds.base; @@ -20,7 +36,7 @@ requires org.apache.commons.lang3; requires org.apache.logging.log4j; requires org.bouncycastle.provider; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; requires static java.compiler; // javax.annotation.processing.Generated provides com.hedera.node.app.service.token.TokenService with diff --git a/hedera-node/hedera-token-service/src/testFixtures/java/module-info.java b/hedera-node/hedera-token-service/src/testFixtures/java/module-info.java index ec36d8bc3b9a..77e5cfac3856 100644 --- a/hedera-node/hedera-token-service/src/testFixtures/java/module-info.java +++ b/hedera-node/hedera-token-service/src/testFixtures/java/module-info.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * Provides fixtures for testing the token service. */ @@ -6,5 +22,5 @@ requires transitive com.hedera.node.app.service.token; requires com.hedera.node.hapi; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; } diff --git a/hedera-node/hedera-util-service-impl/build.gradle.kts b/hedera-node/hedera-util-service-impl/build.gradle.kts index 203d36538fff..bfe000d03694 100644 --- a/hedera-node/hedera-util-service-impl/build.gradle.kts +++ b/hedera-node/hedera-util-service-impl/build.gradle.kts @@ -1,4 +1,19 @@ -// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + plugins { id("org.hiero.gradle.module.library") } description = "Default Hedera Util Service Implementation" @@ -15,5 +30,4 @@ testModuleInfo { requires("org.junit.jupiter.params") requires("org.mockito") requires("org.mockito.junit.jupiter") - requiresStatic("com.github.spotbugs.annotations") } diff --git a/hedera-node/hedera-util-service-impl/src/main/java/module-info.java b/hedera-node/hedera-util-service-impl/src/main/java/module-info.java index fc662f0058c1..fe8459aa79ef 100644 --- a/hedera-node/hedera-util-service-impl/src/main/java/module-info.java +++ b/hedera-node/hedera-util-service-impl/src/main/java/module-info.java @@ -27,7 +27,7 @@ requires com.hedera.node.hapi; requires com.swirlds.config.api; requires org.apache.logging.log4j; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; provides com.hedera.node.app.service.util.UtilService with UtilServiceImpl; diff --git a/hedera-node/hedera-util-service/src/main/java/module-info.java b/hedera-node/hedera-util-service/src/main/java/module-info.java index ef489a6d493f..c128ea34dbfc 100644 --- a/hedera-node/hedera-util-service/src/main/java/module-info.java +++ b/hedera-node/hedera-util-service/src/main/java/module-info.java @@ -1,11 +1,27 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + module com.hedera.node.app.service.util { exports com.hedera.node.app.service.util; uses com.hedera.node.app.service.util.UtilService; requires transitive com.hedera.node.app.spi; - requires transitive com.swirlds.state.api; requires transitive com.hedera.pbj.runtime; + requires transitive com.swirlds.state.api; requires com.hedera.node.hapi; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; } diff --git a/platform-sdk/consensus-gossip/src/main/java/module-info.java b/platform-sdk/consensus-gossip/src/main/java/module-info.java index 5e503ba7fae2..90c18a911ebb 100644 --- a/platform-sdk/consensus-gossip/src/main/java/module-info.java +++ b/platform-sdk/consensus-gossip/src/main/java/module-info.java @@ -1,6 +1,22 @@ +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + module org.hiero.consensus.gossip { exports org.hiero.consensus.gossip; requires transitive com.swirlds.common; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; } diff --git a/platform-sdk/swirlds-common/build.gradle.kts b/platform-sdk/swirlds-common/build.gradle.kts index 57efac79eec7..65e3f4ddfe1d 100644 --- a/platform-sdk/swirlds-common/build.gradle.kts +++ b/platform-sdk/swirlds-common/build.gradle.kts @@ -1,4 +1,19 @@ -// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + plugins { id("org.hiero.gradle.module.library") id("org.hiero.gradle.feature.publish-artifactregistry") @@ -30,7 +45,6 @@ testModuleInfo { requires("org.junit.jupiter.params") requires("org.mockito") requires("org.mockito.junit.jupiter") - requiresStatic("com.github.spotbugs.annotations") } timingSensitiveModuleInfo { diff --git a/platform-sdk/swirlds-component-framework/build.gradle.kts b/platform-sdk/swirlds-component-framework/build.gradle.kts index 0a97bd0df32d..08221bfd473e 100644 --- a/platform-sdk/swirlds-component-framework/build.gradle.kts +++ b/platform-sdk/swirlds-component-framework/build.gradle.kts @@ -36,5 +36,4 @@ testModuleInfo { requires("org.junit.jupiter.api") requires("org.junit.jupiter.params") requires("org.mockito") - requiresStatic("com.github.spotbugs.annotations") } diff --git a/platform-sdk/swirlds-component-framework/src/main/java/module-info.java b/platform-sdk/swirlds-component-framework/src/main/java/module-info.java index d07fe73a582a..46683095f076 100644 --- a/platform-sdk/swirlds-component-framework/src/main/java/module-info.java +++ b/platform-sdk/swirlds-component-framework/src/main/java/module-info.java @@ -34,5 +34,5 @@ requires com.swirlds.logging; requires com.swirlds.metrics.api; requires org.apache.logging.log4j; - requires static com.github.spotbugs.annotations; + requires static transitive com.github.spotbugs.annotations; } diff --git a/platform-sdk/swirlds-logging-log4j-appender/build.gradle.kts b/platform-sdk/swirlds-logging-log4j-appender/build.gradle.kts index b6cabb30d2b4..94943bad2b7f 100644 --- a/platform-sdk/swirlds-logging-log4j-appender/build.gradle.kts +++ b/platform-sdk/swirlds-logging-log4j-appender/build.gradle.kts @@ -1,4 +1,19 @@ -// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + plugins { id("org.hiero.gradle.module.library") id("org.hiero.gradle.feature.publish-artifactregistry") @@ -16,5 +31,4 @@ testModuleInfo { requires("org.junit.jupiter.params") runtimeOnly("com.swirlds.config.impl") - requiresStatic("com.github.spotbugs.annotations") } diff --git a/platform-sdk/swirlds-platform-core/build.gradle.kts b/platform-sdk/swirlds-platform-core/build.gradle.kts index b7167954999e..ddfcd0e55a5d 100644 --- a/platform-sdk/swirlds-platform-core/build.gradle.kts +++ b/platform-sdk/swirlds-platform-core/build.gradle.kts @@ -63,7 +63,6 @@ testModuleInfo { requires("org.junit.jupiter.params") requires("org.mockito") requires("org.mockito.junit.jupiter") - requiresStatic("com.github.spotbugs.annotations") } timingSensitiveModuleInfo { diff --git a/platform-sdk/swirlds-state-api/build.gradle.kts b/platform-sdk/swirlds-state-api/build.gradle.kts index d147c770b11e..987bc34da71e 100644 --- a/platform-sdk/swirlds-state-api/build.gradle.kts +++ b/platform-sdk/swirlds-state-api/build.gradle.kts @@ -1,4 +1,19 @@ -// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + plugins { id("org.hiero.gradle.module.library") id("org.hiero.gradle.feature.publish-artifactregistry") @@ -15,5 +30,4 @@ testModuleInfo { requires("org.mockito.junit.jupiter") runtimeOnly("com.swirlds.config.api") runtimeOnly("com.swirlds.config.impl") - requiresStatic("com.github.spotbugs.annotations") } diff --git a/platform-sdk/swirlds-state-impl/build.gradle.kts b/platform-sdk/swirlds-state-impl/build.gradle.kts index bf6a5d6bd5ad..acbd29e4342e 100644 --- a/platform-sdk/swirlds-state-impl/build.gradle.kts +++ b/platform-sdk/swirlds-state-impl/build.gradle.kts @@ -1,4 +1,19 @@ -// SPDX-License-Identifier: Apache-2.0 +/* + * Copyright (C) 2025 Hedera Hashgraph, LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + plugins { id("org.hiero.gradle.module.library") id("org.hiero.gradle.feature.publish-artifactregistry") @@ -16,5 +31,4 @@ testModuleInfo { requires("org.mockito.junit.jupiter") runtimeOnly("com.swirlds.config.api") runtimeOnly("com.swirlds.config.impl") - requiresStatic("com.github.spotbugs.annotations") } diff --git a/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/build.gradle.kts b/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/build.gradle.kts index b35ea0a483ae..ae850211f5c3 100644 --- a/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/build.gradle.kts +++ b/platform-sdk/swirlds-unit-tests/core/swirlds-platform-test/build.gradle.kts @@ -53,5 +53,4 @@ testModuleInfo { requires("com.swirlds.state.impl") requires("org.mockito") requires("org.hiero.consensus.gossip") - requiresStatic("com.github.spotbugs.annotations") } diff --git a/settings.gradle.kts b/settings.gradle.kts index bdbf60a3b7ec..40f3cf8a760e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,15 +14,7 @@ * limitations under the License. */ -plugins { id("org.hiero.gradle.build") version "0.3.3" } - -// Downgrade 'dependency-analysis-gradle-plugin' as 2.8.0 delivers unexpected results -// we need to investigate -buildscript { - dependencies.constraints { - classpath("com.autonomousapps:dependency-analysis-gradle-plugin:2.7.0!!") - } -} +plugins { id("org.hiero.gradle.build") version "0.3.4" } javaModules { // This "intermediate parent project" should be removed