Skip to content

Commit

Permalink
Fix POM files in coffee kata and coffee kata solution
Browse files Browse the repository at this point in the history
Signed-off-by: Aqsa Malik <[email protected]>
  • Loading branch information
aqsa505 committed Sep 11, 2023
1 parent 720e906 commit 8bc65bc
Show file tree
Hide file tree
Showing 28 changed files with 64 additions and 67 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/solutions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,14 @@
<modelVersion>4.0.0</modelVersion>

<groupId>bnymellon.codekatas</groupId>
<version>1.0.0</version>
<artifactId>new-java-features-solutions</artifactId>
<version>1.0.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
</dependency>
</dependencies>
<artifactId>coffee-shop-kata-solutions</artifactId>

<name>Coffee Shop Kata Solutions</name>
<description>
Expand All @@ -32,34 +38,28 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven.compiler.source>20</maven.compiler.source>
<maven.compiler.target>20</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<junit5.version>5.9.3</junit5.version>
</properties>

<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit5.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${junit5.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>21</source>
<target>21</target>
</configuration>
<version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<version>3.1.2</version>
<configuration>
<argLine>--enable-preview</argLine>
</configuration>
Expand Down
19 changes: 3 additions & 16 deletions coffee-shop-kata/new-java-features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>bnymellon.codekatas</groupId>
<version>1.0.0</version>
<version>1.0.0-SNAPSHOT</version>
<artifactId>new-java-features</artifactId>

<name>Coffee Shop Kata</name>
Expand All @@ -32,8 +32,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven.compiler.source>20</maven.compiler.source>
<maven.compiler.target>20</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<junit5.version>5.9.3</junit5.version>
</properties>

Expand All @@ -44,18 +44,5 @@
<version>${junit5.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>21</source>
<target>21</target>
</configuration>
<version>3.11.0</version>
</plugin>
</plugins>
</build>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
public class CoffeeShopTest
{

List<Item> itemList;
private List<Item> itemList;
private CoffeeShopOrder coffeeShopOrder;
private Bagel bagel1;
private Cookie cookie1;
Expand Down
12 changes: 1 addition & 11 deletions coffee-shop-kata/old-java-features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>

<groupId>bnymellon.codekatas</groupId>
<version>1.0.0</version>
<version>1.0.0-SNAPSHOT</version>
<artifactId>old-java-features</artifactId>

<name>Coffee Shop Kata</name>
Expand All @@ -45,14 +45,4 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
</plugin>
</plugins>
</build>

</project>
50 changes: 35 additions & 15 deletions coffee-shop-kata/pom.xml
Original file line number Diff line number Diff line change
@@ -1,47 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2023 The Bank of New York Mellon.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>bnymellon.codekatas</groupId>
<version>1.0.0-SNAPSHOT</version>
<artifactId>coffee-shop-kata</artifactId>
<version>1.0.0</version>

<name>coffee-shop-kata</name>
<packaging>pom</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>20</maven.compiler.source>
<maven.compiler.target>20</maven.compiler.target>

<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<junit5.version>5.9.3</junit5.version>
</properties>

<modules>
<module>new-java-features</module>
<module>old-java-features</module>
</modules>

<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.9.2</version>
<version>${junit5.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.1.2</version>
<configuration>
<argLine>--enable-preview</argLine>
</configuration>
</plugin>
</plugins>
</build>

</project>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@
<module>pitest-mutation-kata</module>
<module>pitest-mutation-kata-solutions</module>
<module>coffee-shop-kata</module>
<module>coffee-shop-kata-solutions/new-java-features-solutions</module>
<module>coffee-shop-kata-solutions</module>
</modules>
</project>

0 comments on commit 8bc65bc

Please sign in to comment.