From 9b22bc560fb14cdf3f4504c551b12994d9d168db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Strong=20Liu=28=E5=88=98=E5=B0=91=E5=A3=AE=29?= Date: Wed, 23 Feb 2022 12:59:47 +0800 Subject: [PATCH] remove module-info, The Spring Framework 5.x does not support module-info (#27254) * remove module-info, The Spring Framework 5.x does not support module-info.java in their libraries. We want to align this in our Spring implementations. https://github.com/spring-projects/spring-framework/issues/18079 * remove surefire plugin java modules proeprties from pom.xml Co-authored-by: Xiaolu Dai --- sdk/spring/spring-cloud-azure-core/pom.xml | 18 --------- .../src/main/java/module-info.java | 37 ------------------- .../pom.xml | 8 ---- .../src/main/java/module-info.java | 10 ----- sdk/spring/spring-cloud-azure-service/pom.xml | 32 ---------------- .../src/main/java/module-info.java | 22 ----------- 6 files changed, 127 deletions(-) delete mode 100644 sdk/spring/spring-cloud-azure-core/src/main/java/module-info.java delete mode 100644 sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/module-info.java delete mode 100644 sdk/spring/spring-cloud-azure-service/src/main/java/module-info.java diff --git a/sdk/spring/spring-cloud-azure-core/pom.xml b/sdk/spring/spring-cloud-azure-core/pom.xml index 08f1456555de1..6713e58341eca 100644 --- a/sdk/spring/spring-cloud-azure-core/pom.xml +++ b/sdk/spring/spring-cloud-azure-core/pom.xml @@ -32,24 +32,6 @@ https://github.com/Azure/azure-sdk-for-java/issues - - - - - - --add-modules com.azure.storage.blob - --add-modules com.azure.storage.file.share - --add-modules com.azure.storage.internal.avro - --add-opens com.azure.spring.core/com.azure.spring.core.credential=ALL-UNNAMED - --add-opens com.azure.spring.core/com.azure.spring.core.factory=ALL-UNNAMED - --add-opens com.azure.spring.core/com.azure.spring.core.implementation.connectionstring=ALL-UNNAMED - --add-opens com.azure.spring.core/com.azure.spring.core.implementation.credential.resolver=ALL-UNNAMED - --add-opens com.azure.spring.core/com.azure.spring.core.resource=ALL-UNNAMED - --add-opens com.azure.spring.core/com.azure.spring.core.util=ALL-UNNAMED - --add-opens com.azure.spring.core/com.azure.spring.core=ALL-UNNAMED - - - org.springframework diff --git a/sdk/spring/spring-cloud-azure-core/src/main/java/module-info.java b/sdk/spring/spring-cloud-azure-core/src/main/java/module-info.java deleted file mode 100644 index 517bb26132bf1..0000000000000 --- a/sdk/spring/spring-cloud-azure-core/src/main/java/module-info.java +++ /dev/null @@ -1,37 +0,0 @@ -module com.azure.spring.core { - - requires transitive com.azure.core; - requires transitive com.azure.identity; - requires transitive com.azure.core.management; - requires com.azure.core.amqp; - requires java.desktop; - requires org.slf4j; - requires spring.beans; - requires spring.context; - requires spring.core; - requires static com.azure.storage.blob; - requires static com.azure.storage.file.share; - - exports com.azure.spring.core; - exports com.azure.spring.core.aware; - exports com.azure.spring.core.aware.authentication; - exports com.azure.spring.core.connectionstring; - exports com.azure.spring.core.credential; - exports com.azure.spring.core.credential.descriptor; - exports com.azure.spring.core.customizer; - exports com.azure.spring.core.factory; - exports com.azure.spring.core.properties; - exports com.azure.spring.core.properties.authentication; - exports com.azure.spring.core.properties.client; - exports com.azure.spring.core.properties.profile; - exports com.azure.spring.core.properties.proxy; - exports com.azure.spring.core.properties.resource; - exports com.azure.spring.core.properties.retry; - exports com.azure.spring.core.resource; - exports com.azure.spring.core.service; - exports com.azure.spring.core.trace; - exports com.azure.spring.core.util; - - exports com.azure.spring.core.implementation.converter to com.azure.spring.service; - exports com.azure.spring.core.implementation.http to com.azure.spring.service; -} diff --git a/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml b/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml index 05e7bc2a9b1ad..4d30a4d4a371b 100644 --- a/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml +++ b/sdk/spring/spring-cloud-azure-resourcemanager/pom.xml @@ -33,14 +33,6 @@ https://github.com/Azure/azure-sdk-for-java/issues - - - --add-opens com.azure.spring.resourcemanager/com.azure.spring.resourcemanager.connectionstring=ALL-UNNAMED - --add-opens com.azure.spring.resourcemanager/com.azure.spring.resourcemanager.provisioning.servicebus=ALL-UNNAMED - --add-opens com.azure.spring.resourcemanager/com.azure.spring.resourcemanager.provisioning.eventhubs=ALL-UNNAMED - --add-opens com.azure.spring.resourcemanager/com.azure.spring.resourcemanager.implementation.crud=ALL-UNNAMED - - com.azure.spring diff --git a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/module-info.java b/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/module-info.java deleted file mode 100644 index a8b40902ffd99..0000000000000 --- a/sdk/spring/spring-cloud-azure-resourcemanager/src/main/java/module-info.java +++ /dev/null @@ -1,10 +0,0 @@ -module com.azure.spring.resourcemanager { - - requires transitive com.azure.spring.core; - requires com.azure.resourcemanager; - requires spring.core; - - exports com.azure.spring.resourcemanager.connectionstring; - exports com.azure.spring.resourcemanager.provisioning.eventhubs; - exports com.azure.spring.resourcemanager.provisioning.servicebus; -} diff --git a/sdk/spring/spring-cloud-azure-service/pom.xml b/sdk/spring/spring-cloud-azure-service/pom.xml index f35955c68cc28..ee6533e42779d 100644 --- a/sdk/spring/spring-cloud-azure-service/pom.xml +++ b/sdk/spring/spring-cloud-azure-service/pom.xml @@ -33,38 +33,6 @@ https://github.com/Azure/azure-sdk-for-java/issues - - - --add-modules com.azure.cosmos - --add-modules com.azure.data.appconfiguration - --add-modules com.azure.messaging.eventhubs - --add-modules com.azure.messaging.servicebus - --add-modules com.azure.security.keyvault.certificates - --add-modules com.azure.security.keyvault.secrets - --add-modules com.azure.storage.blob - --add-modules com.azure.storage.file.share - --add-modules com.azure.storage.internal.avro - --add-modules com.azure.storage.queue - --add-opens com.azure.spring.core/com.azure.spring.core.factory=ALL-UNNAMED - --add-opens com.azure.spring.service/com.azure.spring.service.eventhubs=ALL-UNNAMED - --add-opens com.azure.spring.service/com.azure.spring.service.implementation.appconfiguration=ALL-UNNAMED - --add-opens com.azure.spring.service/com.azure.spring.service.implementation.core=ALL-UNNAMED - --add-opens com.azure.spring.service/com.azure.spring.service.implementation.cosmos=ALL-UNNAMED - --add-opens com.azure.spring.service/com.azure.spring.service.implementation.credential=ALL-UNNAMED - --add-opens com.azure.spring.service/com.azure.spring.service.implementation.converter=ALL-UNNAMED - --add-opens com.azure.spring.service/com.azure.spring.service.implementation.eventhubs=ALL-UNNAMED - --add-opens com.azure.spring.service/com.azure.spring.service.implementation.keyvault.certificates=ALL-UNNAMED - --add-opens com.azure.spring.service/com.azure.spring.service.implementation.keyvault.secret=ALL-UNNAMED - --add-opens com.azure.spring.service/com.azure.spring.service.implementation.servicebus.factory=ALL-UNNAMED - --add-opens com.azure.spring.service/com.azure.spring.service.implementation.servicebus=ALL-UNNAMED - --add-opens com.azure.spring.service/com.azure.spring.service.implementation.storage.credential=ALL-UNNAMED - --add-opens com.azure.spring.service/com.azure.spring.service.implementation.storage.blob=ALL-UNNAMED - --add-opens com.azure.spring.service/com.azure.spring.service.implementation.storage.fileshare=ALL-UNNAMED - --add-opens com.azure.spring.service/com.azure.spring.service.implementation.storage.queue=ALL-UNNAMED - --add-opens com.azure.spring.service/com.azure.spring.service.implementation=ALL-UNNAMED - - - com.azure.spring diff --git a/sdk/spring/spring-cloud-azure-service/src/main/java/module-info.java b/sdk/spring/spring-cloud-azure-service/src/main/java/module-info.java deleted file mode 100644 index effc039dd9765..0000000000000 --- a/sdk/spring/spring-cloud-azure-service/src/main/java/module-info.java +++ /dev/null @@ -1,22 +0,0 @@ -module com.azure.spring.service { - - requires transitive com.azure.spring.core; - requires static com.azure.cosmos; - requires static com.azure.data.appconfiguration; - requires static com.azure.messaging.eventhubs; - requires static com.azure.messaging.servicebus; - requires static com.azure.security.keyvault.certificates; - requires static com.azure.security.keyvault.secrets; - requires static com.azure.storage.blob; - requires static com.azure.storage.file.share; - requires static com.azure.storage.queue; - requires spring.core; - - exports com.azure.spring.service.eventhubs.processor.consumer; - exports com.azure.spring.service.eventhubs.processor; - exports com.azure.spring.service.eventhubs.properties; - exports com.azure.spring.service.servicebus.processor.consumer; - exports com.azure.spring.service.servicebus.processor; - exports com.azure.spring.service.servicebus.properties; - -}