From 56b963c32667bca8510383041cdd303dcd5f04e1 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Thu, 7 May 2020 12:33:51 -0400 Subject: [PATCH] More restructuring --- applications/pom.xml | 6 ++--- .../stream-applications-build/pom.xml | 6 ++--- .../stream-applications-core/common/pom.xml | 25 ------------------- .../pom.xml | 7 +++--- .../ftp/FtpSessionFactoryConfiguration.java | 0 .../app/ftp/FtpSessionFactoryProperties.java | 0 .../README.adoc | 0 .../pom.xml | 7 +++--- .../ClientCacheAutoConfiguration.java | 0 .../MetadataStoreAutoConfiguration.java | 0 .../app/metadata/MetadataStoreProperties.java | 0 .../main/resources/META-INF/spring.factories | 0 .../MetadataStoreAutoConfigurationTests.java | 0 .../pom.xml | 5 ++-- .../CloudFoundryMicrometerCommonTags.java | 0 ...SpringCloudStreamMicrometerCommonTags.java | 0 ...eamMicrometerEnvironmentPostProcessor.java | 0 .../main/resources/META-INF/spring.factories | 0 .../common/AbstractMicrometerTagTest.java | 0 .../CloudFoundryMicrometerCommonTagsTest.java | 0 .../InfluxReservedKeywordHandlingTest.java | 0 ...ngCloudStreamMicrometerCommonTagsTest.java | 0 ...icrometerEnvironmentPostProcessorTest.java | 0 .../app/micrometer/common/pcf-scs-info.json | 0 .../pom.xml | 7 +++--- .../ContentTypeEnvironmentPostProcessor.java | 0 ...tentTypeEnvironmentPostProcessorTests.java | 0 .../README.adoc | 0 .../pom.xml | 5 ++-- ...arterWebFluxSecurityAutoConfiguration.java | 0 ...ppStarterWebSecurityAutoConfiguration.java | 0 ...ebSecurityAutoConfigurationProperties.java | 0 .../common/OnHttpCsrfOrSecurityDisabled.java | 0 .../main/resources/META-INF/spring.factories | 0 .../common/AbstractSecurityCommonTests.java | 0 ...isabledManagementSecurityEnabledTests.java | 0 ...SecurityDisabledAuthorizedAccessTests.java | 0 ...curityDisabledUnauthorizedAccessTests.java | 0 ...EnabledManagementSecurityEnabledTests.java | 0 ...isabledManagementSecurityEnabledTests.java | 0 ...SecurityDisabledAuthorizedAccessTests.java | 0 ...curityDisabledUnauthorizedAccessTests.java | 0 ...EnabledManagementSecurityEnabledTests.java | 0 .../README.adoc | 0 .../pom.xml | 7 +++--- .../DataFlowTaskLaunchRequest.java | 0 ...lowTaskLaunchRequestAutoConfiguration.java | 0 .../DataflowTaskLaunchRequestProperties.java | 0 ...essionEvaluatingTaskNameMessageMapper.java | 0 .../tasklaunchrequest/KeyValueListParser.java | 0 .../TaskLaunchRequestFunction.java | 0 .../TaskLaunchRequestMessageProcessor.java | 0 .../CommandLineArgumentsMessageMapper.java | 0 .../support/TaskLaunchRequestSupplier.java | 0 .../support/TaskNameMessageMapper.java | 0 ...onfiguration-metadata-whitelist.properties | 0 .../main/resources/META-INF/spring.factories | 0 .../KeyValueListParserTests.java | 0 .../TaskLaunchRequestIntegrationTests.java | 0 .../TaskLaunchRequestPropertiesTests.java | 0 .../pom.xml | 5 ++-- .../test/BinderTestPropertiesInitializer.java | 0 .../file/remote/RemoteFileTestSupport.java | 0 .../app/test/ip/IpSinkTestConfiguration.java | 0 .../test/ip/IpSourceTestConfiguration.java | 0 .../script/ScriptableTestConfiguration.java | 0 applications/stream-applications-core/pom.xml | 10 ++++++-- 67 files changed, 39 insertions(+), 51 deletions(-) delete mode 100644 applications/stream-applications-core/common/pom.xml rename applications/stream-applications-core/common/{stream-apps-ftp-common => stream-applications-ftp-common}/pom.xml (81%) rename applications/stream-applications-core/common/{stream-apps-ftp-common => stream-applications-ftp-common}/src/main/java/org/springframework/cloud/stream/app/ftp/FtpSessionFactoryConfiguration.java (100%) rename applications/stream-applications-core/common/{stream-apps-ftp-common => stream-applications-ftp-common}/src/main/java/org/springframework/cloud/stream/app/ftp/FtpSessionFactoryProperties.java (100%) rename applications/stream-applications-core/common/{stream-apps-metadata-store-common => stream-applications-metadata-store-common}/README.adoc (100%) rename applications/stream-applications-core/common/{stream-apps-metadata-store-common => stream-applications-metadata-store-common}/pom.xml (95%) rename applications/stream-applications-core/common/{stream-apps-metadata-store-common => stream-applications-metadata-store-common}/src/main/java/org/springframework/cloud/stream/app/metadata/ClientCacheAutoConfiguration.java (100%) rename applications/stream-applications-core/common/{stream-apps-metadata-store-common => stream-applications-metadata-store-common}/src/main/java/org/springframework/cloud/stream/app/metadata/MetadataStoreAutoConfiguration.java (100%) rename applications/stream-applications-core/common/{stream-apps-metadata-store-common => stream-applications-metadata-store-common}/src/main/java/org/springframework/cloud/stream/app/metadata/MetadataStoreProperties.java (100%) rename applications/stream-applications-core/common/{stream-apps-metadata-store-common => stream-applications-metadata-store-common}/src/main/resources/META-INF/spring.factories (100%) rename applications/stream-applications-core/common/{stream-apps-metadata-store-common => stream-applications-metadata-store-common}/src/test/java/org/springframework/cloud/stream/app/metadata/MetadataStoreAutoConfigurationTests.java (100%) rename applications/stream-applications-core/common/{stream-apps-micrometer-common => stream-applications-micrometer-common}/pom.xml (87%) rename applications/stream-applications-core/common/{stream-apps-micrometer-common => stream-applications-micrometer-common}/src/main/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTags.java (100%) rename applications/stream-applications-core/common/{stream-apps-micrometer-common => stream-applications-micrometer-common}/src/main/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerCommonTags.java (100%) rename applications/stream-applications-core/common/{stream-apps-micrometer-common => stream-applications-micrometer-common}/src/main/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerEnvironmentPostProcessor.java (100%) rename applications/stream-applications-core/common/{stream-apps-micrometer-common => stream-applications-micrometer-common}/src/main/resources/META-INF/spring.factories (100%) rename applications/stream-applications-core/common/{stream-apps-micrometer-common => stream-applications-micrometer-common}/src/test/java/org/springframework/cloud/stream/app/micrometer/common/AbstractMicrometerTagTest.java (100%) rename applications/stream-applications-core/common/{stream-apps-micrometer-common => stream-applications-micrometer-common}/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTagsTest.java (100%) rename applications/stream-applications-core/common/{stream-apps-micrometer-common => stream-applications-micrometer-common}/src/test/java/org/springframework/cloud/stream/app/micrometer/common/InfluxReservedKeywordHandlingTest.java (100%) rename applications/stream-applications-core/common/{stream-apps-micrometer-common => stream-applications-micrometer-common}/src/test/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerCommonTagsTest.java (100%) rename applications/stream-applications-core/common/{stream-apps-micrometer-common => stream-applications-micrometer-common}/src/test/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerEnvironmentPostProcessorTest.java (100%) rename applications/stream-applications-core/common/{stream-apps-micrometer-common => stream-applications-micrometer-common}/src/test/resources/org/springframework/cloud/stream/app/micrometer/common/pcf-scs-info.json (100%) rename applications/stream-applications-core/common/{stream-apps-postprocessor-common => stream-applications-postprocessor-common}/pom.xml (74%) rename applications/stream-applications-core/common/{stream-apps-postprocessor-common => stream-applications-postprocessor-common}/src/main/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessor.java (100%) rename applications/stream-applications-core/common/{stream-apps-postprocessor-common => stream-applications-postprocessor-common}/src/test/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessorTests.java (100%) rename applications/stream-applications-core/common/{stream-apps-security-common => stream-applications-security-common}/README.adoc (100%) rename applications/stream-applications-core/common/{stream-apps-security-common => stream-applications-security-common}/pom.xml (91%) rename applications/stream-applications-core/common/{stream-apps-security-common => stream-applications-security-common}/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebFluxSecurityAutoConfiguration.java (100%) rename applications/stream-applications-core/common/{stream-apps-security-common => stream-applications-security-common}/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfiguration.java (100%) rename applications/stream-applications-core/common/{stream-apps-security-common => stream-applications-security-common}/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfigurationProperties.java (100%) rename applications/stream-applications-core/common/{stream-apps-security-common => stream-applications-security-common}/src/main/java/org/springframework/cloud/stream/app/security/common/OnHttpCsrfOrSecurityDisabled.java (100%) rename applications/stream-applications-core/common/{stream-apps-security-common => stream-applications-security-common}/src/main/resources/META-INF/spring.factories (100%) rename applications/stream-applications-core/common/{stream-apps-security-common => stream-applications-security-common}/src/test/java/org/springframework/cloud/stream/app/security/common/AbstractSecurityCommonTests.java (100%) rename applications/stream-applications-core/common/{stream-apps-security-common => stream-applications-security-common}/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityDisabledManagementSecurityEnabledTests.java (100%) rename applications/stream-applications-core/common/{stream-apps-security-common => stream-applications-security-common}/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java (100%) rename applications/stream-applications-core/common/{stream-apps-security-common => stream-applications-security-common}/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java (100%) rename applications/stream-applications-core/common/{stream-apps-security-common => stream-applications-security-common}/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityEnabledTests.java (100%) rename applications/stream-applications-core/common/{stream-apps-security-common => stream-applications-security-common}/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityDisabledManagementSecurityEnabledTests.java (100%) rename applications/stream-applications-core/common/{stream-apps-security-common => stream-applications-security-common}/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java (100%) rename applications/stream-applications-core/common/{stream-apps-security-common => stream-applications-security-common}/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java (100%) rename applications/stream-applications-core/common/{stream-apps-security-common => stream-applications-security-common}/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityEnabledTests.java (100%) rename applications/stream-applications-core/common/{stream-apps-task-launch-request-common => stream-applications-task-launch-request-common}/README.adoc (100%) rename applications/stream-applications-core/common/{stream-apps-task-launch-request-common => stream-applications-task-launch-request-common}/pom.xml (86%) rename applications/stream-applications-core/common/{stream-apps-task-launch-request-common => stream-applications-task-launch-request-common}/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/DataFlowTaskLaunchRequest.java (100%) rename applications/stream-applications-core/common/{stream-apps-task-launch-request-common => stream-applications-task-launch-request-common}/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/DataFlowTaskLaunchRequestAutoConfiguration.java (100%) rename applications/stream-applications-core/common/{stream-apps-task-launch-request-common => stream-applications-task-launch-request-common}/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/DataflowTaskLaunchRequestProperties.java (100%) rename applications/stream-applications-core/common/{stream-apps-task-launch-request-common => stream-applications-task-launch-request-common}/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/ExpressionEvaluatingTaskNameMessageMapper.java (100%) rename applications/stream-applications-core/common/{stream-apps-task-launch-request-common => stream-applications-task-launch-request-common}/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/KeyValueListParser.java (100%) rename applications/stream-applications-core/common/{stream-apps-task-launch-request-common => stream-applications-task-launch-request-common}/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestFunction.java (100%) rename applications/stream-applications-core/common/{stream-apps-task-launch-request-common => stream-applications-task-launch-request-common}/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestMessageProcessor.java (100%) rename applications/stream-applications-core/common/{stream-apps-task-launch-request-common => stream-applications-task-launch-request-common}/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/support/CommandLineArgumentsMessageMapper.java (100%) rename applications/stream-applications-core/common/{stream-apps-task-launch-request-common => stream-applications-task-launch-request-common}/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/support/TaskLaunchRequestSupplier.java (100%) rename applications/stream-applications-core/common/{stream-apps-task-launch-request-common => stream-applications-task-launch-request-common}/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/support/TaskNameMessageMapper.java (100%) rename applications/stream-applications-core/common/{stream-apps-task-launch-request-common => stream-applications-task-launch-request-common}/src/main/resources/META-INF/spring-configuration-metadata-whitelist.properties (100%) rename applications/stream-applications-core/common/{stream-apps-task-launch-request-common => stream-applications-task-launch-request-common}/src/main/resources/META-INF/spring.factories (100%) rename applications/stream-applications-core/common/{stream-apps-task-launch-request-common => stream-applications-task-launch-request-common}/src/test/java/org/springframework/cloud/stream/app/tasklaunchrequest/KeyValueListParserTests.java (100%) rename applications/stream-applications-core/common/{stream-apps-task-launch-request-common => stream-applications-task-launch-request-common}/src/test/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestIntegrationTests.java (100%) rename applications/stream-applications-core/common/{stream-apps-task-launch-request-common => stream-applications-task-launch-request-common}/src/test/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestPropertiesTests.java (100%) rename applications/stream-applications-core/common/{stream-apps-test-support => stream-applications-test-support}/pom.xml (86%) rename applications/stream-applications-core/common/{stream-apps-test-support => stream-applications-test-support}/src/main/java/org/springframework/cloud/stream/app/test/BinderTestPropertiesInitializer.java (100%) rename applications/stream-applications-core/common/{stream-apps-test-support => stream-applications-test-support}/src/main/java/org/springframework/cloud/stream/app/test/file/remote/RemoteFileTestSupport.java (100%) rename applications/stream-applications-core/common/{stream-apps-test-support => stream-applications-test-support}/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSinkTestConfiguration.java (100%) rename applications/stream-applications-core/common/{stream-apps-test-support => stream-applications-test-support}/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSourceTestConfiguration.java (100%) rename applications/stream-applications-core/common/{stream-apps-test-support => stream-applications-test-support}/src/main/java/org/springframework/cloud/stream/app/test/script/ScriptableTestConfiguration.java (100%) diff --git a/applications/pom.xml b/applications/pom.xml index 2cf6e293..429e0d8e 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -2,18 +2,18 @@ 4.0.0 org.springframework.cloud.stream.app - stream-applications-infra + applications 3.0.0.BUILD-SNAPSHOT - stream-applications-infra + applications Infrastructure for stream applications pom stream-applications-core - stream-applications-build source sink processor + stream-applications-build diff --git a/applications/stream-applications-build/pom.xml b/applications/stream-applications-build/pom.xml index d89a6090..40b2d021 100644 --- a/applications/stream-applications-build/pom.xml +++ b/applications/stream-applications-build/pom.xml @@ -2,15 +2,15 @@ 4.0.0 - apps-build + stream-applications-build Fahrenheit.BUILD-SNAPSHOT pom org.springframework.cloud.stream.app - stream-apps-parent + stream-applications-core 3.0.0.BUILD-SNAPSHOT - + ../stream-applications-core diff --git a/applications/stream-applications-core/common/pom.xml b/applications/stream-applications-core/common/pom.xml deleted file mode 100644 index 4a2a068c..00000000 --- a/applications/stream-applications-core/common/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - stream-apps-parent - org.springframework.cloud.stream.app - 3.0.0.BUILD-SNAPSHOT - - 4.0.0 - - stream-apps-common - pom - stream-apps-common - - - stream-apps-ftp-common - stream-apps-test-support - stream-apps-postprocessor-common - stream-apps-micrometer-common - stream-apps-metadata-store-common - stream-apps-task-launch-request-common - stream-apps-security-common - - - diff --git a/applications/stream-applications-core/common/stream-apps-ftp-common/pom.xml b/applications/stream-applications-core/common/stream-applications-ftp-common/pom.xml similarity index 81% rename from applications/stream-applications-core/common/stream-apps-ftp-common/pom.xml rename to applications/stream-applications-core/common/stream-applications-ftp-common/pom.xml index 5b9be4d0..f5fb93de 100644 --- a/applications/stream-applications-core/common/stream-apps-ftp-common/pom.xml +++ b/applications/stream-applications-core/common/stream-applications-ftp-common/pom.xml @@ -2,14 +2,15 @@ - stream-apps-common + stream-applications-core org.springframework.cloud.stream.app 3.0.0.BUILD-SNAPSHOT + ../.. 4.0.0 - stream-apps-ftp-common - stream-apps-ftp-common + stream-applications-ftp-common + stream-applications-ftp-common diff --git a/applications/stream-applications-core/common/stream-apps-ftp-common/src/main/java/org/springframework/cloud/stream/app/ftp/FtpSessionFactoryConfiguration.java b/applications/stream-applications-core/common/stream-applications-ftp-common/src/main/java/org/springframework/cloud/stream/app/ftp/FtpSessionFactoryConfiguration.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-ftp-common/src/main/java/org/springframework/cloud/stream/app/ftp/FtpSessionFactoryConfiguration.java rename to applications/stream-applications-core/common/stream-applications-ftp-common/src/main/java/org/springframework/cloud/stream/app/ftp/FtpSessionFactoryConfiguration.java diff --git a/applications/stream-applications-core/common/stream-apps-ftp-common/src/main/java/org/springframework/cloud/stream/app/ftp/FtpSessionFactoryProperties.java b/applications/stream-applications-core/common/stream-applications-ftp-common/src/main/java/org/springframework/cloud/stream/app/ftp/FtpSessionFactoryProperties.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-ftp-common/src/main/java/org/springframework/cloud/stream/app/ftp/FtpSessionFactoryProperties.java rename to applications/stream-applications-core/common/stream-applications-ftp-common/src/main/java/org/springframework/cloud/stream/app/ftp/FtpSessionFactoryProperties.java diff --git a/applications/stream-applications-core/common/stream-apps-metadata-store-common/README.adoc b/applications/stream-applications-core/common/stream-applications-metadata-store-common/README.adoc similarity index 100% rename from applications/stream-applications-core/common/stream-apps-metadata-store-common/README.adoc rename to applications/stream-applications-core/common/stream-applications-metadata-store-common/README.adoc diff --git a/applications/stream-applications-core/common/stream-apps-metadata-store-common/pom.xml b/applications/stream-applications-core/common/stream-applications-metadata-store-common/pom.xml similarity index 95% rename from applications/stream-applications-core/common/stream-apps-metadata-store-common/pom.xml rename to applications/stream-applications-core/common/stream-applications-metadata-store-common/pom.xml index b14943db..d7c6357f 100644 --- a/applications/stream-applications-core/common/stream-apps-metadata-store-common/pom.xml +++ b/applications/stream-applications-core/common/stream-applications-metadata-store-common/pom.xml @@ -5,13 +5,14 @@ 4.0.0 - stream-apps-common + stream-applications-core org.springframework.cloud.stream.app 3.0.0.BUILD-SNAPSHOT + ../.. - stream-apps-metadata-store-common - stream-apps-metadata-store-common + stream-applications-metadata-store-common + stream-applications-metadata-store-common 1.11.439 diff --git a/applications/stream-applications-core/common/stream-apps-metadata-store-common/src/main/java/org/springframework/cloud/stream/app/metadata/ClientCacheAutoConfiguration.java b/applications/stream-applications-core/common/stream-applications-metadata-store-common/src/main/java/org/springframework/cloud/stream/app/metadata/ClientCacheAutoConfiguration.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-metadata-store-common/src/main/java/org/springframework/cloud/stream/app/metadata/ClientCacheAutoConfiguration.java rename to applications/stream-applications-core/common/stream-applications-metadata-store-common/src/main/java/org/springframework/cloud/stream/app/metadata/ClientCacheAutoConfiguration.java diff --git a/applications/stream-applications-core/common/stream-apps-metadata-store-common/src/main/java/org/springframework/cloud/stream/app/metadata/MetadataStoreAutoConfiguration.java b/applications/stream-applications-core/common/stream-applications-metadata-store-common/src/main/java/org/springframework/cloud/stream/app/metadata/MetadataStoreAutoConfiguration.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-metadata-store-common/src/main/java/org/springframework/cloud/stream/app/metadata/MetadataStoreAutoConfiguration.java rename to applications/stream-applications-core/common/stream-applications-metadata-store-common/src/main/java/org/springframework/cloud/stream/app/metadata/MetadataStoreAutoConfiguration.java diff --git a/applications/stream-applications-core/common/stream-apps-metadata-store-common/src/main/java/org/springframework/cloud/stream/app/metadata/MetadataStoreProperties.java b/applications/stream-applications-core/common/stream-applications-metadata-store-common/src/main/java/org/springframework/cloud/stream/app/metadata/MetadataStoreProperties.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-metadata-store-common/src/main/java/org/springframework/cloud/stream/app/metadata/MetadataStoreProperties.java rename to applications/stream-applications-core/common/stream-applications-metadata-store-common/src/main/java/org/springframework/cloud/stream/app/metadata/MetadataStoreProperties.java diff --git a/applications/stream-applications-core/common/stream-apps-metadata-store-common/src/main/resources/META-INF/spring.factories b/applications/stream-applications-core/common/stream-applications-metadata-store-common/src/main/resources/META-INF/spring.factories similarity index 100% rename from applications/stream-applications-core/common/stream-apps-metadata-store-common/src/main/resources/META-INF/spring.factories rename to applications/stream-applications-core/common/stream-applications-metadata-store-common/src/main/resources/META-INF/spring.factories diff --git a/applications/stream-applications-core/common/stream-apps-metadata-store-common/src/test/java/org/springframework/cloud/stream/app/metadata/MetadataStoreAutoConfigurationTests.java b/applications/stream-applications-core/common/stream-applications-metadata-store-common/src/test/java/org/springframework/cloud/stream/app/metadata/MetadataStoreAutoConfigurationTests.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-metadata-store-common/src/test/java/org/springframework/cloud/stream/app/metadata/MetadataStoreAutoConfigurationTests.java rename to applications/stream-applications-core/common/stream-applications-metadata-store-common/src/test/java/org/springframework/cloud/stream/app/metadata/MetadataStoreAutoConfigurationTests.java diff --git a/applications/stream-applications-core/common/stream-apps-micrometer-common/pom.xml b/applications/stream-applications-core/common/stream-applications-micrometer-common/pom.xml similarity index 87% rename from applications/stream-applications-core/common/stream-apps-micrometer-common/pom.xml rename to applications/stream-applications-core/common/stream-applications-micrometer-common/pom.xml index c9c62cb2..3fd8c1eb 100644 --- a/applications/stream-applications-core/common/stream-apps-micrometer-common/pom.xml +++ b/applications/stream-applications-core/common/stream-applications-micrometer-common/pom.xml @@ -3,12 +3,13 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - stream-apps-common + stream-applications-core org.springframework.cloud.stream.app 3.0.0.BUILD-SNAPSHOT + ../.. 4.0.0 - stream-apps-micrometer-common + stream-applications-micrometer-common diff --git a/applications/stream-applications-core/common/stream-apps-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTags.java b/applications/stream-applications-core/common/stream-applications-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTags.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTags.java rename to applications/stream-applications-core/common/stream-applications-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTags.java diff --git a/applications/stream-applications-core/common/stream-apps-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerCommonTags.java b/applications/stream-applications-core/common/stream-applications-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerCommonTags.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerCommonTags.java rename to applications/stream-applications-core/common/stream-applications-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerCommonTags.java diff --git a/applications/stream-applications-core/common/stream-apps-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerEnvironmentPostProcessor.java b/applications/stream-applications-core/common/stream-applications-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerEnvironmentPostProcessor.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerEnvironmentPostProcessor.java rename to applications/stream-applications-core/common/stream-applications-micrometer-common/src/main/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerEnvironmentPostProcessor.java diff --git a/applications/stream-applications-core/common/stream-apps-micrometer-common/src/main/resources/META-INF/spring.factories b/applications/stream-applications-core/common/stream-applications-micrometer-common/src/main/resources/META-INF/spring.factories similarity index 100% rename from applications/stream-applications-core/common/stream-apps-micrometer-common/src/main/resources/META-INF/spring.factories rename to applications/stream-applications-core/common/stream-applications-micrometer-common/src/main/resources/META-INF/spring.factories diff --git a/applications/stream-applications-core/common/stream-apps-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/AbstractMicrometerTagTest.java b/applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/AbstractMicrometerTagTest.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/AbstractMicrometerTagTest.java rename to applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/AbstractMicrometerTagTest.java diff --git a/applications/stream-applications-core/common/stream-apps-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTagsTest.java b/applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTagsTest.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTagsTest.java rename to applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/CloudFoundryMicrometerCommonTagsTest.java diff --git a/applications/stream-applications-core/common/stream-apps-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/InfluxReservedKeywordHandlingTest.java b/applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/InfluxReservedKeywordHandlingTest.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/InfluxReservedKeywordHandlingTest.java rename to applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/InfluxReservedKeywordHandlingTest.java diff --git a/applications/stream-applications-core/common/stream-apps-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerCommonTagsTest.java b/applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerCommonTagsTest.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerCommonTagsTest.java rename to applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerCommonTagsTest.java diff --git a/applications/stream-applications-core/common/stream-apps-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerEnvironmentPostProcessorTest.java b/applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerEnvironmentPostProcessorTest.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerEnvironmentPostProcessorTest.java rename to applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/java/org/springframework/cloud/stream/app/micrometer/common/SpringCloudStreamMicrometerEnvironmentPostProcessorTest.java diff --git a/applications/stream-applications-core/common/stream-apps-micrometer-common/src/test/resources/org/springframework/cloud/stream/app/micrometer/common/pcf-scs-info.json b/applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/resources/org/springframework/cloud/stream/app/micrometer/common/pcf-scs-info.json similarity index 100% rename from applications/stream-applications-core/common/stream-apps-micrometer-common/src/test/resources/org/springframework/cloud/stream/app/micrometer/common/pcf-scs-info.json rename to applications/stream-applications-core/common/stream-applications-micrometer-common/src/test/resources/org/springframework/cloud/stream/app/micrometer/common/pcf-scs-info.json diff --git a/applications/stream-applications-core/common/stream-apps-postprocessor-common/pom.xml b/applications/stream-applications-core/common/stream-applications-postprocessor-common/pom.xml similarity index 74% rename from applications/stream-applications-core/common/stream-apps-postprocessor-common/pom.xml rename to applications/stream-applications-core/common/stream-applications-postprocessor-common/pom.xml index 4ebcbe59..5448ff4d 100644 --- a/applications/stream-applications-core/common/stream-apps-postprocessor-common/pom.xml +++ b/applications/stream-applications-core/common/stream-applications-postprocessor-common/pom.xml @@ -2,14 +2,15 @@ - stream-apps-common + stream-applications-core org.springframework.cloud.stream.app 3.0.0.BUILD-SNAPSHOT + ../.. 4.0.0 - stream-apps-postprocessor-common - stream-apps-postprocessor-common + stream-applications-postprocessor-common + stream-applications-postprocessor-common diff --git a/applications/stream-applications-core/common/stream-apps-postprocessor-common/src/main/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessor.java b/applications/stream-applications-core/common/stream-applications-postprocessor-common/src/main/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessor.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-postprocessor-common/src/main/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessor.java rename to applications/stream-applications-core/common/stream-applications-postprocessor-common/src/main/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessor.java diff --git a/applications/stream-applications-core/common/stream-apps-postprocessor-common/src/test/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessorTests.java b/applications/stream-applications-core/common/stream-applications-postprocessor-common/src/test/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessorTests.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-postprocessor-common/src/test/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessorTests.java rename to applications/stream-applications-core/common/stream-applications-postprocessor-common/src/test/java/org/springframework/cloud/stream/app/postprocessor/ContentTypeEnvironmentPostProcessorTests.java diff --git a/applications/stream-applications-core/common/stream-apps-security-common/README.adoc b/applications/stream-applications-core/common/stream-applications-security-common/README.adoc similarity index 100% rename from applications/stream-applications-core/common/stream-apps-security-common/README.adoc rename to applications/stream-applications-core/common/stream-applications-security-common/README.adoc diff --git a/applications/stream-applications-core/common/stream-apps-security-common/pom.xml b/applications/stream-applications-core/common/stream-applications-security-common/pom.xml similarity index 91% rename from applications/stream-applications-core/common/stream-apps-security-common/pom.xml rename to applications/stream-applications-core/common/stream-applications-security-common/pom.xml index 75e41ea0..26c4f43e 100644 --- a/applications/stream-applications-core/common/stream-apps-security-common/pom.xml +++ b/applications/stream-applications-core/common/stream-applications-security-common/pom.xml @@ -3,13 +3,14 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - stream-apps-common + stream-applications-core org.springframework.cloud.stream.app 3.0.0.BUILD-SNAPSHOT + ../.. 4.0.0 - stream-apps-security-common + stream-applications-security-common diff --git a/applications/stream-applications-core/common/stream-apps-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebFluxSecurityAutoConfiguration.java b/applications/stream-applications-core/common/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebFluxSecurityAutoConfiguration.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebFluxSecurityAutoConfiguration.java rename to applications/stream-applications-core/common/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebFluxSecurityAutoConfiguration.java diff --git a/applications/stream-applications-core/common/stream-apps-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfiguration.java b/applications/stream-applications-core/common/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfiguration.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfiguration.java rename to applications/stream-applications-core/common/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfiguration.java diff --git a/applications/stream-applications-core/common/stream-apps-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfigurationProperties.java b/applications/stream-applications-core/common/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfigurationProperties.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfigurationProperties.java rename to applications/stream-applications-core/common/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/AppStarterWebSecurityAutoConfigurationProperties.java diff --git a/applications/stream-applications-core/common/stream-apps-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/OnHttpCsrfOrSecurityDisabled.java b/applications/stream-applications-core/common/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/OnHttpCsrfOrSecurityDisabled.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/OnHttpCsrfOrSecurityDisabled.java rename to applications/stream-applications-core/common/stream-applications-security-common/src/main/java/org/springframework/cloud/stream/app/security/common/OnHttpCsrfOrSecurityDisabled.java diff --git a/applications/stream-applications-core/common/stream-apps-security-common/src/main/resources/META-INF/spring.factories b/applications/stream-applications-core/common/stream-applications-security-common/src/main/resources/META-INF/spring.factories similarity index 100% rename from applications/stream-applications-core/common/stream-apps-security-common/src/main/resources/META-INF/spring.factories rename to applications/stream-applications-core/common/stream-applications-security-common/src/main/resources/META-INF/spring.factories diff --git a/applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/AbstractSecurityCommonTests.java b/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/AbstractSecurityCommonTests.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/AbstractSecurityCommonTests.java rename to applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/AbstractSecurityCommonTests.java diff --git a/applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityDisabledManagementSecurityEnabledTests.java b/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityDisabledManagementSecurityEnabledTests.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityDisabledManagementSecurityEnabledTests.java rename to applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityDisabledManagementSecurityEnabledTests.java diff --git a/applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java b/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java rename to applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java diff --git a/applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java b/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java rename to applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java diff --git a/applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityEnabledTests.java b/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityEnabledTests.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityEnabledTests.java rename to applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/ReactiveSecurityEnabledManagementSecurityEnabledTests.java diff --git a/applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityDisabledManagementSecurityEnabledTests.java b/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityDisabledManagementSecurityEnabledTests.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityDisabledManagementSecurityEnabledTests.java rename to applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityDisabledManagementSecurityEnabledTests.java diff --git a/applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java b/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java rename to applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledAuthorizedAccessTests.java diff --git a/applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java b/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java rename to applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityDisabledUnauthorizedAccessTests.java diff --git a/applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityEnabledTests.java b/applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityEnabledTests.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityEnabledTests.java rename to applications/stream-applications-core/common/stream-applications-security-common/src/test/java/org/springframework/cloud/stream/app/security/common/SecurityEnabledManagementSecurityEnabledTests.java diff --git a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/README.adoc b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/README.adoc similarity index 100% rename from applications/stream-applications-core/common/stream-apps-task-launch-request-common/README.adoc rename to applications/stream-applications-core/common/stream-applications-task-launch-request-common/README.adoc diff --git a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/pom.xml b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/pom.xml similarity index 86% rename from applications/stream-applications-core/common/stream-apps-task-launch-request-common/pom.xml rename to applications/stream-applications-core/common/stream-applications-task-launch-request-common/pom.xml index b370241c..0a0b5f82 100644 --- a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/pom.xml +++ b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/pom.xml @@ -3,14 +3,15 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - stream-apps-common + stream-applications-core org.springframework.cloud.stream.app 3.0.0.BUILD-SNAPSHOT + ../.. 4.0.0 - stream-apps-task-launch-request-common - stream-apps-task-launch-request-common + stream-applications-task-launch-request-common + stream-applications-task-launch-request-common diff --git a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/DataFlowTaskLaunchRequest.java b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/DataFlowTaskLaunchRequest.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/DataFlowTaskLaunchRequest.java rename to applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/DataFlowTaskLaunchRequest.java diff --git a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/DataFlowTaskLaunchRequestAutoConfiguration.java b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/DataFlowTaskLaunchRequestAutoConfiguration.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/DataFlowTaskLaunchRequestAutoConfiguration.java rename to applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/DataFlowTaskLaunchRequestAutoConfiguration.java diff --git a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/DataflowTaskLaunchRequestProperties.java b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/DataflowTaskLaunchRequestProperties.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/DataflowTaskLaunchRequestProperties.java rename to applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/DataflowTaskLaunchRequestProperties.java diff --git a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/ExpressionEvaluatingTaskNameMessageMapper.java b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/ExpressionEvaluatingTaskNameMessageMapper.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/ExpressionEvaluatingTaskNameMessageMapper.java rename to applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/ExpressionEvaluatingTaskNameMessageMapper.java diff --git a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/KeyValueListParser.java b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/KeyValueListParser.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/KeyValueListParser.java rename to applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/KeyValueListParser.java diff --git a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestFunction.java b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestFunction.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestFunction.java rename to applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestFunction.java diff --git a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestMessageProcessor.java b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestMessageProcessor.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestMessageProcessor.java rename to applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestMessageProcessor.java diff --git a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/support/CommandLineArgumentsMessageMapper.java b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/support/CommandLineArgumentsMessageMapper.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/support/CommandLineArgumentsMessageMapper.java rename to applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/support/CommandLineArgumentsMessageMapper.java diff --git a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/support/TaskLaunchRequestSupplier.java b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/support/TaskLaunchRequestSupplier.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/support/TaskLaunchRequestSupplier.java rename to applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/support/TaskLaunchRequestSupplier.java diff --git a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/support/TaskNameMessageMapper.java b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/support/TaskNameMessageMapper.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/support/TaskNameMessageMapper.java rename to applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/java/org/springframework/cloud/stream/app/tasklaunchrequest/support/TaskNameMessageMapper.java diff --git a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/resources/META-INF/spring-configuration-metadata-whitelist.properties b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/resources/META-INF/spring-configuration-metadata-whitelist.properties similarity index 100% rename from applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/resources/META-INF/spring-configuration-metadata-whitelist.properties rename to applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/resources/META-INF/spring-configuration-metadata-whitelist.properties diff --git a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/resources/META-INF/spring.factories b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/resources/META-INF/spring.factories similarity index 100% rename from applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/main/resources/META-INF/spring.factories rename to applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/main/resources/META-INF/spring.factories diff --git a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/test/java/org/springframework/cloud/stream/app/tasklaunchrequest/KeyValueListParserTests.java b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/test/java/org/springframework/cloud/stream/app/tasklaunchrequest/KeyValueListParserTests.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/test/java/org/springframework/cloud/stream/app/tasklaunchrequest/KeyValueListParserTests.java rename to applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/test/java/org/springframework/cloud/stream/app/tasklaunchrequest/KeyValueListParserTests.java diff --git a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/test/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestIntegrationTests.java b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/test/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestIntegrationTests.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/test/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestIntegrationTests.java rename to applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/test/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestIntegrationTests.java diff --git a/applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/test/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestPropertiesTests.java b/applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/test/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestPropertiesTests.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-task-launch-request-common/src/test/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestPropertiesTests.java rename to applications/stream-applications-core/common/stream-applications-task-launch-request-common/src/test/java/org/springframework/cloud/stream/app/tasklaunchrequest/TaskLaunchRequestPropertiesTests.java diff --git a/applications/stream-applications-core/common/stream-apps-test-support/pom.xml b/applications/stream-applications-core/common/stream-applications-test-support/pom.xml similarity index 86% rename from applications/stream-applications-core/common/stream-apps-test-support/pom.xml rename to applications/stream-applications-core/common/stream-applications-test-support/pom.xml index 7100d166..00375b55 100644 --- a/applications/stream-applications-core/common/stream-apps-test-support/pom.xml +++ b/applications/stream-applications-core/common/stream-applications-test-support/pom.xml @@ -2,13 +2,14 @@ - stream-apps-common + stream-applications-core org.springframework.cloud.stream.app 3.0.0.BUILD-SNAPSHOT + ../.. 4.0.0 - stream-apps-test-support + stream-applications-test-support diff --git a/applications/stream-applications-core/common/stream-apps-test-support/src/main/java/org/springframework/cloud/stream/app/test/BinderTestPropertiesInitializer.java b/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/BinderTestPropertiesInitializer.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-test-support/src/main/java/org/springframework/cloud/stream/app/test/BinderTestPropertiesInitializer.java rename to applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/BinderTestPropertiesInitializer.java diff --git a/applications/stream-applications-core/common/stream-apps-test-support/src/main/java/org/springframework/cloud/stream/app/test/file/remote/RemoteFileTestSupport.java b/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/file/remote/RemoteFileTestSupport.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-test-support/src/main/java/org/springframework/cloud/stream/app/test/file/remote/RemoteFileTestSupport.java rename to applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/file/remote/RemoteFileTestSupport.java diff --git a/applications/stream-applications-core/common/stream-apps-test-support/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSinkTestConfiguration.java b/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSinkTestConfiguration.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-test-support/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSinkTestConfiguration.java rename to applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSinkTestConfiguration.java diff --git a/applications/stream-applications-core/common/stream-apps-test-support/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSourceTestConfiguration.java b/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSourceTestConfiguration.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-test-support/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSourceTestConfiguration.java rename to applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/ip/IpSourceTestConfiguration.java diff --git a/applications/stream-applications-core/common/stream-apps-test-support/src/main/java/org/springframework/cloud/stream/app/test/script/ScriptableTestConfiguration.java b/applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/script/ScriptableTestConfiguration.java similarity index 100% rename from applications/stream-applications-core/common/stream-apps-test-support/src/main/java/org/springframework/cloud/stream/app/test/script/ScriptableTestConfiguration.java rename to applications/stream-applications-core/common/stream-applications-test-support/src/main/java/org/springframework/cloud/stream/app/test/script/ScriptableTestConfiguration.java diff --git a/applications/stream-applications-core/pom.xml b/applications/stream-applications-core/pom.xml index 280f7d6a..fb4410f6 100644 --- a/applications/stream-applications-core/pom.xml +++ b/applications/stream-applications-core/pom.xml @@ -6,7 +6,7 @@ stream-applications-core 3.0.0.BUILD-SNAPSHOT stream-applications-core - Stream Applications Core (Parent) + Stream Applications Core Parent pom @@ -54,7 +54,13 @@ - common + common/stream-applications-ftp-common + common/stream-applications-test-support + common/stream-applications-postprocessor-common + common/stream-applications-micrometer-common + common/stream-applications-metadata-store-common + common/stream-applications-task-launch-request-common + common/stream-applications-security-common