From bf123a919ef8ddb42568544845c8c2f2d5cf0f93 Mon Sep 17 00:00:00 2001 From: David Whitlock Date: Sun, 26 May 2024 09:12:55 -0700 Subject: [PATCH 01/12] Break ground on version 1.1.1 so that we can get a grader artifact with some new features. --- examples/pom.xml | 10 +++++----- family/pom.xml | 6 +++--- grader/pom.xml | 4 ++-- pom.xml | 4 ++-- .../archetypes-parent/airline-archetype/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 6 +++--- .../archetypes-parent/airline-web-archetype/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 8 ++++---- .../archetypes-parent/apptbook-archetype/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 6 +++--- .../archetypes-parent/apptbook-web-archetype/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 8 ++++---- .../archetypes-parent/java-koans-archetype/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 2 +- .../archetypes-parent/kata-archetype/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- .../archetypes-parent/phonebill-archetype/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 6 +++--- .../archetypes-parent/phonebill-web-archetype/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 8 ++++---- projects-parent/archetypes-parent/pom.xml | 4 ++-- .../archetypes-parent/student-archetype/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 6 +++--- projects-parent/originals-parent/airline-web/pom.xml | 10 +++++----- projects-parent/originals-parent/airline/pom.xml | 8 ++++---- projects-parent/originals-parent/apptbook-web/pom.xml | 10 +++++----- projects-parent/originals-parent/apptbook/pom.xml | 8 ++++---- projects-parent/originals-parent/kata/pom.xml | 6 +++--- projects-parent/originals-parent/phonebill-web/pom.xml | 10 +++++----- projects-parent/originals-parent/phonebill/pom.xml | 8 ++++---- projects-parent/originals-parent/pom.xml | 4 ++-- projects-parent/originals-parent/student/pom.xml | 10 +++++----- projects-parent/pom.xml | 4 ++-- projects-parent/projects/pom.xml | 4 ++-- web/pom.xml | 6 +++--- 35 files changed, 103 insertions(+), 103 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index fd1e1103a..044289ea8 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -3,23 +3,23 @@ joy io.github.davidwhitlock.joy - 1.1.0 + 1.1.1-SNAPSHOT 4.0.0 examples examples - 1.2.0 + 1.2.1-SNAPSHOT https://www.cs.pdx.edu/~whitlock io.github.davidwhitlock.joy family - 1.1.0 + 1.1.1-SNAPSHOT io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT com.sun.mail @@ -45,7 +45,7 @@ io.github.davidwhitlock.joy projects - 1.0.0 + 2.1.1-SNAPSHOT tests test diff --git a/family/pom.xml b/family/pom.xml index 14cb885c9..ee67d2a8d 100644 --- a/family/pom.xml +++ b/family/pom.xml @@ -3,12 +3,12 @@ joy io.github.davidwhitlock.joy - 1.1.0 + 1.1.1-SNAPSHOT 4.0.0 family jar - 1.1.0 + 1.1.1-SNAPSHOT Family Tree Application An Family Tree application for The Joy of Coding https://www.cs.pdx.edu/~whitlock @@ -16,7 +16,7 @@ io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT diff --git a/grader/pom.xml b/grader/pom.xml index 5abce1c9a..6a5bbc078 100644 --- a/grader/pom.xml +++ b/grader/pom.xml @@ -2,7 +2,7 @@ joy io.github.davidwhitlock.joy - 1.1.0 + 1.1.1-SNAPSHOT 4.0.0 grader @@ -19,7 +19,7 @@ io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT com.opencsv diff --git a/pom.xml b/pom.xml index ae63bc190..4768d6bcc 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.github.davidwhitlock.joy - 1.1.0 + 1.1.1-SNAPSHOT joy pom Java Example Code @@ -92,7 +92,7 @@ 0.75 0 - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT diff --git a/projects-parent/archetypes-parent/airline-archetype/pom.xml b/projects-parent/archetypes-parent/airline-archetype/pom.xml index bcad3af40..c698b8435 100644 --- a/projects-parent/archetypes-parent/airline-archetype/pom.xml +++ b/projects-parent/archetypes-parent/airline-archetype/pom.xml @@ -4,10 +4,10 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT airline-archetype - 2.1.0 + 2.1.1-SNAPSHOT maven-archetype airline-archetype diff --git a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/pom.xml index cb1b5ae33..80a1cf1d1 100644 --- a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/pom.xml @@ -3,7 +3,7 @@ joy io.github.davidwhitlock.joy - 1.1.0 + 1.1.1-SNAPSHOT 4.0.0 ${groupId} @@ -32,12 +32,12 @@ io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT tests test diff --git a/projects-parent/archetypes-parent/airline-web-archetype/pom.xml b/projects-parent/archetypes-parent/airline-web-archetype/pom.xml index 7cad6ba51..58ff419b7 100644 --- a/projects-parent/archetypes-parent/airline-web-archetype/pom.xml +++ b/projects-parent/archetypes-parent/airline-web-archetype/pom.xml @@ -4,10 +4,10 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT airline-web-archetype - 2.2.0 + 2.2.0-SNAPSHOT maven-archetype airline-web-archetype diff --git a/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/pom.xml index c6c207b80..4a2c7c01f 100644 --- a/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/pom.xml @@ -3,7 +3,7 @@ joy io.github.davidwhitlock.joy - 1.1.0 + 1.1.1-SNAPSHOT 4.0.0 ${groupId} @@ -21,17 +21,17 @@ io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT io.github.davidwhitlock.joy examples - 1.2.0 + 1.2.1-SNAPSHOT io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT tests test diff --git a/projects-parent/archetypes-parent/apptbook-archetype/pom.xml b/projects-parent/archetypes-parent/apptbook-archetype/pom.xml index 7ed0de03a..04ac31631 100644 --- a/projects-parent/archetypes-parent/apptbook-archetype/pom.xml +++ b/projects-parent/archetypes-parent/apptbook-archetype/pom.xml @@ -4,10 +4,10 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT apptbook-archetype - 2.1.0 + 2.1.1-SNAPSHOT maven-archetype apptbook-archetype diff --git a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/pom.xml index 82b03cfa2..f639b7a2c 100644 --- a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/pom.xml @@ -3,7 +3,7 @@ joy io.github.davidwhitlock.joy - 1.1.0 + 1.1.1-SNAPSHOT 4.0.0 ${groupId} @@ -32,12 +32,12 @@ io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT tests test diff --git a/projects-parent/archetypes-parent/apptbook-web-archetype/pom.xml b/projects-parent/archetypes-parent/apptbook-web-archetype/pom.xml index aa8cec890..af5a5250f 100644 --- a/projects-parent/archetypes-parent/apptbook-web-archetype/pom.xml +++ b/projects-parent/archetypes-parent/apptbook-web-archetype/pom.xml @@ -4,10 +4,10 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT apptbook-web-archetype - 2.2.0 + 2.2.0-SNAPSHOT maven-archetype apptbook-web-archetype diff --git a/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/pom.xml index 2a1bb688e..308953fb1 100644 --- a/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/pom.xml @@ -3,7 +3,7 @@ joy io.github.davidwhitlock.joy - 1.1.0 + 1.1.1-SNAPSHOT 4.0.0 ${groupId} @@ -21,17 +21,17 @@ io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT io.github.davidwhitlock.joy examples - 1.2.0 + 1.2.1-SNAPSHOT io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT tests test diff --git a/projects-parent/archetypes-parent/java-koans-archetype/pom.xml b/projects-parent/archetypes-parent/java-koans-archetype/pom.xml index cc57425e8..df00ca6a1 100644 --- a/projects-parent/archetypes-parent/java-koans-archetype/pom.xml +++ b/projects-parent/archetypes-parent/java-koans-archetype/pom.xml @@ -3,13 +3,13 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT 4.0.0 java-koans-archetype - 2.1.0 + 2.1.1-SNAPSHOT maven-archetype java-koans-archetype 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 edb869d8a..2e141fc34 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 @@ -4,7 +4,7 @@ joy io.github.davidwhitlock.joy - 1.1.0 + 1.1.1-SNAPSHOT ${groupId} ${artifactId} diff --git a/projects-parent/archetypes-parent/kata-archetype/pom.xml b/projects-parent/archetypes-parent/kata-archetype/pom.xml index ccde18d9c..8f1dfddbb 100644 --- a/projects-parent/archetypes-parent/kata-archetype/pom.xml +++ b/projects-parent/archetypes-parent/kata-archetype/pom.xml @@ -5,10 +5,10 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT kata-archetype - 2.1.0 + 2.1.1-SNAPSHOT maven-archetype kata-archetype diff --git a/projects-parent/archetypes-parent/kata-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/kata-archetype/src/main/resources/archetype-resources/pom.xml index 82a3d9415..9b50c6c6d 100644 --- a/projects-parent/archetypes-parent/kata-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/kata-archetype/src/main/resources/archetype-resources/pom.xml @@ -4,7 +4,7 @@ joy io.github.davidwhitlock.joy - 1.1.0 + 1.1.1-SNAPSHOT ${groupId} ${artifactId} @@ -88,7 +88,7 @@ io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT tests test diff --git a/projects-parent/archetypes-parent/phonebill-archetype/pom.xml b/projects-parent/archetypes-parent/phonebill-archetype/pom.xml index f1b52fc6d..3fdc7c076 100644 --- a/projects-parent/archetypes-parent/phonebill-archetype/pom.xml +++ b/projects-parent/archetypes-parent/phonebill-archetype/pom.xml @@ -3,11 +3,11 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT 4.0.0 phonebill-archetype - 2.1.0 + 2.1.1-SNAPSHOT maven-archetype phonebill-archetype diff --git a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/pom.xml index df42c0de5..c7a0fa6a4 100644 --- a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/pom.xml @@ -3,7 +3,7 @@ joy io.github.davidwhitlock.joy - 1.1.0 + 1.1.1-SNAPSHOT 4.0.0 ${groupId} @@ -38,12 +38,12 @@ io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT tests test diff --git a/projects-parent/archetypes-parent/phonebill-web-archetype/pom.xml b/projects-parent/archetypes-parent/phonebill-web-archetype/pom.xml index 233828f29..77c039237 100644 --- a/projects-parent/archetypes-parent/phonebill-web-archetype/pom.xml +++ b/projects-parent/archetypes-parent/phonebill-web-archetype/pom.xml @@ -4,10 +4,10 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT phonebill-web-archetype - 2.2.0 + 2.2.0-SNAPSHOT maven-archetype phonebill-web-archetype diff --git a/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/pom.xml index d0e01ef1a..ac43952dd 100644 --- a/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/pom.xml @@ -3,7 +3,7 @@ joy io.github.davidwhitlock.joy - 1.1.0 + 1.1.1-SNAPSHOT 4.0.0 ${groupId} @@ -22,17 +22,17 @@ io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT io.github.davidwhitlock.joy examples - 1.2.0 + 1.2.1-SNAPSHOT io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT tests test diff --git a/projects-parent/archetypes-parent/pom.xml b/projects-parent/archetypes-parent/pom.xml index a835941c6..82178221d 100644 --- a/projects-parent/archetypes-parent/pom.xml +++ b/projects-parent/archetypes-parent/pom.xml @@ -7,11 +7,11 @@ io.github.davidwhitlock.joy projects-parent - 2.1.0 + 2.1.1-SNAPSHOT archetypes-parent - 2.1.0 + 2.1.1-SNAPSHOT pom diff --git a/projects-parent/archetypes-parent/student-archetype/pom.xml b/projects-parent/archetypes-parent/student-archetype/pom.xml index e857434f3..368038b2e 100644 --- a/projects-parent/archetypes-parent/student-archetype/pom.xml +++ b/projects-parent/archetypes-parent/student-archetype/pom.xml @@ -5,11 +5,11 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT student-archetype - 2.2.0 + 2.2.0-SNAPSHOT maven-archetype Archetype for Student project diff --git a/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/pom.xml index 6aff99164..7ca2c53d6 100644 --- a/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/pom.xml @@ -4,7 +4,7 @@ joy io.github.davidwhitlock.joy - 1.1.0 + 1.1.1-SNAPSHOT ${groupId} ${artifactId} @@ -102,12 +102,12 @@ io.github.davidwhitlock.joy examples - 1.2.0 + 1.2.1-SNAPSHOT io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT tests test diff --git a/projects-parent/originals-parent/airline-web/pom.xml b/projects-parent/originals-parent/airline-web/pom.xml index 44079ba02..f108a4684 100644 --- a/projects-parent/originals-parent/airline-web/pom.xml +++ b/projects-parent/originals-parent/airline-web/pom.xml @@ -3,12 +3,12 @@ originals-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT 4.0.0 io.github.davidwhitlock.joy.original airline-web - 2.2.0 + 2.2.0-SNAPSHOT 8080 @@ -21,17 +21,17 @@ io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT io.github.davidwhitlock.joy examples - 1.2.0 + 1.2.1-SNAPSHOT io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT tests test diff --git a/projects-parent/originals-parent/airline/pom.xml b/projects-parent/originals-parent/airline/pom.xml index cc77dab0e..8686297cb 100644 --- a/projects-parent/originals-parent/airline/pom.xml +++ b/projects-parent/originals-parent/airline/pom.xml @@ -3,13 +3,13 @@ originals-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT 4.0.0 io.github.davidwhitlock.joy.original airline jar - 2.1.0 + 2.1.1-SNAPSHOT Airline Project An Airline application for The Joy of Coding at Portland State University 2000 @@ -32,12 +32,12 @@ io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT tests test diff --git a/projects-parent/originals-parent/apptbook-web/pom.xml b/projects-parent/originals-parent/apptbook-web/pom.xml index fd23b3f43..825eaf1e1 100644 --- a/projects-parent/originals-parent/apptbook-web/pom.xml +++ b/projects-parent/originals-parent/apptbook-web/pom.xml @@ -3,12 +3,12 @@ originals-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT 4.0.0 io.github.davidwhitlock.joy.original apptbook-web - 2.2.0 + 2.2.0-SNAPSHOT 8080 @@ -21,17 +21,17 @@ io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT io.github.davidwhitlock.joy examples - 1.2.0 + 1.2.1-SNAPSHOT io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT tests test diff --git a/projects-parent/originals-parent/apptbook/pom.xml b/projects-parent/originals-parent/apptbook/pom.xml index fac5f0200..62a6b4ebe 100644 --- a/projects-parent/originals-parent/apptbook/pom.xml +++ b/projects-parent/originals-parent/apptbook/pom.xml @@ -3,13 +3,13 @@ originals-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT 4.0.0 io.github.davidwhitlock.joy.original apptbook jar - 2.1.0 + 2.1.1-SNAPSHOT Appointment Book Project An Appointment Book application for The Joy of Coding at Portland State University 2000 @@ -32,12 +32,12 @@ io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT tests test diff --git a/projects-parent/originals-parent/kata/pom.xml b/projects-parent/originals-parent/kata/pom.xml index 48888e209..baed56708 100644 --- a/projects-parent/originals-parent/kata/pom.xml +++ b/projects-parent/originals-parent/kata/pom.xml @@ -4,11 +4,11 @@ originals-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT io.github.davidwhitlock.joy.original kata - 2.1.0 + 2.1.1-SNAPSHOT jar Kata Project @@ -88,7 +88,7 @@ io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT tests test diff --git a/projects-parent/originals-parent/phonebill-web/pom.xml b/projects-parent/originals-parent/phonebill-web/pom.xml index 913622858..cb1b00f17 100644 --- a/projects-parent/originals-parent/phonebill-web/pom.xml +++ b/projects-parent/originals-parent/phonebill-web/pom.xml @@ -3,12 +3,12 @@ originals-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT 4.0.0 io.github.davidwhitlock.joy.original phonebill-web - 2.2.0 + 2.2.0-SNAPSHOT 8080 @@ -22,17 +22,17 @@ io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT io.github.davidwhitlock.joy examples - 1.2.0 + 1.2.1-SNAPSHOT io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT tests test diff --git a/projects-parent/originals-parent/phonebill/pom.xml b/projects-parent/originals-parent/phonebill/pom.xml index 4a134ea18..dc40bebe9 100644 --- a/projects-parent/originals-parent/phonebill/pom.xml +++ b/projects-parent/originals-parent/phonebill/pom.xml @@ -3,13 +3,13 @@ originals-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT 4.0.0 io.github.davidwhitlock.joy.original phonebill jar - 2.1.0 + 2.1.1-SNAPSHOT Phone Bill Project A Phone Bill application for The Joy of Coding at Portland State University 2000 @@ -38,12 +38,12 @@ io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT tests test diff --git a/projects-parent/originals-parent/pom.xml b/projects-parent/originals-parent/pom.xml index aa4dff1fa..69684a41b 100644 --- a/projects-parent/originals-parent/pom.xml +++ b/projects-parent/originals-parent/pom.xml @@ -5,11 +5,11 @@ io.github.davidwhitlock.joy projects-parent - 2.1.0 + 2.1.1-SNAPSHOT originals-parent - 2.1.0 + 2.1.1-SNAPSHOT pom diff --git a/projects-parent/originals-parent/student/pom.xml b/projects-parent/originals-parent/student/pom.xml index 70587491a..c165622a1 100644 --- a/projects-parent/originals-parent/student/pom.xml +++ b/projects-parent/originals-parent/student/pom.xml @@ -4,11 +4,11 @@ originals-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT io.github.davidwhitlock.joy.original student - 2.2.0 + 2.2.0-SNAPSHOT jar Student Project @@ -88,12 +88,12 @@ io.github.davidwhitlock.joy examples - 1.2.0 + 1.2.1-SNAPSHOT io.github.davidwhitlock.joy projects - 2.1.0 + 2.1.1-SNAPSHOT tests test @@ -116,7 +116,7 @@ io.github.davidwhitlock.joy grader - 1.0.0 + ${grader.version} false private diff --git a/projects-parent/pom.xml b/projects-parent/pom.xml index 488d1c7b3..ea1a06653 100644 --- a/projects-parent/pom.xml +++ b/projects-parent/pom.xml @@ -7,11 +7,11 @@ io.github.davidwhitlock.joy joy - 1.1.0 + 1.1.1-SNAPSHOT projects-parent - 2.1.0 + 2.1.1-SNAPSHOT pom diff --git a/projects-parent/projects/pom.xml b/projects-parent/projects/pom.xml index 327bd0d09..ba576135c 100644 --- a/projects-parent/projects/pom.xml +++ b/projects-parent/projects/pom.xml @@ -2,13 +2,13 @@ projects-parent io.github.davidwhitlock.joy - 2.1.0 + 2.1.1-SNAPSHOT 4.0.0 projects Project APIs Classes needed for the Projects in The Joy of Coding - 2.1.0 + 2.1.1-SNAPSHOT http://www.cs.pdx.edu/~whitlock diff --git a/web/pom.xml b/web/pom.xml index 62b10c8b7..5925ad0bf 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -3,14 +3,14 @@ joy io.github.davidwhitlock.joy - 1.1.0 + 1.1.1-SNAPSHOT 4.0.0 io.github.davidwhitlock.joy web war Web Application examples - 1.2.0 + 1.2.1-SNAPSHOT http://www.cs.pdx.edu/~whitlock 6.2.8.Final @@ -118,7 +118,7 @@ io.github.davidwhitlock.joy examples - 1.2.0 + 1.2.1-SNAPSHOT jakarta.xml.bind From a26f3f7d4c2da71a88303c8b3d468107156dc509 Mon Sep 17 00:00:00 2001 From: David Whitlock Date: Mon, 27 May 2024 19:17:45 -0700 Subject: [PATCH 02/12] Use version 1.1.1-SNAPSHOT of the Koans library. --- .../src/main/resources/archetype-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2e141fc34..d692ac297 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 @@ -48,7 +48,7 @@ io.github.davidwhitlock.joy.com.sandwich koans-lib - 1.1.0 + 1.1.1-SNAPSHOT From 8a07965856f9882fe4557a81bbc3e99d009b01e2 Mon Sep 17 00:00:00 2001 From: David Whitlock Date: Wed, 29 May 2024 18:36:43 -0700 Subject: [PATCH 03/12] Add a parser for the git config file. --- .../pdx/cs/joy/grader/GitConfigParser.java | 86 +++++++++++++++++++ .../cs/joy/grader/GitConfigParserTest.java | 64 ++++++++++++++ .../edu/pdx/cs/joy/grader/gitConfig.txt | 31 +++++++ 3 files changed, 181 insertions(+) create mode 100644 grader/src/main/java/edu/pdx/cs/joy/grader/GitConfigParser.java create mode 100644 grader/src/test/java/edu/pdx/cs/joy/grader/GitConfigParserTest.java create mode 100644 grader/src/test/resources/edu/pdx/cs/joy/grader/gitConfig.txt diff --git a/grader/src/main/java/edu/pdx/cs/joy/grader/GitConfigParser.java b/grader/src/main/java/edu/pdx/cs/joy/grader/GitConfigParser.java new file mode 100644 index 000000000..f28d7aee6 --- /dev/null +++ b/grader/src/main/java/edu/pdx/cs/joy/grader/GitConfigParser.java @@ -0,0 +1,86 @@ +package edu.pdx.cs.joy.grader; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.Reader; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class GitConfigParser { + static final Pattern PROPERTY_PATTERN = Pattern.compile(" {8}(.*) = (.*)"); + private final Reader reader; + private String currentSection; + + public GitConfigParser(Reader reader) { + this.reader = reader; + } + + public void parse(Callback callback) throws IOException { + try (BufferedReader br = new BufferedReader(this.reader)) { + for (String line = br.readLine(); line != null; line = br.readLine()) { + parseLine(line, callback); + } + + endCurrentSection(callback); + } + + } + + private void endCurrentSection(Callback callback) { + callback.endSection(currentSection); + } + + private void parseLine(String line, Callback callback) { + if (line.startsWith("[core]")) { + endCurrentSection(callback); + startCoreSection(callback); + + } else if (line.startsWith("[remote ")) { + endCurrentSection(callback); + startRemoteSection(line, callback); + + } else if (line.contains(" = ")) { + parseProperty(line, callback); + } + + } + + private void startCoreSection(Callback callback) { + this.currentSection = "core"; + callback.startCoreSection(); + } + + private void startRemoteSection(String line, Callback callback) { + Pattern pattern = Pattern.compile("\\[remote \"(.*)\"]"); + Matcher matcher = pattern.matcher(line); + if (!matcher.matches()) { + throw new IllegalStateException("Cannot parse line with remote: \"" + line + "\""); + } + + String remoteName = matcher.group(1); + this.currentSection = remoteName; + callback.startRemoteSection(remoteName); + } + + private void parseProperty(String line, Callback callback) { + Matcher matcher = PROPERTY_PATTERN.matcher(line); + if (!matcher.matches()) { + throw new IllegalStateException("Cannot parse line with property: \"" + line + "\""); + } + + String propertyName = matcher.group(1); + String propertyValue = matcher.group(2); + + callback.property(propertyName, propertyValue); + } + + public interface Callback { + void startCoreSection(); + + void property(String name, String value); + + void endSection(String name); + + void startRemoteSection(String name); + } +} diff --git a/grader/src/test/java/edu/pdx/cs/joy/grader/GitConfigParserTest.java b/grader/src/test/java/edu/pdx/cs/joy/grader/GitConfigParserTest.java new file mode 100644 index 000000000..6b2e3a623 --- /dev/null +++ b/grader/src/test/java/edu/pdx/cs/joy/grader/GitConfigParserTest.java @@ -0,0 +1,64 @@ +package edu.pdx.cs.joy.grader; + +import org.junit.jupiter.api.Test; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.StringReader; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +public class GitConfigParserTest { + + @Test + void canParseCoreSectionOfGitConfig() throws IOException { + String config = + "[core]\n" + + " repositoryformatversion = 0\n" + + " filemode = true\n"; + GitConfigParser parser = new GitConfigParser(new StringReader(config)); + GitConfigParser.Callback callback = mock(GitConfigParser.Callback.class); + parser.parse(callback); + + verify(callback).startCoreSection(); + verify(callback).property("repositoryformatversion", "0"); + verify(callback).property("filemode", "true"); + verify(callback).endSection("core"); + } + + @Test + void canParseRemoteOriginSectionOfGitConfig() throws IOException { + String config = + "[remote \"origin\"]\n" + + " url = git@github.com:JoyOfCodingPDX/JoyOfCoding.git\n" + + " fetch = +refs/heads/*:refs/remotes/origin/*"; + GitConfigParser parser = new GitConfigParser(new StringReader(config)); + GitConfigParser.Callback callback = mock(GitConfigParser.Callback.class); + parser.parse(callback); + + verify(callback).startRemoteSection("origin"); + verify(callback).property("url", "git@github.com:JoyOfCodingPDX/JoyOfCoding.git"); + verify(callback).endSection("origin"); + } + + @Test + void canParseRealGitConfig() throws IOException { + InputStream resource = getClass().getResourceAsStream("gitConfig.txt"); + + GitConfigParser parser = new GitConfigParser(new InputStreamReader(resource)); + GitConfigParser.Callback callback = mock(GitConfigParser.Callback.class); + parser.parse(callback); + + verify(callback).startCoreSection(); + verify(callback).property("repositoryformatversion", "0"); + verify(callback).property("filemode", "true"); + verify(callback).endSection("core"); + + verify(callback).startRemoteSection("origin"); + verify(callback).property("url", "git@github.com:JoyOfCodingPDX/JoyOfCoding.git"); + verify(callback).endSection("origin"); + + } +} diff --git a/grader/src/test/resources/edu/pdx/cs/joy/grader/gitConfig.txt b/grader/src/test/resources/edu/pdx/cs/joy/grader/gitConfig.txt new file mode 100644 index 000000000..918bd7917 --- /dev/null +++ b/grader/src/test/resources/edu/pdx/cs/joy/grader/gitConfig.txt @@ -0,0 +1,31 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true +[remote "origin"] + url = git@github.com:JoyOfCodingPDX/JoyOfCoding.git + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "main"] + remote = origin + merge = refs/heads/main +[branch "issue-463/use-LocalDateTime-for-projects"] + remote = origin + merge = refs/heads/issue-463/use-LocalDateTime-for-projects +[branch "issue-453/use-newer-github-actions"] + remote = origin + merge = refs/heads/issue-453/use-newer-github-actions +[branch "issue-463/move-snapshot-repository-include-to-top-level-pom"] + remote = origin + merge = refs/heads/issue-463/move-snapshot-repository-include-to-top-level-pom +[branch "issue-465/java-22"] + remote = origin + merge = refs/heads/issue-465/java-22 +[branch "issue-454/http-code-in-stack-trace"] + remote = origin + merge = refs/heads/issue-454/http-code-in-stack-trace +[branch "1.1.1-SNAPSHOT"] + remote = origin + merge = refs/heads/1.1.1-SNAPSHOT From eb40deaf50da8d2d71de7ff4066e7f29f461f7b7 Mon Sep 17 00:00:00 2001 From: David Whitlock Date: Thu, 30 May 2024 19:47:36 -0700 Subject: [PATCH 04/12] Find the GitHub user name in a Git config file. --- .../pdx/cs/joy/grader/GitConfigParser.java | 4 +- .../cs/joy/grader/GitHubUserNameFinder.java | 45 +++++++++++++++++++ .../joy/grader/GitHubUserNameFinderTest.java | 18 ++++++++ 3 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 grader/src/main/java/edu/pdx/cs/joy/grader/GitHubUserNameFinder.java create mode 100644 grader/src/test/java/edu/pdx/cs/joy/grader/GitHubUserNameFinderTest.java diff --git a/grader/src/main/java/edu/pdx/cs/joy/grader/GitConfigParser.java b/grader/src/main/java/edu/pdx/cs/joy/grader/GitConfigParser.java index f28d7aee6..37efb2a8b 100644 --- a/grader/src/main/java/edu/pdx/cs/joy/grader/GitConfigParser.java +++ b/grader/src/main/java/edu/pdx/cs/joy/grader/GitConfigParser.java @@ -8,6 +8,7 @@ public class GitConfigParser { static final Pattern PROPERTY_PATTERN = Pattern.compile(" {8}(.*) = (.*)"); + static final Pattern REMOTE_PATTERN = Pattern.compile("\\[remote \"(.*)\"]"); private final Reader reader; private String currentSection; @@ -51,8 +52,7 @@ private void startCoreSection(Callback callback) { } private void startRemoteSection(String line, Callback callback) { - Pattern pattern = Pattern.compile("\\[remote \"(.*)\"]"); - Matcher matcher = pattern.matcher(line); + Matcher matcher = REMOTE_PATTERN.matcher(line); if (!matcher.matches()) { throw new IllegalStateException("Cannot parse line with remote: \"" + line + "\""); } diff --git a/grader/src/main/java/edu/pdx/cs/joy/grader/GitHubUserNameFinder.java b/grader/src/main/java/edu/pdx/cs/joy/grader/GitHubUserNameFinder.java new file mode 100644 index 000000000..105d4886e --- /dev/null +++ b/grader/src/main/java/edu/pdx/cs/joy/grader/GitHubUserNameFinder.java @@ -0,0 +1,45 @@ +package edu.pdx.cs.joy.grader; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class GitHubUserNameFinder implements GitConfigParser.Callback { + private String gitHubUserName; + private boolean isInOrigin; + + @Override + public void startCoreSection() { + + } + + @Override + public void property(String name, String value) { + if (name.equals("url") && this.isInOrigin) { + extractGitHubUserNameFrom(value); + } + } + + private void extractGitHubUserNameFrom(String gitUrl) { + Pattern pattern = Pattern.compile("git@github.com:(.*)/.*\\.git"); + Matcher matcher = pattern.matcher(gitUrl); + if (matcher.matches()) { + this.gitHubUserName = matcher.group(1); + } + } + + @Override + public void endSection(String name) { + this.isInOrigin = false; + } + + @Override + public void startRemoteSection(String name) { + if (name.equals("origin")) { + this.isInOrigin = true; + } + } + + public String getGitHubUserName() { + return gitHubUserName; + } +} diff --git a/grader/src/test/java/edu/pdx/cs/joy/grader/GitHubUserNameFinderTest.java b/grader/src/test/java/edu/pdx/cs/joy/grader/GitHubUserNameFinderTest.java new file mode 100644 index 000000000..3d3fabc82 --- /dev/null +++ b/grader/src/test/java/edu/pdx/cs/joy/grader/GitHubUserNameFinderTest.java @@ -0,0 +1,18 @@ +package edu.pdx.cs.joy.grader; + +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; + +public class GitHubUserNameFinderTest { + + @Test + void findGitHubUserName() { + GitHubUserNameFinder finder = new GitHubUserNameFinder(); + finder.startRemoteSection("origin"); + finder.property("url", "git@github.com:JoyOfCodingPDX/JoyOfCoding.git"); + + assertThat(finder.getGitHubUserName(), equalTo("JoyOfCodingPDX")); + } +} From 5b1878b5437c05d55e51c74b092e9efcff233559 Mon Sep 17 00:00:00 2001 From: David Whitlock Date: Thu, 30 May 2024 20:11:21 -0700 Subject: [PATCH 05/12] Persist a Student's GitHub username in the XML file. --- .../java/edu/pdx/cs/joy/grader/gradebook/Student.java | 9 +++++++++ .../edu/pdx/cs/joy/grader/gradebook/XmlDumper.java | 1 + .../pdx/cs/joy/grader/gradebook/XmlStudentParser.java | 6 +++++- .../resources/edu/pdx/cs/joy/grader/gradebook.dtd | 3 ++- .../pdx/cs/joy/grader/gradebook/StudentXmlTest.java | 11 +++++++++++ 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/grader/src/main/java/edu/pdx/cs/joy/grader/gradebook/Student.java b/grader/src/main/java/edu/pdx/cs/joy/grader/gradebook/Student.java index b38982d95..9b2fc5203 100644 --- a/grader/src/main/java/edu/pdx/cs/joy/grader/gradebook/Student.java +++ b/grader/src/main/java/edu/pdx/cs/joy/grader/gradebook/Student.java @@ -30,6 +30,7 @@ public class Student extends NotableImpl { private List resubmitted; // Names of resubmitted Assignments private String canvasId; private Section enrolledSection; + private String gitHubUserName; /////////////////////// Constructors /////////////////////// @@ -531,6 +532,14 @@ public Section getEnrolledSection() { return enrolledSection; } + public String getGitHubUserName() { + return gitHubUserName; + } + + public void setGitHubUserName(String gitHubUserName) { + this.gitHubUserName = gitHubUserName; + } + public enum Section { UNDERGRADUATE("undergraduate"), GRADUATE("graduate"); diff --git a/grader/src/main/java/edu/pdx/cs/joy/grader/gradebook/XmlDumper.java b/grader/src/main/java/edu/pdx/cs/joy/grader/gradebook/XmlDumper.java index 22c579214..2eada3523 100644 --- a/grader/src/main/java/edu/pdx/cs/joy/grader/gradebook/XmlDumper.java +++ b/grader/src/main/java/edu/pdx/cs/joy/grader/gradebook/XmlDumper.java @@ -457,6 +457,7 @@ private static void appendStudentInformation(Student student, Element root) { appendTextElementIfValueIsNotNull(root, "email", student.getEmail()); appendTextElementIfValueIsNotNull(root, "major", student.getMajor()); appendTextElementIfValueIsNotNull(root, "canvas-id", student.getCanvasId()); + appendTextElementIfValueIsNotNull(root, "github-user-name", String.valueOf(student.getGitHubUserName())); appendTextElementIfValueIsNotNull(root, "letter-grade", Objects.toString(student.getLetterGrade(), null)); setAttributeIfValueIsNotNull(root, "enrolled-section", getSectionXmlAttributeValue(student.getEnrolledSection())); diff --git a/grader/src/main/java/edu/pdx/cs/joy/grader/gradebook/XmlStudentParser.java b/grader/src/main/java/edu/pdx/cs/joy/grader/gradebook/XmlStudentParser.java index d24bff092..d3569c489 100644 --- a/grader/src/main/java/edu/pdx/cs/joy/grader/gradebook/XmlStudentParser.java +++ b/grader/src/main/java/edu/pdx/cs/joy/grader/gradebook/XmlStudentParser.java @@ -25,7 +25,7 @@ public class XmlStudentParser extends XmlHelper { /** The Reader from which the XML Data is read */ - private Reader reader; + private final Reader reader; /////////////////////// Constructors //////////////////////// @@ -207,6 +207,10 @@ public Student parseStudent() throws ParserException { String canvasId = extractTextFrom(child); student.setCanvasId(canvasId); + } else if (child.getTagName().equals("github-user-name")) { + String gitHubUserName = extractTextFrom(child); + student.setGitHubUserName(gitHubUserName); + } else if (child.getTagName().equals("letter-grade")) { String letterGrade = extractTextFrom(child); student.setLetterGrade(LetterGrade.fromString(letterGrade)); diff --git a/grader/src/main/resources/edu/pdx/cs/joy/grader/gradebook.dtd b/grader/src/main/resources/edu/pdx/cs/joy/grader/gradebook.dtd index a90ae05c5..e443e240d 100644 --- a/grader/src/main/resources/edu/pdx/cs/joy/grader/gradebook.dtd +++ b/grader/src/main/resources/edu/pdx/cs/joy/grader/gradebook.dtd @@ -62,7 +62,7 @@ points it is worth, a type, a due date, and some optional notes --> address, social security number, a major, some grades, some late assignments, and some notes --> + major?, canvas-id?, github-user-name?, d2l-id?, letter-grade?, grades?, late?, resubmitted?, notes?)> @@ -76,6 +76,7 @@ assignments, and some notes --> + diff --git a/grader/src/test/java/edu/pdx/cs/joy/grader/gradebook/StudentXmlTest.java b/grader/src/test/java/edu/pdx/cs/joy/grader/gradebook/StudentXmlTest.java index 698d76b97..3c5f880f2 100644 --- a/grader/src/test/java/edu/pdx/cs/joy/grader/gradebook/StudentXmlTest.java +++ b/grader/src/test/java/edu/pdx/cs/joy/grader/gradebook/StudentXmlTest.java @@ -167,4 +167,15 @@ void canParseOldXmlFileWithD2LId() throws ParserException { assertThat(student.getCanvasId(), nullValue()); } + @Test + void gitHubUserNameIsPersisted() throws ParserException, TransformerException { + String gitHubUserName = "gitHubUserName"; + Student student = new Student("studentId"); + student.setGitHubUserName(gitHubUserName); + + Student student2 = writeAndReadStudentAsXml(student); + + assertThat(student2.getGitHubUserName(), equalTo(gitHubUserName)); + } + } From f53a898ff34a53508585b0540aa7faa9ee5f8d47 Mon Sep 17 00:00:00 2001 From: David Whitlock Date: Thu, 30 May 2024 20:41:51 -0700 Subject: [PATCH 06/12] When taking the survey, read the student's GitHub username from .git/config. --- .../java/edu/pdx/cs/joy/grader/Survey.java | 34 +++++++++++++++++-- .../edu/pdx/cs/joy/grader/SurveyTest.java | 33 ++++++++++++++++-- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/grader/src/main/java/edu/pdx/cs/joy/grader/Survey.java b/grader/src/main/java/edu/pdx/cs/joy/grader/Survey.java index bc6001755..0fd64cf16 100644 --- a/grader/src/main/java/edu/pdx/cs/joy/grader/Survey.java +++ b/grader/src/main/java/edu/pdx/cs/joy/grader/Survey.java @@ -30,12 +30,14 @@ public class Survey extends EmailSender { private boolean sendEmail = true; private final File xmlFileDir; + private File gitCheckoutDir; - public Survey(PrintStream out, PrintStream err, InputStream in, File xmlFileDir) { + public Survey(PrintStream out, PrintStream err, InputStream in, File xmlFileDir, File gitCheckoutDir) { this.out = new PrintWriter(out, true); this.err = new PrintWriter(err, true); this.in = new BufferedReader(new InputStreamReader(in)); this.xmlFileDir = xmlFileDir; + this.gitCheckoutDir = gitCheckoutDir; } /** @@ -87,7 +89,8 @@ private void usage() { } public static void main(String[] args) { - Survey survey = new Survey(System.out, System.err, System.in, new File(System.getProperty("user.dir"))); + File currentDirectory = new File(System.getProperty("user.dir")); + Survey survey = new Survey(System.out, System.err, System.in, currentDirectory, currentDirectory); survey.takeSurvey(args); } @@ -146,10 +149,37 @@ private Student gatherStudentInformation() { askQuestionAndSetValue("What is your major?", student::setMajor); askEnrolledSectionQuestion(student); + askGitHubUserNameQuestion(student); return student; } + private void askGitHubUserNameQuestion(Student student) { + String gitHubUserName = findGitHubUserName(); + String okay = ask("Is it okay to record your GitHub username of \"" + gitHubUserName + + "\" so you can be added to the shared GitHub repo for Pair/Mob Programming?"); + if (okay.equalsIgnoreCase("y")) { + student.setGitHubUserName(gitHubUserName); + } + } + + private String findGitHubUserName() { + File dotGit = new File(this.gitCheckoutDir, ".git"); + File config = new File(dotGit, "config"); + if (config.isFile()) { + try { + GitConfigParser parser = new GitConfigParser(new FileReader(config)); + GitHubUserNameFinder finder = new GitHubUserNameFinder(); + parser.parse(finder); + return finder.getGitHubUserName(); + + } catch (IOException e) { + return null; + } + } + return null; + } + @VisibleForTesting static boolean isEmailAddress(String id) { try { diff --git a/grader/src/test/java/edu/pdx/cs/joy/grader/SurveyTest.java b/grader/src/test/java/edu/pdx/cs/joy/grader/SurveyTest.java index 7560832eb..ecc1f16d2 100644 --- a/grader/src/test/java/edu/pdx/cs/joy/grader/SurveyTest.java +++ b/grader/src/test/java/edu/pdx/cs/joy/grader/SurveyTest.java @@ -7,6 +7,7 @@ import org.junit.jupiter.api.io.TempDir; import java.io.*; +import java.nio.file.Files; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.*; @@ -88,13 +89,17 @@ void successfulSurveyWritesStudentXmlFile(@TempDir File tempDir) throws IOExcept String email = "email@email.com"; String major = "Major"; String section = "u"; + String recordGitHubUserName = "y"; String learn = "A lot"; String anythingElse = "Nope"; String verify = "y"; - InputStream in = getInputStreamWithLinesOfText(firstName, lastName, nickName, loginId, email, major, section, learn, anythingElse, verify); + String gitHubUserName = "GitHubUserName"; - Survey survey = new Survey(new TextCapturingOutputStream().getPrintStream(), new TextCapturingOutputStream().getPrintStream(), in, tempDir); + InputStream in = getInputStreamWithLinesOfText(firstName, lastName, nickName, loginId, email, major, section, recordGitHubUserName, learn, anythingElse, verify); + createGitConfigWithUserName(tempDir, gitHubUserName); + + Survey survey = new Survey(new TextCapturingOutputStream().getPrintStream(), new TextCapturingOutputStream().getPrintStream(), in, tempDir, tempDir); survey.takeSurvey("-noEmail"); File xmlFile = new File(tempDir, Survey.STUDENT_XML_FILE_NAME); @@ -108,6 +113,30 @@ void successfulSurveyWritesStudentXmlFile(@TempDir File tempDir) throws IOExcept assertThat(student.getEmail(), equalTo(email)); assertThat(student.getMajor(), equalTo(major)); assertThat(student.getEnrolledSection(), equalTo(Student.Section.UNDERGRADUATE)); + assertThat(student.getGitHubUserName(), equalTo(gitHubUserName)); + } + + private void createGitConfigWithUserName(File tempDir, String gitHubUserName) throws IOException { + File dotGit = new File(tempDir, ".git"); + assertThat(dotGit.mkdir(), is(true)); + File config = new File(dotGit, "config"); + + try (PrintWriter pw = new PrintWriter(new FileWriter(config))) { + pw.println("[core]\n" + + " repositoryformatversion = 0\n" + + " filemode = true\n" + + " bare = false\n" + + " logallrefupdates = true\n" + + " ignorecase = true\n" + + " precomposeunicode = true\n" + + "[remote \"origin\"]\n" + + " url = git@github.com:" + gitHubUserName + "/JoyOfCoding.git\n" + + " fetch = +refs/heads/*:refs/remotes/origin/*\n" + + "[branch \"main\"]\n" + + " remote = origin\n" + + " merge = refs/heads/main\n"); + pw.flush(); + } } private InputStream getInputStreamWithLinesOfText(String... lines) { From ed1a8bc0c3db9088c43b85bdbea8637abed108d5 Mon Sep 17 00:00:00 2001 From: David Whitlock Date: Thu, 30 May 2024 20:58:58 -0700 Subject: [PATCH 07/12] Oops. Real-world .git/config files have tabs, not spaces. --- .../pdx/cs/joy/grader/GitConfigParser.java | 2 +- .../edu/pdx/cs/joy/grader/gitConfig.txt | 47 ++++++++++--------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/grader/src/main/java/edu/pdx/cs/joy/grader/GitConfigParser.java b/grader/src/main/java/edu/pdx/cs/joy/grader/GitConfigParser.java index 37efb2a8b..1f387b3d4 100644 --- a/grader/src/main/java/edu/pdx/cs/joy/grader/GitConfigParser.java +++ b/grader/src/main/java/edu/pdx/cs/joy/grader/GitConfigParser.java @@ -7,7 +7,7 @@ import java.util.regex.Pattern; public class GitConfigParser { - static final Pattern PROPERTY_PATTERN = Pattern.compile(" {8}(.*) = (.*)"); + static final Pattern PROPERTY_PATTERN = Pattern.compile("\\s+(.*) = (.*)"); static final Pattern REMOTE_PATTERN = Pattern.compile("\\[remote \"(.*)\"]"); private final Reader reader; private String currentSection; diff --git a/grader/src/test/resources/edu/pdx/cs/joy/grader/gitConfig.txt b/grader/src/test/resources/edu/pdx/cs/joy/grader/gitConfig.txt index 918bd7917..a89eb4787 100644 --- a/grader/src/test/resources/edu/pdx/cs/joy/grader/gitConfig.txt +++ b/grader/src/test/resources/edu/pdx/cs/joy/grader/gitConfig.txt @@ -1,31 +1,34 @@ [core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true - ignorecase = true - precomposeunicode = true + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true [remote "origin"] - url = git@github.com:JoyOfCodingPDX/JoyOfCoding.git - fetch = +refs/heads/*:refs/remotes/origin/* + url = git@github.com:JoyOfCodingPDX/JoyOfCoding.git + fetch = +refs/heads/*:refs/remotes/origin/* [branch "main"] - remote = origin - merge = refs/heads/main + remote = origin + merge = refs/heads/main [branch "issue-463/use-LocalDateTime-for-projects"] - remote = origin - merge = refs/heads/issue-463/use-LocalDateTime-for-projects + remote = origin + merge = refs/heads/issue-463/use-LocalDateTime-for-projects [branch "issue-453/use-newer-github-actions"] - remote = origin - merge = refs/heads/issue-453/use-newer-github-actions + remote = origin + merge = refs/heads/issue-453/use-newer-github-actions [branch "issue-463/move-snapshot-repository-include-to-top-level-pom"] - remote = origin - merge = refs/heads/issue-463/move-snapshot-repository-include-to-top-level-pom + remote = origin + merge = refs/heads/issue-463/move-snapshot-repository-include-to-top-level-pom [branch "issue-465/java-22"] - remote = origin - merge = refs/heads/issue-465/java-22 + remote = origin + merge = refs/heads/issue-465/java-22 [branch "issue-454/http-code-in-stack-trace"] - remote = origin - merge = refs/heads/issue-454/http-code-in-stack-trace + remote = origin + merge = refs/heads/issue-454/http-code-in-stack-trace [branch "1.1.1-SNAPSHOT"] - remote = origin - merge = refs/heads/1.1.1-SNAPSHOT + remote = origin + merge = refs/heads/1.1.1-SNAPSHOT +[branch "issue-452/harvest-student-github-id"] + remote = origin + merge = refs/heads/issue-452/harvest-student-github-id From 7e50b030673f9b9545e2c33ab0d346528689bece Mon Sep 17 00:00:00 2001 From: David Whitlock Date: Thu, 30 May 2024 21:06:03 -0700 Subject: [PATCH 08/12] A couple of little tweaks to the Survey verbiage. --- .../java/edu/pdx/cs/joy/grader/Survey.java | 7 ++-- .../edu/pdx/cs/joy/grader/SurveyTest.java | 32 ++++++++++++------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/grader/src/main/java/edu/pdx/cs/joy/grader/Survey.java b/grader/src/main/java/edu/pdx/cs/joy/grader/Survey.java index 0fd64cf16..31016f9de 100644 --- a/grader/src/main/java/edu/pdx/cs/joy/grader/Survey.java +++ b/grader/src/main/java/edu/pdx/cs/joy/grader/Survey.java @@ -54,6 +54,9 @@ private String getSummary(Student student) { sb.append("Major: ").append(student.getMajor()).append("\n"); } sb.append("Enrolled in: ").append(student.getEnrolledSection().asString()).append("\n"); + if (student.getGitHubUserName() != null) { + sb.append("GitHub User Name: ").append(student.getGitHubUserName()).append("\n"); + } return sb.toString(); } @@ -157,7 +160,7 @@ private Student gatherStudentInformation() { private void askGitHubUserNameQuestion(Student student) { String gitHubUserName = findGitHubUserName(); String okay = ask("Is it okay to record your GitHub username of \"" + gitHubUserName - + "\" so you can be added to the shared GitHub repo for Pair/Mob Programming?"); + + "\" so you can be added to the shared GitHub repo for Pair/Mob Programming? [y/n]"); if (okay.equalsIgnoreCase("y")) { student.setGitHubUserName(gitHubUserName); } @@ -394,7 +397,7 @@ private String verifyInformation(Student student) { "yourself:\n"); out.println(summary); - String verify = ask("\nIs this information correct (y/n)?"); + String verify = ask("\nIs this information correct? [y/n]"); if (!verify.equals("y")) { printErrorMessageAndExit("** Not sending information. Exiting."); } diff --git a/grader/src/test/java/edu/pdx/cs/joy/grader/SurveyTest.java b/grader/src/test/java/edu/pdx/cs/joy/grader/SurveyTest.java index ecc1f16d2..bbf0b6a14 100644 --- a/grader/src/test/java/edu/pdx/cs/joy/grader/SurveyTest.java +++ b/grader/src/test/java/edu/pdx/cs/joy/grader/SurveyTest.java @@ -99,9 +99,13 @@ void successfulSurveyWritesStudentXmlFile(@TempDir File tempDir) throws IOExcept InputStream in = getInputStreamWithLinesOfText(firstName, lastName, nickName, loginId, email, major, section, recordGitHubUserName, learn, anythingElse, verify); createGitConfigWithUserName(tempDir, gitHubUserName); - Survey survey = new Survey(new TextCapturingOutputStream().getPrintStream(), new TextCapturingOutputStream().getPrintStream(), in, tempDir, tempDir); + TextCapturingOutputStream stdOut = new TextCapturingOutputStream(); + Survey survey = new Survey(stdOut.getPrintStream(), new TextCapturingOutputStream().getPrintStream(), in, tempDir, tempDir); survey.takeSurvey("-noEmail"); + String writtenToStdOut = stdOut.getTextThatWasOutput(); + assertThat(writtenToStdOut, containsString("GitHub User Name: " + gitHubUserName)); + File xmlFile = new File(tempDir, Survey.STUDENT_XML_FILE_NAME); XmlStudentParser parser = new XmlStudentParser(xmlFile); Student student = parser.parseStudent(); @@ -123,18 +127,18 @@ private void createGitConfigWithUserName(File tempDir, String gitHubUserName) th try (PrintWriter pw = new PrintWriter(new FileWriter(config))) { pw.println("[core]\n" + - " repositoryformatversion = 0\n" + - " filemode = true\n" + - " bare = false\n" + - " logallrefupdates = true\n" + - " ignorecase = true\n" + - " precomposeunicode = true\n" + + "\trepositoryformatversion = 0\n" + + "\tfilemode = true\n" + + "\tbare = false\n" + + "\tlogallrefupdates = true\n" + + "\tignorecase = true\n" + + "\tprecomposeunicode = true\n" + "[remote \"origin\"]\n" + - " url = git@github.com:" + gitHubUserName + "/JoyOfCoding.git\n" + - " fetch = +refs/heads/*:refs/remotes/origin/*\n" + + "\turl = git@github.com:" + gitHubUserName + "/JoyOfCoding.git\n" + + "\tfetch = +refs/heads/*:refs/remotes/origin/*\n" + "[branch \"main\"]\n" + - " remote = origin\n" + - " merge = refs/heads/main\n"); + "\tremote = origin\n" + + "\tmerge = refs/heads/main\n"); pw.flush(); } } @@ -150,10 +154,14 @@ private InputStream getInputStreamWithLinesOfText(String... lines) { } private static class TextCapturingOutputStream { - private final OutputStream captured = new ByteArrayOutputStream(); + private final ByteArrayOutputStream captured = new ByteArrayOutputStream(); public PrintStream getPrintStream() { return new PrintStream(captured); } + + String getTextThatWasOutput() { + return captured.toString(); + } } } From 6ccc509fc8315a539b1c0918c84ee48aff6d2b7f Mon Sep 17 00:00:00 2001 From: David Whitlock Date: Sun, 16 Jun 2024 13:07:32 -0700 Subject: [PATCH 09/12] Address issue 455 by adding a test that verifies that necessary gradle files are submitted for Android projects. --- .../cs/joy/grader/SubmitAndroidProjectIT.java | 48 +++++++++++++++++++ .../java/edu/pdx/cs/joy/grader/SubmitIT.java | 28 ++++++----- .../cs/joy/grader/SubmitAndroidProject.java | 7 +++ 3 files changed, 71 insertions(+), 12 deletions(-) create mode 100644 grader/src/it/java/edu/pdx/cs/joy/grader/SubmitAndroidProjectIT.java diff --git a/grader/src/it/java/edu/pdx/cs/joy/grader/SubmitAndroidProjectIT.java b/grader/src/it/java/edu/pdx/cs/joy/grader/SubmitAndroidProjectIT.java new file mode 100644 index 000000000..1d8a0a96a --- /dev/null +++ b/grader/src/it/java/edu/pdx/cs/joy/grader/SubmitAndroidProjectIT.java @@ -0,0 +1,48 @@ +package edu.pdx.cs.joy.grader; + +import org.junit.jupiter.api.BeforeEach; + +import java.io.File; +import java.io.IOException; +import java.util.Arrays; + +public class SubmitAndroidProjectIT extends SubmitIT { + + @BeforeEach + @Override + public void createFilesToSubmit() throws IOException { + File mainDir = createDirectories("app", "src", "main", "java", "edu", "pdx", "cs", "joy", studentLoginId); + for (String fileName : Arrays.asList("MainActivity.java", "FirstFragment.java", "SecondFragment.java")) { + this.filesToSubmit.add(createEmptyFile(mainDir, fileName)); + } + + File root = tempDirectory; + for (String fileName : Arrays.asList("build.gradle", "gradle.properties", "gradlew", "settings.gradle")) { + this.filesToSubmit.add(createEmptyFile(root, fileName)); + } + + File appDir = createDirectories("app"); + this.filesToSubmit.add(createEmptyFile(appDir, "build.gradle")); + + File gradleDir = createDirectories("gradle"); + this.filesToSubmit.add(createEmptyFile(gradleDir, "libs.versions.toml")); + + File wrapperDir = createDirectories("gradle", "wrapper"); + for (String fileName : Arrays.asList("gradle-wrapper.jar", "gradle-wrapper.properties")) { + this.filesToSubmit.add(createEmptyFile(wrapperDir, fileName)); + } + + } + + @Override + protected ProjectSubmitter submitter() { + return new AndroidProjectSubmitter(); + } + + private class AndroidProjectSubmitter extends ProjectSubmitter { + @Override + protected Submit getSubmitProgram() { + return new SubmitAndroidProject(() -> submitTime); + } + } +} diff --git a/grader/src/it/java/edu/pdx/cs/joy/grader/SubmitIT.java b/grader/src/it/java/edu/pdx/cs/joy/grader/SubmitIT.java index 367dff077..821af8e8a 100644 --- a/grader/src/it/java/edu/pdx/cs/joy/grader/SubmitIT.java +++ b/grader/src/it/java/edu/pdx/cs/joy/grader/SubmitIT.java @@ -40,8 +40,8 @@ public class SubmitIT extends EmailSenderIntegrationTestCase { private final String studentFirstName = "First"; private final String studentLastName = "Last"; private final String studentName = studentFirstName + " " + studentLastName; - private final Collection filesToSubmit = new ArrayList<>(); - private final String studentLoginId = "student"; + protected final Collection filesToSubmit = new ArrayList<>(); + protected final String studentLoginId = "student"; private final String projectName = "Project"; private final String graderEmail = TA_EMAIL.getAddress(); @@ -111,7 +111,7 @@ public void submitFilesAndDownloadSubmission() throws IOException, MessagingExce assertThat(grade.getScore(), equalTo(Grade.NO_GRADE)); assertThat(grade.getSubmissionTimes().size(), equalTo(1)); - assertZipFileContainsFilesInMavenProjectDirectories(); + assertZipFileContainsFilesInProjectDirectories(); } @Test @@ -139,7 +139,7 @@ void estimatedHoursArePassedThroughToManifest() throws MessagingException, IOExc } - private void assertZipFileContainsFilesInMavenProjectDirectories() throws IOException { + private void assertZipFileContainsFilesInProjectDirectories() throws IOException { File zipFile = findNewestZipFileInTempDirectory(); assertThat(zipFile, is(notNullValue())); List entryNames = getZipFileEntryNames(zipFile); @@ -176,27 +176,27 @@ private File findNewestZipFileInTempDirectory() { } } - private FileSubmitter submitter() { - return new FileSubmitter(); + protected ProjectSubmitter submitter() { + return new ProjectSubmitter(); } - private class FileSubmitter { + protected class ProjectSubmitter { - private LocalDateTime submitTime = LocalDateTime.now(); + protected LocalDateTime submitTime = LocalDateTime.now(); private Double estimatedHours = null; private boolean sendReceipt = false; - public FileSubmitter setSubmitTime(LocalDateTime submitTime) { + public ProjectSubmitter setSubmitTime(LocalDateTime submitTime) { this.submitTime = submitTime; return this; } - public FileSubmitter setEstimatedHours(Double estimatedHours) { + public ProjectSubmitter setEstimatedHours(Double estimatedHours) { this.estimatedHours = estimatedHours; return this; } - public FileSubmitter setSendReceipt(boolean sendReceipt) { + public ProjectSubmitter setSendReceipt(boolean sendReceipt) { this.sendReceipt = sendReceipt; return this; } @@ -207,7 +207,7 @@ private void submitFiles() throws IOException, MessagingException { student.setFirstName(studentFirstName); student.setLastName(studentLastName); - Submit submit = new Submit(() -> submitTime); + Submit submit = getSubmitProgram(); submit.setProjectName(projectName); submit.setStudent(student); submit.setEstimatedHours(estimatedHours); @@ -223,6 +223,10 @@ private void submitFiles() throws IOException, MessagingException { submit.submit(false); } + protected Submit getSubmitProgram() { + return new Submit(() -> submitTime); + } + } @Override diff --git a/grader/src/main/java/edu/pdx/cs/joy/grader/SubmitAndroidProject.java b/grader/src/main/java/edu/pdx/cs/joy/grader/SubmitAndroidProject.java index 97dfb6610..ef0a4a0c5 100644 --- a/grader/src/main/java/edu/pdx/cs/joy/grader/SubmitAndroidProject.java +++ b/grader/src/main/java/edu/pdx/cs/joy/grader/SubmitAndroidProject.java @@ -1,15 +1,22 @@ package edu.pdx.cs.joy.grader; +import com.google.common.annotations.VisibleForTesting; import jakarta.mail.MessagingException; import java.io.File; import java.io.IOException; +import java.time.LocalDateTime; import java.util.Set; public class SubmitAndroidProject extends Submit { private SubmitAndroidProject() { + this(LocalDateTime::now); + } + @VisibleForTesting + SubmitAndroidProject(CurrentTimeProvider currentTimeProvider) { + super(currentTimeProvider); } @Override From 05bac8589c4b1c73b2a23d9cc7ac9699dc943327 Mon Sep 17 00:00:00 2001 From: David Whitlock Date: Sun, 16 Jun 2024 17:52:46 -0700 Subject: [PATCH 10/12] Remove -SNAPSHOT from versions --- examples/pom.xml | 10 +++++----- family/pom.xml | 6 +++--- grader/pom.xml | 4 ++-- pom.xml | 4 ++-- .../archetypes-parent/airline-archetype/pom.xml | 6 +++--- .../src/main/resources/archetype-resources/pom.xml | 8 ++++---- .../archetypes-parent/airline-web-archetype/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 8 ++++---- .../archetypes-parent/apptbook-archetype/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 6 +++--- .../archetypes-parent/apptbook-web-archetype/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 8 ++++---- .../archetypes-parent/java-koans-archetype/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- .../archetypes-parent/kata-archetype/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 4 ++-- .../archetypes-parent/phonebill-archetype/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 6 +++--- .../archetypes-parent/phonebill-web-archetype/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 8 ++++---- projects-parent/archetypes-parent/pom.xml | 4 ++-- .../archetypes-parent/student-archetype/pom.xml | 4 ++-- .../src/main/resources/archetype-resources/pom.xml | 6 +++--- projects-parent/originals-parent/airline-web/pom.xml | 10 +++++----- projects-parent/originals-parent/airline/pom.xml | 8 ++++---- projects-parent/originals-parent/apptbook-web/pom.xml | 10 +++++----- projects-parent/originals-parent/apptbook/pom.xml | 8 ++++---- projects-parent/originals-parent/kata/pom.xml | 6 +++--- projects-parent/originals-parent/phonebill-web/pom.xml | 10 +++++----- projects-parent/originals-parent/phonebill/pom.xml | 8 ++++---- projects-parent/originals-parent/pom.xml | 4 ++-- projects-parent/originals-parent/student/pom.xml | 8 ++++---- projects-parent/pom.xml | 4 ++-- projects-parent/projects/pom.xml | 4 ++-- web/pom.xml | 6 +++--- 35 files changed, 105 insertions(+), 105 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index 044289ea8..b18ae4448 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -3,23 +3,23 @@ joy io.github.davidwhitlock.joy - 1.1.1-SNAPSHOT + 1.1.1 4.0.0 examples examples - 1.2.1-SNAPSHOT + 1.2.1 https://www.cs.pdx.edu/~whitlock io.github.davidwhitlock.joy family - 1.1.1-SNAPSHOT + 1.1.1 io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 com.sun.mail @@ -45,7 +45,7 @@ io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 tests test diff --git a/family/pom.xml b/family/pom.xml index ee67d2a8d..1419b4be0 100644 --- a/family/pom.xml +++ b/family/pom.xml @@ -3,12 +3,12 @@ joy io.github.davidwhitlock.joy - 1.1.1-SNAPSHOT + 1.1.1 4.0.0 family jar - 1.1.1-SNAPSHOT + 1.1.1 Family Tree Application An Family Tree application for The Joy of Coding https://www.cs.pdx.edu/~whitlock @@ -16,7 +16,7 @@ io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 diff --git a/grader/pom.xml b/grader/pom.xml index 6a5bbc078..eedc34d2b 100644 --- a/grader/pom.xml +++ b/grader/pom.xml @@ -2,7 +2,7 @@ joy io.github.davidwhitlock.joy - 1.1.1-SNAPSHOT + 1.1.1 4.0.0 grader @@ -19,7 +19,7 @@ io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 com.opencsv diff --git a/pom.xml b/pom.xml index 4768d6bcc..796275b5c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.github.davidwhitlock.joy - 1.1.1-SNAPSHOT + 1.1.1 joy pom Java Example Code @@ -92,7 +92,7 @@ 0.75 0 - 1.2.0-SNAPSHOT + 1.2.0 diff --git a/projects-parent/archetypes-parent/airline-archetype/pom.xml b/projects-parent/archetypes-parent/airline-archetype/pom.xml index c698b8435..df7026e8b 100644 --- a/projects-parent/archetypes-parent/airline-archetype/pom.xml +++ b/projects-parent/archetypes-parent/airline-archetype/pom.xml @@ -4,10 +4,10 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 airline-archetype - 2.1.1-SNAPSHOT + 2.1.1 maven-archetype airline-archetype @@ -33,7 +33,7 @@ - maven-snapshots + mavens https://s01.oss.sonatype.org/content/repositories/snapshots default diff --git a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/pom.xml index 80a1cf1d1..7a2c2baa0 100644 --- a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/pom.xml @@ -3,7 +3,7 @@ joy io.github.davidwhitlock.joy - 1.1.1-SNAPSHOT + 1.1.1 4.0.0 ${groupId} @@ -32,12 +32,12 @@ io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 tests test @@ -96,7 +96,7 @@ - maven-snapshots + mavens https://s01.oss.sonatype.org/content/repositories/snapshots default diff --git a/projects-parent/archetypes-parent/airline-web-archetype/pom.xml b/projects-parent/archetypes-parent/airline-web-archetype/pom.xml index 58ff419b7..df48c0486 100644 --- a/projects-parent/archetypes-parent/airline-web-archetype/pom.xml +++ b/projects-parent/archetypes-parent/airline-web-archetype/pom.xml @@ -4,10 +4,10 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 airline-web-archetype - 2.2.0-SNAPSHOT + 2.2.0 maven-archetype airline-web-archetype diff --git a/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/pom.xml index 4a2c7c01f..c67e1fa39 100644 --- a/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/pom.xml @@ -3,7 +3,7 @@ joy io.github.davidwhitlock.joy - 1.1.1-SNAPSHOT + 1.1.1 4.0.0 ${groupId} @@ -21,17 +21,17 @@ io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 io.github.davidwhitlock.joy examples - 1.2.1-SNAPSHOT + 1.2.1 io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 tests test diff --git a/projects-parent/archetypes-parent/apptbook-archetype/pom.xml b/projects-parent/archetypes-parent/apptbook-archetype/pom.xml index 04ac31631..6cc388614 100644 --- a/projects-parent/archetypes-parent/apptbook-archetype/pom.xml +++ b/projects-parent/archetypes-parent/apptbook-archetype/pom.xml @@ -4,10 +4,10 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 apptbook-archetype - 2.1.1-SNAPSHOT + 2.1.1 maven-archetype apptbook-archetype diff --git a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/pom.xml index f639b7a2c..37dac08c9 100644 --- a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/pom.xml @@ -3,7 +3,7 @@ joy io.github.davidwhitlock.joy - 1.1.1-SNAPSHOT + 1.1.1 4.0.0 ${groupId} @@ -32,12 +32,12 @@ io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 tests test diff --git a/projects-parent/archetypes-parent/apptbook-web-archetype/pom.xml b/projects-parent/archetypes-parent/apptbook-web-archetype/pom.xml index af5a5250f..69b668c8f 100644 --- a/projects-parent/archetypes-parent/apptbook-web-archetype/pom.xml +++ b/projects-parent/archetypes-parent/apptbook-web-archetype/pom.xml @@ -4,10 +4,10 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 apptbook-web-archetype - 2.2.0-SNAPSHOT + 2.2.0 maven-archetype apptbook-web-archetype diff --git a/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/pom.xml index 308953fb1..17e39ca93 100644 --- a/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/pom.xml @@ -3,7 +3,7 @@ joy io.github.davidwhitlock.joy - 1.1.1-SNAPSHOT + 1.1.1 4.0.0 ${groupId} @@ -21,17 +21,17 @@ io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 io.github.davidwhitlock.joy examples - 1.2.1-SNAPSHOT + 1.2.1 io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 tests test diff --git a/projects-parent/archetypes-parent/java-koans-archetype/pom.xml b/projects-parent/archetypes-parent/java-koans-archetype/pom.xml index df00ca6a1..e94a0a97d 100644 --- a/projects-parent/archetypes-parent/java-koans-archetype/pom.xml +++ b/projects-parent/archetypes-parent/java-koans-archetype/pom.xml @@ -3,13 +3,13 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 4.0.0 java-koans-archetype - 2.1.1-SNAPSHOT + 2.1.1 maven-archetype java-koans-archetype 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 d692ac297..70d1f1d21 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 @@ -4,7 +4,7 @@ joy io.github.davidwhitlock.joy - 1.1.1-SNAPSHOT + 1.1.1 ${groupId} ${artifactId} @@ -48,7 +48,7 @@ io.github.davidwhitlock.joy.com.sandwich koans-lib - 1.1.1-SNAPSHOT + 1.1.1 diff --git a/projects-parent/archetypes-parent/kata-archetype/pom.xml b/projects-parent/archetypes-parent/kata-archetype/pom.xml index 8f1dfddbb..4e96b02bd 100644 --- a/projects-parent/archetypes-parent/kata-archetype/pom.xml +++ b/projects-parent/archetypes-parent/kata-archetype/pom.xml @@ -5,10 +5,10 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 kata-archetype - 2.1.1-SNAPSHOT + 2.1.1 maven-archetype kata-archetype diff --git a/projects-parent/archetypes-parent/kata-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/kata-archetype/src/main/resources/archetype-resources/pom.xml index 9b50c6c6d..eb1558052 100644 --- a/projects-parent/archetypes-parent/kata-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/kata-archetype/src/main/resources/archetype-resources/pom.xml @@ -4,7 +4,7 @@ joy io.github.davidwhitlock.joy - 1.1.1-SNAPSHOT + 1.1.1 ${groupId} ${artifactId} @@ -88,7 +88,7 @@ io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 tests test diff --git a/projects-parent/archetypes-parent/phonebill-archetype/pom.xml b/projects-parent/archetypes-parent/phonebill-archetype/pom.xml index 3fdc7c076..259461263 100644 --- a/projects-parent/archetypes-parent/phonebill-archetype/pom.xml +++ b/projects-parent/archetypes-parent/phonebill-archetype/pom.xml @@ -3,11 +3,11 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 4.0.0 phonebill-archetype - 2.1.1-SNAPSHOT + 2.1.1 maven-archetype phonebill-archetype diff --git a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/pom.xml index c7a0fa6a4..5a985c24f 100644 --- a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/pom.xml @@ -3,7 +3,7 @@ joy io.github.davidwhitlock.joy - 1.1.1-SNAPSHOT + 1.1.1 4.0.0 ${groupId} @@ -38,12 +38,12 @@ io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 tests test diff --git a/projects-parent/archetypes-parent/phonebill-web-archetype/pom.xml b/projects-parent/archetypes-parent/phonebill-web-archetype/pom.xml index 77c039237..c0794777f 100644 --- a/projects-parent/archetypes-parent/phonebill-web-archetype/pom.xml +++ b/projects-parent/archetypes-parent/phonebill-web-archetype/pom.xml @@ -4,10 +4,10 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 phonebill-web-archetype - 2.2.0-SNAPSHOT + 2.2.0 maven-archetype phonebill-web-archetype diff --git a/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/pom.xml index ac43952dd..11d78d138 100644 --- a/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/pom.xml @@ -3,7 +3,7 @@ joy io.github.davidwhitlock.joy - 1.1.1-SNAPSHOT + 1.1.1 4.0.0 ${groupId} @@ -22,17 +22,17 @@ io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 io.github.davidwhitlock.joy examples - 1.2.1-SNAPSHOT + 1.2.1 io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 tests test diff --git a/projects-parent/archetypes-parent/pom.xml b/projects-parent/archetypes-parent/pom.xml index 82178221d..cbea128be 100644 --- a/projects-parent/archetypes-parent/pom.xml +++ b/projects-parent/archetypes-parent/pom.xml @@ -7,11 +7,11 @@ io.github.davidwhitlock.joy projects-parent - 2.1.1-SNAPSHOT + 2.1.1 archetypes-parent - 2.1.1-SNAPSHOT + 2.1.1 pom diff --git a/projects-parent/archetypes-parent/student-archetype/pom.xml b/projects-parent/archetypes-parent/student-archetype/pom.xml index 368038b2e..498dd0083 100644 --- a/projects-parent/archetypes-parent/student-archetype/pom.xml +++ b/projects-parent/archetypes-parent/student-archetype/pom.xml @@ -5,11 +5,11 @@ archetypes-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 student-archetype - 2.2.0-SNAPSHOT + 2.2.0 maven-archetype Archetype for Student project diff --git a/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/pom.xml index 7ca2c53d6..d76a9120f 100644 --- a/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/pom.xml @@ -4,7 +4,7 @@ joy io.github.davidwhitlock.joy - 1.1.1-SNAPSHOT + 1.1.1 ${groupId} ${artifactId} @@ -102,12 +102,12 @@ io.github.davidwhitlock.joy examples - 1.2.1-SNAPSHOT + 1.2.1 io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 tests test diff --git a/projects-parent/originals-parent/airline-web/pom.xml b/projects-parent/originals-parent/airline-web/pom.xml index f108a4684..73bd235c1 100644 --- a/projects-parent/originals-parent/airline-web/pom.xml +++ b/projects-parent/originals-parent/airline-web/pom.xml @@ -3,12 +3,12 @@ originals-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 4.0.0 io.github.davidwhitlock.joy.original airline-web - 2.2.0-SNAPSHOT + 2.2.0 8080 @@ -21,17 +21,17 @@ io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 io.github.davidwhitlock.joy examples - 1.2.1-SNAPSHOT + 1.2.1 io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 tests test diff --git a/projects-parent/originals-parent/airline/pom.xml b/projects-parent/originals-parent/airline/pom.xml index 8686297cb..b9070d2df 100644 --- a/projects-parent/originals-parent/airline/pom.xml +++ b/projects-parent/originals-parent/airline/pom.xml @@ -3,13 +3,13 @@ originals-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 4.0.0 io.github.davidwhitlock.joy.original airline jar - 2.1.1-SNAPSHOT + 2.1.1 Airline Project An Airline application for The Joy of Coding at Portland State University 2000 @@ -32,12 +32,12 @@ io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 tests test diff --git a/projects-parent/originals-parent/apptbook-web/pom.xml b/projects-parent/originals-parent/apptbook-web/pom.xml index 825eaf1e1..9bc2f1f48 100644 --- a/projects-parent/originals-parent/apptbook-web/pom.xml +++ b/projects-parent/originals-parent/apptbook-web/pom.xml @@ -3,12 +3,12 @@ originals-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 4.0.0 io.github.davidwhitlock.joy.original apptbook-web - 2.2.0-SNAPSHOT + 2.2.0 8080 @@ -21,17 +21,17 @@ io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 io.github.davidwhitlock.joy examples - 1.2.1-SNAPSHOT + 1.2.1 io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 tests test diff --git a/projects-parent/originals-parent/apptbook/pom.xml b/projects-parent/originals-parent/apptbook/pom.xml index 62a6b4ebe..f45bfb3d0 100644 --- a/projects-parent/originals-parent/apptbook/pom.xml +++ b/projects-parent/originals-parent/apptbook/pom.xml @@ -3,13 +3,13 @@ originals-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 4.0.0 io.github.davidwhitlock.joy.original apptbook jar - 2.1.1-SNAPSHOT + 2.1.1 Appointment Book Project An Appointment Book application for The Joy of Coding at Portland State University 2000 @@ -32,12 +32,12 @@ io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 tests test diff --git a/projects-parent/originals-parent/kata/pom.xml b/projects-parent/originals-parent/kata/pom.xml index baed56708..a70314638 100644 --- a/projects-parent/originals-parent/kata/pom.xml +++ b/projects-parent/originals-parent/kata/pom.xml @@ -4,11 +4,11 @@ originals-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 io.github.davidwhitlock.joy.original kata - 2.1.1-SNAPSHOT + 2.1.1 jar Kata Project @@ -88,7 +88,7 @@ io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 tests test diff --git a/projects-parent/originals-parent/phonebill-web/pom.xml b/projects-parent/originals-parent/phonebill-web/pom.xml index cb1b00f17..9c01d988f 100644 --- a/projects-parent/originals-parent/phonebill-web/pom.xml +++ b/projects-parent/originals-parent/phonebill-web/pom.xml @@ -3,12 +3,12 @@ originals-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 4.0.0 io.github.davidwhitlock.joy.original phonebill-web - 2.2.0-SNAPSHOT + 2.2.0 8080 @@ -22,17 +22,17 @@ io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 io.github.davidwhitlock.joy examples - 1.2.1-SNAPSHOT + 1.2.1 io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 tests test diff --git a/projects-parent/originals-parent/phonebill/pom.xml b/projects-parent/originals-parent/phonebill/pom.xml index dc40bebe9..709843f0a 100644 --- a/projects-parent/originals-parent/phonebill/pom.xml +++ b/projects-parent/originals-parent/phonebill/pom.xml @@ -3,13 +3,13 @@ originals-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 4.0.0 io.github.davidwhitlock.joy.original phonebill jar - 2.1.1-SNAPSHOT + 2.1.1 Phone Bill Project A Phone Bill application for The Joy of Coding at Portland State University 2000 @@ -38,12 +38,12 @@ io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 tests test diff --git a/projects-parent/originals-parent/pom.xml b/projects-parent/originals-parent/pom.xml index 69684a41b..3e84d24b4 100644 --- a/projects-parent/originals-parent/pom.xml +++ b/projects-parent/originals-parent/pom.xml @@ -5,11 +5,11 @@ io.github.davidwhitlock.joy projects-parent - 2.1.1-SNAPSHOT + 2.1.1 originals-parent - 2.1.1-SNAPSHOT + 2.1.1 pom diff --git a/projects-parent/originals-parent/student/pom.xml b/projects-parent/originals-parent/student/pom.xml index c165622a1..587987765 100644 --- a/projects-parent/originals-parent/student/pom.xml +++ b/projects-parent/originals-parent/student/pom.xml @@ -4,11 +4,11 @@ originals-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 io.github.davidwhitlock.joy.original student - 2.2.0-SNAPSHOT + 2.2.0 jar Student Project @@ -88,12 +88,12 @@ io.github.davidwhitlock.joy examples - 1.2.1-SNAPSHOT + 1.2.1 io.github.davidwhitlock.joy projects - 2.1.1-SNAPSHOT + 2.1.1 tests test diff --git a/projects-parent/pom.xml b/projects-parent/pom.xml index ea1a06653..e976640b0 100644 --- a/projects-parent/pom.xml +++ b/projects-parent/pom.xml @@ -7,11 +7,11 @@ io.github.davidwhitlock.joy joy - 1.1.1-SNAPSHOT + 1.1.1 projects-parent - 2.1.1-SNAPSHOT + 2.1.1 pom diff --git a/projects-parent/projects/pom.xml b/projects-parent/projects/pom.xml index ba576135c..0a9d6cd6e 100644 --- a/projects-parent/projects/pom.xml +++ b/projects-parent/projects/pom.xml @@ -2,13 +2,13 @@ projects-parent io.github.davidwhitlock.joy - 2.1.1-SNAPSHOT + 2.1.1 4.0.0 projects Project APIs Classes needed for the Projects in The Joy of Coding - 2.1.1-SNAPSHOT + 2.1.1 http://www.cs.pdx.edu/~whitlock diff --git a/web/pom.xml b/web/pom.xml index 5925ad0bf..5cf076050 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -3,14 +3,14 @@ joy io.github.davidwhitlock.joy - 1.1.1-SNAPSHOT + 1.1.1 4.0.0 io.github.davidwhitlock.joy web war Web Application examples - 1.2.1-SNAPSHOT + 1.2.1 http://www.cs.pdx.edu/~whitlock 6.2.8.Final @@ -118,7 +118,7 @@ io.github.davidwhitlock.joy examples - 1.2.1-SNAPSHOT + 1.2.1 jakarta.xml.bind From f1bce06fe54058cb5163433e3f48b137f2d93e3e Mon Sep 17 00:00:00 2001 From: David Whitlock Date: Sun, 16 Jun 2024 18:22:49 -0700 Subject: [PATCH 11/12] Increase version on a couple of projects. Guess I missed them the first time. --- projects-parent/archetypes-parent/airline-web-archetype/pom.xml | 2 +- .../archetypes-parent/apptbook-web-archetype/pom.xml | 2 +- .../archetypes-parent/phonebill-web-archetype/pom.xml | 2 +- projects-parent/archetypes-parent/student-archetype/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects-parent/archetypes-parent/airline-web-archetype/pom.xml b/projects-parent/archetypes-parent/airline-web-archetype/pom.xml index df48c0486..c121430aa 100644 --- a/projects-parent/archetypes-parent/airline-web-archetype/pom.xml +++ b/projects-parent/archetypes-parent/airline-web-archetype/pom.xml @@ -7,7 +7,7 @@ 2.1.1 airline-web-archetype - 2.2.0 + 2.2.1 maven-archetype airline-web-archetype diff --git a/projects-parent/archetypes-parent/apptbook-web-archetype/pom.xml b/projects-parent/archetypes-parent/apptbook-web-archetype/pom.xml index 69b668c8f..439e53e87 100644 --- a/projects-parent/archetypes-parent/apptbook-web-archetype/pom.xml +++ b/projects-parent/archetypes-parent/apptbook-web-archetype/pom.xml @@ -7,7 +7,7 @@ 2.1.1 apptbook-web-archetype - 2.2.0 + 2.2.1 maven-archetype apptbook-web-archetype diff --git a/projects-parent/archetypes-parent/phonebill-web-archetype/pom.xml b/projects-parent/archetypes-parent/phonebill-web-archetype/pom.xml index c0794777f..59b0572d6 100644 --- a/projects-parent/archetypes-parent/phonebill-web-archetype/pom.xml +++ b/projects-parent/archetypes-parent/phonebill-web-archetype/pom.xml @@ -7,7 +7,7 @@ 2.1.1 phonebill-web-archetype - 2.2.0 + 2.2.1 maven-archetype phonebill-web-archetype diff --git a/projects-parent/archetypes-parent/student-archetype/pom.xml b/projects-parent/archetypes-parent/student-archetype/pom.xml index 498dd0083..9a730dcfe 100644 --- a/projects-parent/archetypes-parent/student-archetype/pom.xml +++ b/projects-parent/archetypes-parent/student-archetype/pom.xml @@ -9,7 +9,7 @@ student-archetype - 2.2.0 + 2.2.1 maven-archetype Archetype for Student project From 21931884e31cd1ab3494818a1330debb018f87e7 Mon Sep 17 00:00:00 2001 From: David Whitlock Date: Sun, 16 Jun 2024 18:45:13 -0700 Subject: [PATCH 12/12] Oops. Restore in the intended name for the maven-snapshots repository. --- projects-parent/archetypes-parent/airline-archetype/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- projects-parent/archetypes-parent/java-koans-archetype/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- projects-parent/archetypes-parent/student-archetype/pom.xml | 2 +- .../src/main/resources/archetype-resources/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/projects-parent/archetypes-parent/airline-archetype/pom.xml b/projects-parent/archetypes-parent/airline-archetype/pom.xml index df7026e8b..cbb79b8d8 100644 --- a/projects-parent/archetypes-parent/airline-archetype/pom.xml +++ b/projects-parent/archetypes-parent/airline-archetype/pom.xml @@ -33,7 +33,7 @@ - mavens + maven-snapshots https://s01.oss.sonatype.org/content/repositories/snapshots default diff --git a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/pom.xml index 7a2c2baa0..867ccbad7 100644 --- a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/pom.xml @@ -96,7 +96,7 @@ - mavens + maven-snapshots https://s01.oss.sonatype.org/content/repositories/snapshots default diff --git a/projects-parent/archetypes-parent/java-koans-archetype/pom.xml b/projects-parent/archetypes-parent/java-koans-archetype/pom.xml index e94a0a97d..c80befced 100644 --- a/projects-parent/archetypes-parent/java-koans-archetype/pom.xml +++ b/projects-parent/archetypes-parent/java-koans-archetype/pom.xml @@ -68,7 +68,7 @@ - mavens + maven-snapshots https://s01.oss.sonatype.org/content/repositories/snapshots default 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 70d1f1d21..47ca39821 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 @@ -109,7 +109,7 @@ - mavens + maven-snapshots https://s01.oss.sonatype.org/content/repositories/snapshots default diff --git a/projects-parent/archetypes-parent/student-archetype/pom.xml b/projects-parent/archetypes-parent/student-archetype/pom.xml index 9a730dcfe..8ee340c7d 100644 --- a/projects-parent/archetypes-parent/student-archetype/pom.xml +++ b/projects-parent/archetypes-parent/student-archetype/pom.xml @@ -54,7 +54,7 @@ - mavens + maven-snapshots https://s01.oss.sonatype.org/content/repositories/snapshots default diff --git a/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/pom.xml b/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/pom.xml index d76a9120f..c7916ce0d 100644 --- a/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/pom.xml +++ b/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/pom.xml @@ -21,7 +21,7 @@ - mavens + maven-snapshots https://s01.oss.sonatype.org/content/repositories/snapshots default