From 8bc65bc0caabecbd441f90477bafb94623cb9535 Mon Sep 17 00:00:00 2001 From: Aqsa Malik Date: Wed, 6 Sep 2023 16:00:40 -0400 Subject: [PATCH] Fix POM files in coffee kata and coffee kata solution Signed-off-by: Aqsa Malik --- .github/workflows/solutions.yml | 2 +- .../{new-java-features-solutions => }/pom.xml | 44 ++++++++-------- .../codekatas/coffeekata/CoffeeShopOrder.java | 0 .../bnymellon/codekatas/coffeekata/Item.java | 0 .../coffeekata/beverage/Americano.java | 0 .../coffeekata/beverage/Beverage.java | 0 .../coffeekata/beverage/CoffeeDrink.java | 0 .../coffeekata/beverage/DrinkTemperature.java | 0 .../coffeekata/beverage/FlavorSyrup.java | 0 .../codekatas/coffeekata/beverage/Latte.java | 0 .../coffeekata/beverage/Macchiato.java | 0 .../coffeekata/beverage/MilkType.java | 0 .../codekatas/coffeekata/beverage/Tea.java | 0 .../coffeekata/beverage/TeaType.java | 0 .../codekatas/coffeekata/food/Bagel.java | 0 .../codekatas/coffeekata/food/BagelType.java | 0 .../codekatas/coffeekata/food/BakeryItem.java | 0 .../codekatas/coffeekata/food/Cookie.java | 0 .../codekatas/coffeekata/food/CookieType.java | 0 .../codekatas/coffeekata/food/Donut.java | 0 .../codekatas/coffeekata/food/DonutType.java | 0 .../codekatas/coffeekata/food/SpreadType.java | 0 .../src/test/java/CoffeeShopTest.java | 0 coffee-shop-kata/new-java-features/pom.xml | 19 ++----- .../src/test/java/CoffeeShopTest.java | 2 +- coffee-shop-kata/old-java-features/pom.xml | 12 +---- coffee-shop-kata/pom.xml | 50 +++++++++++++------ pom.xml | 2 +- 28 files changed, 64 insertions(+), 67 deletions(-) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/pom.xml (73%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/CoffeeShopOrder.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/Item.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/beverage/Americano.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/beverage/Beverage.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/beverage/CoffeeDrink.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/beverage/DrinkTemperature.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/beverage/FlavorSyrup.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/beverage/Latte.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/beverage/Macchiato.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/beverage/MilkType.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/beverage/Tea.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/beverage/TeaType.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/food/Bagel.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/food/BagelType.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/food/BakeryItem.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/food/Cookie.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/food/CookieType.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/food/Donut.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/food/DonutType.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/main/java/bnymellon/codekatas/coffeekata/food/SpreadType.java (100%) rename coffee-shop-kata-solutions/{new-java-features-solutions => }/src/test/java/CoffeeShopTest.java (100%) diff --git a/.github/workflows/solutions.yml b/.github/workflows/solutions.yml index 393818d7..1605fe55 100644 --- a/.github/workflows/solutions.yml +++ b/.github/workflows/solutions.yml @@ -47,6 +47,6 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Maven - run: mvn -pl calendar-kata-solutions,code-point-kata-solutions,deck-of-cards-kata-solutions,donut-kata-solutions,java-lambda-kata-solutions,pitest-mutation-kata-solutions,coffee-shop-kata-solutions/new-java-features-solutions,kata-of-katas-solutions verify -Dmaven.javadoc.skip=true -B -V --no-transfer-progress + run: mvn -pl calendar-kata-solutions,code-point-kata-solutions,deck-of-cards-kata-solutions,donut-kata-solutions,java-lambda-kata-solutions,pitest-mutation-kata-solutions,coffee-shop-kata-solutions,kata-of-katas-solutions verify -Dmaven.javadoc.skip=true -B -V --no-transfer-progress env: MAVEN_OPTS: "-Dmaven.repo.local=$HOME/.m2/repository -Xmx1g -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss:SSS" diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/pom.xml b/coffee-shop-kata-solutions/pom.xml similarity index 73% rename from coffee-shop-kata-solutions/new-java-features-solutions/pom.xml rename to coffee-shop-kata-solutions/pom.xml index 5eeffde9..5dbcb832 100644 --- a/coffee-shop-kata-solutions/new-java-features-solutions/pom.xml +++ b/coffee-shop-kata-solutions/pom.xml @@ -21,8 +21,14 @@ 4.0.0 bnymellon.codekatas - 1.0.0 - new-java-features-solutions + 1.0.0-SNAPSHOT + + + org.junit.jupiter + junit-jupiter + + + coffee-shop-kata-solutions Coffee Shop Kata Solutions @@ -32,34 +38,28 @@ UTF-8 - 20 - 20 + 21 + 21 5.9.3 - - - org.junit.jupiter - junit-jupiter - ${junit5.version} - test - - + + + + org.junit.jupiter + junit-jupiter + ${junit5.version} + test + + + + - - org.apache.maven.plugins - maven-compiler-plugin - - 21 - 21 - - 3.11.0 - org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + 3.1.2 --enable-preview diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/CoffeeShopOrder.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/CoffeeShopOrder.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/CoffeeShopOrder.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/CoffeeShopOrder.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/Item.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/Item.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/Item.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/Item.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Americano.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Americano.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Americano.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Americano.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Beverage.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Beverage.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Beverage.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Beverage.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/CoffeeDrink.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/CoffeeDrink.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/CoffeeDrink.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/CoffeeDrink.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/DrinkTemperature.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/DrinkTemperature.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/DrinkTemperature.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/DrinkTemperature.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/FlavorSyrup.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/FlavorSyrup.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/FlavorSyrup.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/FlavorSyrup.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Latte.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Latte.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Latte.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Latte.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Macchiato.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Macchiato.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Macchiato.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Macchiato.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/MilkType.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/MilkType.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/MilkType.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/MilkType.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Tea.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Tea.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Tea.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/Tea.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/TeaType.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/TeaType.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/TeaType.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/beverage/TeaType.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Bagel.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Bagel.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Bagel.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Bagel.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/BagelType.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/BagelType.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/BagelType.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/BagelType.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/BakeryItem.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/BakeryItem.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/BakeryItem.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/BakeryItem.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Cookie.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Cookie.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Cookie.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Cookie.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/CookieType.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/CookieType.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/CookieType.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/CookieType.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Donut.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Donut.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Donut.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/Donut.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/DonutType.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/DonutType.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/DonutType.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/DonutType.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/SpreadType.java b/coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/SpreadType.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/SpreadType.java rename to coffee-shop-kata-solutions/src/main/java/bnymellon/codekatas/coffeekata/food/SpreadType.java diff --git a/coffee-shop-kata-solutions/new-java-features-solutions/src/test/java/CoffeeShopTest.java b/coffee-shop-kata-solutions/src/test/java/CoffeeShopTest.java similarity index 100% rename from coffee-shop-kata-solutions/new-java-features-solutions/src/test/java/CoffeeShopTest.java rename to coffee-shop-kata-solutions/src/test/java/CoffeeShopTest.java diff --git a/coffee-shop-kata/new-java-features/pom.xml b/coffee-shop-kata/new-java-features/pom.xml index a3e71cfd..5f382353 100644 --- a/coffee-shop-kata/new-java-features/pom.xml +++ b/coffee-shop-kata/new-java-features/pom.xml @@ -21,7 +21,7 @@ 4.0.0 bnymellon.codekatas - 1.0.0 + 1.0.0-SNAPSHOT new-java-features Coffee Shop Kata @@ -32,8 +32,8 @@ UTF-8 - 20 - 20 + 21 + 21 5.9.3 @@ -44,18 +44,5 @@ ${junit5.version} - - - - org.apache.maven.plugins - maven-compiler-plugin - - 21 - 21 - - 3.11.0 - - - \ No newline at end of file diff --git a/coffee-shop-kata/new-java-features/src/test/java/CoffeeShopTest.java b/coffee-shop-kata/new-java-features/src/test/java/CoffeeShopTest.java index 022bf65a..ff5e1b72 100644 --- a/coffee-shop-kata/new-java-features/src/test/java/CoffeeShopTest.java +++ b/coffee-shop-kata/new-java-features/src/test/java/CoffeeShopTest.java @@ -38,7 +38,7 @@ public class CoffeeShopTest { - List itemList; + private List itemList; private CoffeeShopOrder coffeeShopOrder; private Bagel bagel1; private Cookie cookie1; diff --git a/coffee-shop-kata/old-java-features/pom.xml b/coffee-shop-kata/old-java-features/pom.xml index 5ad94454..0b8d8839 100644 --- a/coffee-shop-kata/old-java-features/pom.xml +++ b/coffee-shop-kata/old-java-features/pom.xml @@ -21,7 +21,7 @@ 4.0.0 bnymellon.codekatas - 1.0.0 + 1.0.0-SNAPSHOT old-java-features Coffee Shop Kata @@ -45,14 +45,4 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - - - \ No newline at end of file diff --git a/coffee-shop-kata/pom.xml b/coffee-shop-kata/pom.xml index 38933f76..9502845c 100644 --- a/coffee-shop-kata/pom.xml +++ b/coffee-shop-kata/pom.xml @@ -1,4 +1,19 @@ + 4.0.0 bnymellon.codekatas + 1.0.0-SNAPSHOT coffee-shop-kata - 1.0.0 coffee-shop-kata pom UTF-8 - 20 - 20 + + 21 + 21 + 5.9.3 @@ -23,25 +40,28 @@ old-java-features - - - - - maven-compiler-plugin - 3.11.0 - - - - - org.junit.jupiter junit-jupiter - 5.9.2 + ${junit5.version} test + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.1.2 + + --enable-preview + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1f891f55..ccb42025 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,6 @@ pitest-mutation-kata pitest-mutation-kata-solutions coffee-shop-kata - coffee-shop-kata-solutions/new-java-features-solutions + coffee-shop-kata-solutions