diff --git a/examples/pom.xml b/examples/pom.xml index 711e9cd061..0de7c4b55b 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -19,7 +19,7 @@ com.sun.mail jakarta.mail - 2.0.1 + 2.0.2 com.google.inject diff --git a/grader/pom.xml b/grader/pom.xml index d4eb30fcf8..f3b42add67 100644 --- a/grader/pom.xml +++ b/grader/pom.xml @@ -14,7 +14,7 @@ com.sun.mail jakarta.mail - 2.0.1 + 2.0.2 io.github.davidwhitlock.joy @@ -29,7 +29,7 @@ ch.qos.logback logback-classic - 1.5.12 + 1.5.19 com.google.inject diff --git a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/it/java/Project1IT.java b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/it/java/Project1IT.java index 546491d6f8..67ab1c7faa 100644 --- a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/it/java/Project1IT.java +++ b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/it/java/Project1IT.java @@ -27,7 +27,7 @@ private MainMethodResult invokeMain(String... args) { @Test void testNoCommandLineArguments() { MainMethodResult result = invokeMain(); - assertThat(result.getTextWrittenToStandardError(), containsString("Missing command line arguments")); + assertThat(result.getTextWrittenToStandardError(), containsString("Missing airline information")); } } \ No newline at end of file diff --git a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/main/java/Project1.java b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/main/java/Project1.java index 5ef72344a0..ecc1224d27 100644 --- a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/main/java/Project1.java +++ b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/main/java/Project1.java @@ -17,7 +17,7 @@ static boolean isValidDateAndTime(String dateAndTime) { public static void main(String[] args) { Flight flight = new Flight(); // Refer to one of Dave's classes so that we can be sure it is on the classpath - System.err.println("Missing command line arguments"); + System.err.println("Missing airline information"); for (String arg : args) { System.out.println(arg); } diff --git a/projects-parent/archetypes-parent/airline-archetype/src/test/resources/projects/basic/verify.groovy b/projects-parent/archetypes-parent/airline-archetype/src/test/resources/projects/basic/verify.groovy index 55b51cc337..0c8ce76ac2 100644 --- a/projects-parent/archetypes-parent/airline-archetype/src/test/resources/projects/basic/verify.groovy +++ b/projects-parent/archetypes-parent/airline-archetype/src/test/resources/projects/basic/verify.groovy @@ -13,6 +13,6 @@ String jarCommand = "java -jar ${projectDir}/target/basic-0.1-SNAPSHOT.jar" def execution = jarCommand.execute() execution.waitFor() String stderr = execution.err.text -if (!stderr.contains("Missing command line arguments")) { +if (!stderr.contains("Missing airline information")) { throw new IllegalStateException("Running jar returned \"" + stderr + "\""); } \ No newline at end of file diff --git a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/it/java/Project1IT.java b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/it/java/Project1IT.java index 7e601a9f4a..8494501318 100644 --- a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/it/java/Project1IT.java +++ b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/it/java/Project1IT.java @@ -27,7 +27,7 @@ private MainMethodResult invokeMain(String... args) { @Test void testNoCommandLineArguments() { MainMethodResult result = invokeMain(); - assertThat(result.getTextWrittenToStandardError(), containsString("Missing command line arguments")); + assertThat(result.getTextWrittenToStandardError(), containsString("Missing appointment book information")); } } \ No newline at end of file diff --git a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/main/java/Project1.java b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/main/java/Project1.java index 544e23df81..fe2b5b91d3 100644 --- a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/main/java/Project1.java +++ b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/main/java/Project1.java @@ -17,7 +17,7 @@ static boolean isValidDateAndTime(String dateAndTime) { public static void main(String[] args) { Appointment appointment = new Appointment(); // Refer to one of Dave's classes so that we can be sure it is on the classpath - System.err.println("Missing command line arguments"); + System.err.println("Missing appointment book information"); for (String arg : args) { System.out.println(arg); } diff --git a/projects-parent/archetypes-parent/apptbook-archetype/src/test/resources/projects/basic/verify.groovy b/projects-parent/archetypes-parent/apptbook-archetype/src/test/resources/projects/basic/verify.groovy index 55b51cc337..9f20632aa2 100644 --- a/projects-parent/archetypes-parent/apptbook-archetype/src/test/resources/projects/basic/verify.groovy +++ b/projects-parent/archetypes-parent/apptbook-archetype/src/test/resources/projects/basic/verify.groovy @@ -13,6 +13,6 @@ String jarCommand = "java -jar ${projectDir}/target/basic-0.1-SNAPSHOT.jar" def execution = jarCommand.execute() execution.waitFor() String stderr = execution.err.text -if (!stderr.contains("Missing command line arguments")) { +if (!stderr.contains("Missing appointment book information")) { throw new IllegalStateException("Running jar returned \"" + stderr + "\""); } \ No newline at end of file diff --git a/projects-parent/archetypes-parent/java-koans-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/java-koans-archetype/src/main/resources/archetype-resources/pom.xml index cb9d032125..d8ce4d0cec 100644 --- a/projects-parent/archetypes-parent/java-koans-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/java-koans-archetype/src/main/resources/archetype-resources/pom.xml @@ -50,7 +50,7 @@ io.github.davidwhitlock.joy.com.sandwich koans-lib - 1.2.2 + 1.2.3-SNAPSHOT diff --git a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/it/java/Project1IT.java b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/it/java/Project1IT.java index eba5ed5d57..a30d20646f 100644 --- a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/it/java/Project1IT.java +++ b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/it/java/Project1IT.java @@ -27,7 +27,7 @@ private MainMethodResult invokeMain(String... args) { @Test void testNoCommandLineArguments() { MainMethodResult result = invokeMain(); - assertThat(result.getTextWrittenToStandardError(), containsString("Missing command line arguments")); + assertThat(result.getTextWrittenToStandardError(), containsString("Missing phone bill information")); } } \ No newline at end of file diff --git a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/main/java/Project1.java b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/main/java/Project1.java index 1c5337ddba..677ffb69dc 100644 --- a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/main/java/Project1.java +++ b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/main/java/Project1.java @@ -17,7 +17,7 @@ static boolean isValidDateAndTime(String dateAndTime) { public static void main(String[] args) { PhoneCall call = new PhoneCall(); // Refer to one of Dave's classes so that we can be sure it is on the classpath - System.err.println("Missing command line arguments"); + System.err.println("Missing phone bill information"); for (String arg : args) { System.out.println(arg); } diff --git a/projects-parent/archetypes-parent/phonebill-archetype/src/test/resources/projects/basic/verify.groovy b/projects-parent/archetypes-parent/phonebill-archetype/src/test/resources/projects/basic/verify.groovy index 55b51cc337..81246017f4 100644 --- a/projects-parent/archetypes-parent/phonebill-archetype/src/test/resources/projects/basic/verify.groovy +++ b/projects-parent/archetypes-parent/phonebill-archetype/src/test/resources/projects/basic/verify.groovy @@ -13,6 +13,6 @@ String jarCommand = "java -jar ${projectDir}/target/basic-0.1-SNAPSHOT.jar" def execution = jarCommand.execute() execution.waitFor() String stderr = execution.err.text -if (!stderr.contains("Missing command line arguments")) { +if (!stderr.contains("Missing phone bill information")) { throw new IllegalStateException("Running jar returned \"" + stderr + "\""); } \ No newline at end of file diff --git a/projects-parent/originals-parent/airline/src/it/java/edu/pdx/cs/joy/airline/Project1IT.java b/projects-parent/originals-parent/airline/src/it/java/edu/pdx/cs/joy/airline/Project1IT.java index 884e9ccf37..a5ad79ba88 100644 --- a/projects-parent/originals-parent/airline/src/it/java/edu/pdx/cs/joy/airline/Project1IT.java +++ b/projects-parent/originals-parent/airline/src/it/java/edu/pdx/cs/joy/airline/Project1IT.java @@ -24,7 +24,7 @@ private MainMethodResult invokeMain(String... args) { @Test void testNoCommandLineArguments() { MainMethodResult result = invokeMain(); - assertThat(result.getTextWrittenToStandardError(), containsString("Missing command line arguments")); + assertThat(result.getTextWrittenToStandardError(), containsString("Missing airline information")); } } \ No newline at end of file diff --git a/projects-parent/originals-parent/airline/src/main/java/edu/pdx/cs/joy/airline/Project1.java b/projects-parent/originals-parent/airline/src/main/java/edu/pdx/cs/joy/airline/Project1.java index dfe2607f54..b4542da3ca 100644 --- a/projects-parent/originals-parent/airline/src/main/java/edu/pdx/cs/joy/airline/Project1.java +++ b/projects-parent/originals-parent/airline/src/main/java/edu/pdx/cs/joy/airline/Project1.java @@ -14,7 +14,7 @@ static boolean isValidDateAndTime(String dateAndTime) { public static void main(String[] args) { Flight flight = new Flight(); // Refer to one of Dave's classes so that we can be sure it is on the classpath - System.err.println("Missing command line arguments"); + System.err.println("Missing airline information"); for (String arg : args) { System.out.println(arg); } diff --git a/projects-parent/originals-parent/apptbook/src/it/java/edu/pdx/cs/joy/apptbook/Project1IT.java b/projects-parent/originals-parent/apptbook/src/it/java/edu/pdx/cs/joy/apptbook/Project1IT.java index fee1d5e2ce..a74c0af669 100644 --- a/projects-parent/originals-parent/apptbook/src/it/java/edu/pdx/cs/joy/apptbook/Project1IT.java +++ b/projects-parent/originals-parent/apptbook/src/it/java/edu/pdx/cs/joy/apptbook/Project1IT.java @@ -24,7 +24,7 @@ private MainMethodResult invokeMain(String... args) { @Test void testNoCommandLineArguments() { MainMethodResult result = invokeMain(); - assertThat(result.getTextWrittenToStandardError(), containsString("Missing command line arguments")); + assertThat(result.getTextWrittenToStandardError(), containsString("Missing appointment book information")); } } \ No newline at end of file diff --git a/projects-parent/originals-parent/apptbook/src/main/java/edu/pdx/cs/joy/apptbook/Project1.java b/projects-parent/originals-parent/apptbook/src/main/java/edu/pdx/cs/joy/apptbook/Project1.java index 67eb7f834a..55624ce7e1 100644 --- a/projects-parent/originals-parent/apptbook/src/main/java/edu/pdx/cs/joy/apptbook/Project1.java +++ b/projects-parent/originals-parent/apptbook/src/main/java/edu/pdx/cs/joy/apptbook/Project1.java @@ -14,7 +14,7 @@ static boolean isValidDateAndTime(String dateAndTime) { public static void main(String[] args) { Appointment appointment = new Appointment(); // Refer to one of Dave's classes so that we can be sure it is on the classpath - System.err.println("Missing command line arguments"); + System.err.println("Missing appointment book information"); for (String arg : args) { System.out.println(arg); } diff --git a/projects-parent/originals-parent/phonebill/src/it/java/edu/pdx/cs/joy/phonebill/Project1IT.java b/projects-parent/originals-parent/phonebill/src/it/java/edu/pdx/cs/joy/phonebill/Project1IT.java index d9d375f3d6..9b179166da 100644 --- a/projects-parent/originals-parent/phonebill/src/it/java/edu/pdx/cs/joy/phonebill/Project1IT.java +++ b/projects-parent/originals-parent/phonebill/src/it/java/edu/pdx/cs/joy/phonebill/Project1IT.java @@ -24,7 +24,7 @@ private MainMethodResult invokeMain(String... args) { @Test void testNoCommandLineArguments() { MainMethodResult result = invokeMain(); - assertThat(result.getTextWrittenToStandardError(), containsString("Missing command line arguments")); + assertThat(result.getTextWrittenToStandardError(), containsString("Missing phone bill information")); } } \ No newline at end of file diff --git a/projects-parent/originals-parent/phonebill/src/main/java/edu/pdx/cs/joy/phonebill/Project1.java b/projects-parent/originals-parent/phonebill/src/main/java/edu/pdx/cs/joy/phonebill/Project1.java index eeb3902ebb..9c5db2bac7 100644 --- a/projects-parent/originals-parent/phonebill/src/main/java/edu/pdx/cs/joy/phonebill/Project1.java +++ b/projects-parent/originals-parent/phonebill/src/main/java/edu/pdx/cs/joy/phonebill/Project1.java @@ -14,7 +14,7 @@ static boolean isValidDateAndTime(String dateAndTime) { public static void main(String[] args) { PhoneCall call = new PhoneCall(); // Refer to one of Dave's classes so that we can be sure it is on the classpath - System.err.println("Missing command line arguments"); + System.err.println("Missing phone bill information"); for (String arg : args) { System.out.println(arg); } diff --git a/web/pom.xml b/web/pom.xml index 23425e9007..1675b212f5 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -107,7 +107,7 @@ org.apache.commons commons-fileupload2-jakarta-servlet6 - 2.0.0-M2 + 2.0.0-M4 commons-io