From 828805295d5724696fee21c42adad365a61a91c3 Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Sat, 22 Apr 2023 15:50:55 +0530 Subject: [PATCH 1/2] JAVA-20381 Moved modules --- .../dependency-exclusion}/README.md | 0 .../core-java-exclusions/pom.xml | 0 .../ExcludeDirectDependencyUnitTest.java | 0 .../dummy-surefire-junit47/pom.xml | 0 .../dependency-exclusion}/pom.xml | 3 +-- maven-modules/pom.xml | 22 ++++++++++--------- .../spring-bom}/README.md | 0 .../spring-bom}/pom.xml | 4 ++-- .../baeldung/spring/bom/HelloWorldApp.java | 0 .../baeldung/spring/bom/HelloWorldBean.java | 0 .../baeldung/spring/bom/HelloWorldConfig.java | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../apache-rocketmq}/README.md | 0 .../apache-rocketmq}/pom.xml | 4 ++-- .../rocketmq/consumer/CartEventConsumer.java | 0 .../rocketmq/event/CartItemEvent.java | 0 .../rocketmq/producer/CartEventProducer.java | 0 .../transaction/TransactionListenerImpl.java | 0 .../src/main/resources/application.properties | 0 messaging-modules/pom.xml | 1 + pom.xml | 8 ------- .../discord4j}/.gitignore | 0 .../discord4j}/README.md | 0 {discord4j => saas-modules/discord4j}/pom.xml | 5 ++--- .../baeldung/discordbot/BotConfiguration.java | 0 .../discordbot/DiscordBotApplication.java | 0 .../discordbot/events/EventListener.java | 0 .../events/MessageCreateListener.java | 0 .../discordbot/events/MessageListener.java | 0 .../events/MessageUpdateListener.java | 0 .../src/main/resources/application.yml | 0 .../discordbot/DiscordBotLiveTest.java | 0 saas-modules/pom.xml | 4 +++- {slack => saas-modules/slack}/README.md | 0 {slack => saas-modules/slack}/pom.xml | 2 +- .../examples/slack/DiskSpaceErrorChecker.java | 0 .../baeldung/examples/slack/ErrorChecker.java | 0 .../examples/slack/ErrorReporter.java | 0 .../baeldung/examples/slack/MainClass.java | 0 .../slack/SlackChannelErrorReporter.java | 0 .../slack/SlackUserErrorReporter.java | 0 .../slack}/src/main/resources/logback.xml | 0 43 files changed, 24 insertions(+), 29 deletions(-) rename {dependency-exclusion => maven-modules/dependency-exclusion}/README.md (100%) rename {dependency-exclusion => maven-modules/dependency-exclusion}/core-java-exclusions/pom.xml (100%) rename {dependency-exclusion => maven-modules/dependency-exclusion}/core-java-exclusions/src/test/java/com/sample/project/tests/ExcludeDirectDependencyUnitTest.java (100%) rename {dependency-exclusion => maven-modules/dependency-exclusion}/dummy-surefire-junit47/pom.xml (100%) rename {dependency-exclusion => maven-modules/dependency-exclusion}/pom.xml (96%) rename {spring-bom => maven-modules/spring-bom}/README.md (100%) rename {spring-bom => maven-modules/spring-bom}/pom.xml (93%) rename {spring-bom => maven-modules/spring-bom}/src/main/java/com/baeldung/spring/bom/HelloWorldApp.java (100%) rename {spring-bom => maven-modules/spring-bom}/src/main/java/com/baeldung/spring/bom/HelloWorldBean.java (100%) rename {spring-bom => maven-modules/spring-bom}/src/main/java/com/baeldung/spring/bom/HelloWorldConfig.java (100%) rename {spring-bom => maven-modules/spring-bom}/src/main/resources/logback.xml (100%) rename {spring-bom => maven-modules/spring-bom}/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {apache-rocketmq => messaging-modules/apache-rocketmq}/README.md (100%) rename {apache-rocketmq => messaging-modules/apache-rocketmq}/pom.xml (90%) rename {apache-rocketmq => messaging-modules/apache-rocketmq}/src/main/java/com/baeldung/rocketmq/consumer/CartEventConsumer.java (100%) rename {apache-rocketmq => messaging-modules/apache-rocketmq}/src/main/java/com/baeldung/rocketmq/event/CartItemEvent.java (100%) rename {apache-rocketmq => messaging-modules/apache-rocketmq}/src/main/java/com/baeldung/rocketmq/producer/CartEventProducer.java (100%) rename {apache-rocketmq => messaging-modules/apache-rocketmq}/src/main/java/com/baeldung/rocketmq/transaction/TransactionListenerImpl.java (100%) rename {apache-rocketmq => messaging-modules/apache-rocketmq}/src/main/resources/application.properties (100%) rename {discord4j => saas-modules/discord4j}/.gitignore (100%) rename {discord4j => saas-modules/discord4j}/README.md (100%) rename {discord4j => saas-modules/discord4j}/pom.xml (93%) rename {discord4j => saas-modules/discord4j}/src/main/java/com/baeldung/discordbot/BotConfiguration.java (100%) rename {discord4j => saas-modules/discord4j}/src/main/java/com/baeldung/discordbot/DiscordBotApplication.java (100%) rename {discord4j => saas-modules/discord4j}/src/main/java/com/baeldung/discordbot/events/EventListener.java (100%) rename {discord4j => saas-modules/discord4j}/src/main/java/com/baeldung/discordbot/events/MessageCreateListener.java (100%) rename {discord4j => saas-modules/discord4j}/src/main/java/com/baeldung/discordbot/events/MessageListener.java (100%) rename {discord4j => saas-modules/discord4j}/src/main/java/com/baeldung/discordbot/events/MessageUpdateListener.java (100%) rename {discord4j => saas-modules/discord4j}/src/main/resources/application.yml (100%) rename {discord4j => saas-modules/discord4j}/src/test/java/com/baeldung/discordbot/DiscordBotLiveTest.java (100%) rename {slack => saas-modules/slack}/README.md (100%) rename {slack => saas-modules/slack}/pom.xml (97%) rename {slack => saas-modules/slack}/src/main/java/com/baeldung/examples/slack/DiskSpaceErrorChecker.java (100%) rename {slack => saas-modules/slack}/src/main/java/com/baeldung/examples/slack/ErrorChecker.java (100%) rename {slack => saas-modules/slack}/src/main/java/com/baeldung/examples/slack/ErrorReporter.java (100%) rename {slack => saas-modules/slack}/src/main/java/com/baeldung/examples/slack/MainClass.java (100%) rename {slack => saas-modules/slack}/src/main/java/com/baeldung/examples/slack/SlackChannelErrorReporter.java (100%) rename {slack => saas-modules/slack}/src/main/java/com/baeldung/examples/slack/SlackUserErrorReporter.java (100%) rename {slack => saas-modules/slack}/src/main/resources/logback.xml (100%) diff --git a/dependency-exclusion/README.md b/maven-modules/dependency-exclusion/README.md similarity index 100% rename from dependency-exclusion/README.md rename to maven-modules/dependency-exclusion/README.md diff --git a/dependency-exclusion/core-java-exclusions/pom.xml b/maven-modules/dependency-exclusion/core-java-exclusions/pom.xml similarity index 100% rename from dependency-exclusion/core-java-exclusions/pom.xml rename to maven-modules/dependency-exclusion/core-java-exclusions/pom.xml diff --git a/dependency-exclusion/core-java-exclusions/src/test/java/com/sample/project/tests/ExcludeDirectDependencyUnitTest.java b/maven-modules/dependency-exclusion/core-java-exclusions/src/test/java/com/sample/project/tests/ExcludeDirectDependencyUnitTest.java similarity index 100% rename from dependency-exclusion/core-java-exclusions/src/test/java/com/sample/project/tests/ExcludeDirectDependencyUnitTest.java rename to maven-modules/dependency-exclusion/core-java-exclusions/src/test/java/com/sample/project/tests/ExcludeDirectDependencyUnitTest.java diff --git a/dependency-exclusion/dummy-surefire-junit47/pom.xml b/maven-modules/dependency-exclusion/dummy-surefire-junit47/pom.xml similarity index 100% rename from dependency-exclusion/dummy-surefire-junit47/pom.xml rename to maven-modules/dependency-exclusion/dummy-surefire-junit47/pom.xml diff --git a/dependency-exclusion/pom.xml b/maven-modules/dependency-exclusion/pom.xml similarity index 96% rename from dependency-exclusion/pom.xml rename to maven-modules/dependency-exclusion/pom.xml index ac83cc161a..13de16a57c 100644 --- a/dependency-exclusion/pom.xml +++ b/maven-modules/dependency-exclusion/pom.xml @@ -10,9 +10,8 @@ com.baeldung - parent-java + maven-modules 0.0.1-SNAPSHOT - ../parent-java diff --git a/maven-modules/pom.xml b/maven-modules/pom.xml index a7a3522ca8..dae55f1617 100644 --- a/maven-modules/pom.xml +++ b/maven-modules/pom.xml @@ -16,33 +16,35 @@ animal-sniffer-mvn-plugin - maven-archetype compiler-plugin-java-9 + dependency-exclusion + host-maven-repo-example + maven-archetype + maven-builder-plugin + maven-classifier maven-copy-files maven-custom-plugin maven-exec-plugin maven-generate-war maven-integration-test maven-multi-source + maven-parent-pom-resolution maven-plugins maven-polyglot + maven-printing-plugins maven-properties + maven-reactor + maven-repositories + maven-simple + maven-surefire-plugin maven-unused-dependencies maven-war-plugin + spring-bom optional-dependencies version-collision version-overriding-plugins versions-maven-plugin - maven-printing-plugins - maven-builder-plugin - host-maven-repo-example - maven-surefire-plugin - maven-parent-pom-resolution - maven-simple - maven-classifier - maven-repositories - maven-reactor diff --git a/spring-bom/README.md b/maven-modules/spring-bom/README.md similarity index 100% rename from spring-bom/README.md rename to maven-modules/spring-bom/README.md diff --git a/spring-bom/pom.xml b/maven-modules/spring-bom/pom.xml similarity index 93% rename from spring-bom/pom.xml rename to maven-modules/spring-bom/pom.xml index 7ba21ee285..93d0bdc458 100644 --- a/spring-bom/pom.xml +++ b/maven-modules/spring-bom/pom.xml @@ -10,8 +10,8 @@ com.baeldung - parent-modules - 1.0.0-SNAPSHOT + maven-modules + 0.0.1-SNAPSHOT diff --git a/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldApp.java b/maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldApp.java similarity index 100% rename from spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldApp.java rename to maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldApp.java diff --git a/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldBean.java b/maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldBean.java similarity index 100% rename from spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldBean.java rename to maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldBean.java diff --git a/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldConfig.java b/maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldConfig.java similarity index 100% rename from spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldConfig.java rename to maven-modules/spring-bom/src/main/java/com/baeldung/spring/bom/HelloWorldConfig.java diff --git a/spring-bom/src/main/resources/logback.xml b/maven-modules/spring-bom/src/main/resources/logback.xml similarity index 100% rename from spring-bom/src/main/resources/logback.xml rename to maven-modules/spring-bom/src/main/resources/logback.xml diff --git a/spring-bom/src/test/java/com/baeldung/SpringContextTest.java b/maven-modules/spring-bom/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-bom/src/test/java/com/baeldung/SpringContextTest.java rename to maven-modules/spring-bom/src/test/java/com/baeldung/SpringContextTest.java diff --git a/apache-rocketmq/README.md b/messaging-modules/apache-rocketmq/README.md similarity index 100% rename from apache-rocketmq/README.md rename to messaging-modules/apache-rocketmq/README.md diff --git a/apache-rocketmq/pom.xml b/messaging-modules/apache-rocketmq/pom.xml similarity index 90% rename from apache-rocketmq/pom.xml rename to messaging-modules/apache-rocketmq/pom.xml index 48399b6d51..a362644de3 100644 --- a/apache-rocketmq/pom.xml +++ b/messaging-modules/apache-rocketmq/pom.xml @@ -9,8 +9,8 @@ com.baeldung - parent-modules - 1.0.0-SNAPSHOT + messaging-modules + 0.0.1-SNAPSHOT diff --git a/apache-rocketmq/src/main/java/com/baeldung/rocketmq/consumer/CartEventConsumer.java b/messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/consumer/CartEventConsumer.java similarity index 100% rename from apache-rocketmq/src/main/java/com/baeldung/rocketmq/consumer/CartEventConsumer.java rename to messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/consumer/CartEventConsumer.java diff --git a/apache-rocketmq/src/main/java/com/baeldung/rocketmq/event/CartItemEvent.java b/messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/event/CartItemEvent.java similarity index 100% rename from apache-rocketmq/src/main/java/com/baeldung/rocketmq/event/CartItemEvent.java rename to messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/event/CartItemEvent.java diff --git a/apache-rocketmq/src/main/java/com/baeldung/rocketmq/producer/CartEventProducer.java b/messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/producer/CartEventProducer.java similarity index 100% rename from apache-rocketmq/src/main/java/com/baeldung/rocketmq/producer/CartEventProducer.java rename to messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/producer/CartEventProducer.java diff --git a/apache-rocketmq/src/main/java/com/baeldung/rocketmq/transaction/TransactionListenerImpl.java b/messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/transaction/TransactionListenerImpl.java similarity index 100% rename from apache-rocketmq/src/main/java/com/baeldung/rocketmq/transaction/TransactionListenerImpl.java rename to messaging-modules/apache-rocketmq/src/main/java/com/baeldung/rocketmq/transaction/TransactionListenerImpl.java diff --git a/apache-rocketmq/src/main/resources/application.properties b/messaging-modules/apache-rocketmq/src/main/resources/application.properties similarity index 100% rename from apache-rocketmq/src/main/resources/application.properties rename to messaging-modules/apache-rocketmq/src/main/resources/application.properties diff --git a/messaging-modules/pom.xml b/messaging-modules/pom.xml index 47e0730148..71ff25d71b 100644 --- a/messaging-modules/pom.xml +++ b/messaging-modules/pom.xml @@ -16,6 +16,7 @@ apache-camel + apache-rocketmq jgroups rabbitmq spring-amqp diff --git a/pom.xml b/pom.xml index bef7603cff..a80ee4430c 100644 --- a/pom.xml +++ b/pom.xml @@ -413,7 +413,6 @@ spring-4 spring-aop - spring-bom spring-cloud-modules @@ -593,7 +592,6 @@ spring-4 - spring-bom spring-cloud-modules @@ -838,7 +836,6 @@ apache-olingo apache-poi-2 - apache-rocketmq apache-thrift apache-tika @@ -851,7 +848,6 @@ bazel google-auto-project ddd - discord4j disruptor dozer dubbo @@ -908,7 +904,6 @@ protobuffer reactor-core rsocket - slack @@ -1089,7 +1084,6 @@ apache-olingo apache-poi-2 - apache-rocketmq apache-thrift apache-tika @@ -1102,7 +1096,6 @@ bazel google-auto-project ddd - discord4j disruptor dozer @@ -1161,7 +1154,6 @@ protobuffer reactor-core rsocket - slack diff --git a/discord4j/.gitignore b/saas-modules/discord4j/.gitignore similarity index 100% rename from discord4j/.gitignore rename to saas-modules/discord4j/.gitignore diff --git a/discord4j/README.md b/saas-modules/discord4j/README.md similarity index 100% rename from discord4j/README.md rename to saas-modules/discord4j/README.md diff --git a/discord4j/pom.xml b/saas-modules/discord4j/pom.xml similarity index 93% rename from discord4j/pom.xml rename to saas-modules/discord4j/pom.xml index 086adebee5..ff398dd1a3 100644 --- a/discord4j/pom.xml +++ b/saas-modules/discord4j/pom.xml @@ -9,9 +9,8 @@ com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../parent-boot-2 + saas-modules + 1.0.0-SNAPSHOT diff --git a/discord4j/src/main/java/com/baeldung/discordbot/BotConfiguration.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/BotConfiguration.java similarity index 100% rename from discord4j/src/main/java/com/baeldung/discordbot/BotConfiguration.java rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/BotConfiguration.java diff --git a/discord4j/src/main/java/com/baeldung/discordbot/DiscordBotApplication.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/DiscordBotApplication.java similarity index 100% rename from discord4j/src/main/java/com/baeldung/discordbot/DiscordBotApplication.java rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/DiscordBotApplication.java diff --git a/discord4j/src/main/java/com/baeldung/discordbot/events/EventListener.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/EventListener.java similarity index 100% rename from discord4j/src/main/java/com/baeldung/discordbot/events/EventListener.java rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/EventListener.java diff --git a/discord4j/src/main/java/com/baeldung/discordbot/events/MessageCreateListener.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageCreateListener.java similarity index 100% rename from discord4j/src/main/java/com/baeldung/discordbot/events/MessageCreateListener.java rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageCreateListener.java diff --git a/discord4j/src/main/java/com/baeldung/discordbot/events/MessageListener.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageListener.java similarity index 100% rename from discord4j/src/main/java/com/baeldung/discordbot/events/MessageListener.java rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageListener.java diff --git a/discord4j/src/main/java/com/baeldung/discordbot/events/MessageUpdateListener.java b/saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageUpdateListener.java similarity index 100% rename from discord4j/src/main/java/com/baeldung/discordbot/events/MessageUpdateListener.java rename to saas-modules/discord4j/src/main/java/com/baeldung/discordbot/events/MessageUpdateListener.java diff --git a/discord4j/src/main/resources/application.yml b/saas-modules/discord4j/src/main/resources/application.yml similarity index 100% rename from discord4j/src/main/resources/application.yml rename to saas-modules/discord4j/src/main/resources/application.yml diff --git a/discord4j/src/test/java/com/baeldung/discordbot/DiscordBotLiveTest.java b/saas-modules/discord4j/src/test/java/com/baeldung/discordbot/DiscordBotLiveTest.java similarity index 100% rename from discord4j/src/test/java/com/baeldung/discordbot/DiscordBotLiveTest.java rename to saas-modules/discord4j/src/test/java/com/baeldung/discordbot/DiscordBotLiveTest.java diff --git a/saas-modules/pom.xml b/saas-modules/pom.xml index 7e8adebdd9..16ed50918c 100644 --- a/saas-modules/pom.xml +++ b/saas-modules/pom.xml @@ -16,11 +16,13 @@ + discord4j jira-rest-integration + sentry-servlet + slack stripe twilio twitter4j - sentry-servlet diff --git a/slack/README.md b/saas-modules/slack/README.md similarity index 100% rename from slack/README.md rename to saas-modules/slack/README.md diff --git a/slack/pom.xml b/saas-modules/slack/pom.xml similarity index 97% rename from slack/pom.xml rename to saas-modules/slack/pom.xml index 690bf5132c..326167c055 100644 --- a/slack/pom.xml +++ b/saas-modules/slack/pom.xml @@ -11,7 +11,7 @@ com.baeldung - parent-modules + saas-modules 1.0.0-SNAPSHOT diff --git a/slack/src/main/java/com/baeldung/examples/slack/DiskSpaceErrorChecker.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/DiskSpaceErrorChecker.java similarity index 100% rename from slack/src/main/java/com/baeldung/examples/slack/DiskSpaceErrorChecker.java rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/DiskSpaceErrorChecker.java diff --git a/slack/src/main/java/com/baeldung/examples/slack/ErrorChecker.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/ErrorChecker.java similarity index 100% rename from slack/src/main/java/com/baeldung/examples/slack/ErrorChecker.java rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/ErrorChecker.java diff --git a/slack/src/main/java/com/baeldung/examples/slack/ErrorReporter.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/ErrorReporter.java similarity index 100% rename from slack/src/main/java/com/baeldung/examples/slack/ErrorReporter.java rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/ErrorReporter.java diff --git a/slack/src/main/java/com/baeldung/examples/slack/MainClass.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/MainClass.java similarity index 100% rename from slack/src/main/java/com/baeldung/examples/slack/MainClass.java rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/MainClass.java diff --git a/slack/src/main/java/com/baeldung/examples/slack/SlackChannelErrorReporter.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/SlackChannelErrorReporter.java similarity index 100% rename from slack/src/main/java/com/baeldung/examples/slack/SlackChannelErrorReporter.java rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/SlackChannelErrorReporter.java diff --git a/slack/src/main/java/com/baeldung/examples/slack/SlackUserErrorReporter.java b/saas-modules/slack/src/main/java/com/baeldung/examples/slack/SlackUserErrorReporter.java similarity index 100% rename from slack/src/main/java/com/baeldung/examples/slack/SlackUserErrorReporter.java rename to saas-modules/slack/src/main/java/com/baeldung/examples/slack/SlackUserErrorReporter.java diff --git a/slack/src/main/resources/logback.xml b/saas-modules/slack/src/main/resources/logback.xml similarity index 100% rename from slack/src/main/resources/logback.xml rename to saas-modules/slack/src/main/resources/logback.xml From 1bc733cb07b7e909414b79517ab9954c03bb8167 Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Mon, 24 Apr 2023 22:08:01 +0530 Subject: [PATCH 2/2] JAVA-20381 opening java.lang for the surefire --- maven-modules/pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/maven-modules/pom.xml b/maven-modules/pom.xml index dae55f1617..f7bba3a8ff 100644 --- a/maven-modules/pom.xml +++ b/maven-modules/pom.xml @@ -64,4 +64,18 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + + + --add-opens java.base/java.lang=ALL-UNNAMED + + + + + + \ No newline at end of file