diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 1367b61f14..a736a09b6c 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [ '17', '22' ]
+ java: [ '21', '24' ]
name: JDK ${{ matrix.Java }}
steps:
- uses: actions/checkout@v4
diff --git a/examples/pom.xml b/examples/pom.xml
index 96add48504..3557e8ff02 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -3,23 +3,23 @@
joy
io.github.davidwhitlock.joy
- 1.2.0
+ 1.2.2
4.0.0
examples
examples
- 1.3.0
+ 1.3.3
https://www.cs.pdx.edu/~whitlock
io.github.davidwhitlock.joy
family
- 1.1.2
+ 1.1.4
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
com.sun.mail
@@ -45,7 +45,7 @@
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
tests
test
diff --git a/family/pom.xml b/family/pom.xml
index 6892e5f3ec..7228407281 100644
--- a/family/pom.xml
+++ b/family/pom.xml
@@ -3,12 +3,12 @@
joy
io.github.davidwhitlock.joy
- 1.2.0
+ 1.2.2
4.0.0
family
jar
- 1.1.2
+ 1.1.4
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
- 3.0.0
+ 3.0.2
diff --git a/grader/pom.xml b/grader/pom.xml
index caeef26b51..68b7e90445 100644
--- a/grader/pom.xml
+++ b/grader/pom.xml
@@ -2,7 +2,7 @@
joy
io.github.davidwhitlock.joy
- 1.2.0
+ 1.2.2
4.0.0
grader
@@ -19,7 +19,7 @@
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
com.opencsv
diff --git a/pom.xml b/pom.xml
index b098d8e4a5..96d4e36847 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
4.0.0
io.github.davidwhitlock.joy
- 1.2.0
+ 1.2.2
joy
pom
Java Example Code
@@ -54,38 +54,38 @@
true
- 17
- 17
+ 21
+ 21
- 33.3.1-jre
+ 33.4.8-jre
7.0.0
6.1.0
UTF-8
UTF-8
- 7.7.0
+ 7.13.0
2.0.4
3.5.3
- 5.11.3
+ 5.12.2
3.0
- 5.14.2
- 3.5.2
+ 5.17.0
+ 3.5.3
3.4.2
3.6.0
- 3.13.0
- 11.0.24
- 4.8.6.6
- 0.8.12
+ 3.14.0
+ 11.0.25
+ 4.9.3.0
+ 0.8.13
3.6.0
3.3.1
- 3.8.0
- 3.5.2
+ 3.9.0
+ 3.5.3
3.6.0
- 10.20.1
- 3.3.0
- 3.11.1
+ 10.23.1
+ 3.4.0
+ 3.11.2
3.26.0
2.18.0
3.5.0
@@ -93,7 +93,7 @@
0.75
0
- 1.3.1
+ 1.3.3
@@ -137,7 +137,7 @@
- 3.6.1
+ 3.6.3
${maven.compiler.target}
@@ -195,7 +195,7 @@
org.apache.maven.plugins
maven-deploy-plugin
- 3.1.3
+ 3.1.4
org.apache.maven.plugins
@@ -240,14 +240,12 @@
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.7.0
+ org.sonatype.central
+ central-publishing-maven-plugin
+ 0.7.0
true
- ossrh
- https://s01.oss.sonatype.org/
- true
+ central
@@ -691,14 +689,6 @@
-
- ossrh
- https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
-
-
- ossrh
- https://s01.oss.sonatype.org/content/repositories/snapshots
-
gh-pages
GitHub Pages
diff --git a/projects-parent/archetypes-parent/airline-archetype/pom.xml b/projects-parent/archetypes-parent/airline-archetype/pom.xml
index ec5db4b011..c6c3fc7f42 100644
--- a/projects-parent/archetypes-parent/airline-archetype/pom.xml
+++ b/projects-parent/archetypes-parent/airline-archetype/pom.xml
@@ -5,10 +5,10 @@
archetypes-parent
io.github.davidwhitlock.joy
- 2.2.0
+ 2.2.2
airline-archetype
- 2.2.0
+ 2.2.2
maven-archetype
airline-archetype
@@ -34,9 +34,9 @@
- maven-snapshots
- https://s01.oss.sonatype.org/content/repositories/snapshots
- default
+ Central Portal Snapshots
+ central-portals
+ https://central.sonatype.com/repository/mavens/
false
diff --git a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 78c6f431db..30aec9187a 100644
--- a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -2,6 +2,14 @@
+
+
+ false
+
+
+ true
+
+
src/main/java
diff --git a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/META-INF/maven/archetype.xml b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index 02c0848172..0000000000
--- a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
- airline
-
- src/main/java/Project1.java
-
-
- src/test/java/Project1Test.java
-
-
- src/main/javadoc/edu/pdx/cs/joy/YOU/package.html
-
-
- src/test/javadoc/edu/pdx/cs/joy/YOU/package.html
-
-
\ No newline at end of file
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 9e6b639ec3..d1d34289b6 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.2.0
+ 1.2.2
4.0.0
${groupId}
@@ -32,12 +32,12 @@
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
tests
test
@@ -96,9 +96,9 @@
- maven-snapshots
- https://s01.oss.sonatype.org/content/repositories/snapshots
- default
+ Central Portal Snapshots
+ central-portals
+ https://central.sonatype.com/repository/mavens/
false
diff --git a/projects-parent/archetypes-parent/airline-web-archetype/pom.xml b/projects-parent/archetypes-parent/airline-web-archetype/pom.xml
index f27a0cac60..0bf2a80d0b 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.2.0
+ 2.2.2
airline-web-archetype
- 3.0.0
+ 3.0.2
maven-archetype
airline-web-archetype
diff --git a/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 20b6e398c0..8973bc35d6 100644
--- a/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -2,6 +2,14 @@
+
+
+ false
+
+
+ true
+
+
src/main/java
diff --git a/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/META-INF/maven/archetype.xml b/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index 05c4288055..0000000000
--- a/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
- airline-web
-
- src/main/java/AirlineRestClient.java
- src/main/java/AirlineServlet.java
- src/main/java/Messages.java
- src/main/java/Project5.java
-
-
- src/test/java/Project5Test.java
-
-
- src/main/webapp/WEB-INF/web.xml
-
-
\ No newline at end of file
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 0563668879..7df66d6856 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.2.0
+ 1.2.2
4.0.0
${groupId}
@@ -21,17 +21,17 @@
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
io.github.davidwhitlock.joy
examples
- 1.3.0
+ 1.3.3
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
tests
test
diff --git a/projects-parent/archetypes-parent/apptbook-archetype/pom.xml b/projects-parent/archetypes-parent/apptbook-archetype/pom.xml
index 6d1ff50232..6c79826c53 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.2.0
+ 2.2.2
apptbook-archetype
- 2.2.0
+ 2.2.2
maven-archetype
apptbook-archetype
diff --git a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 8e3ff31d26..e3bd235617 100644
--- a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -2,6 +2,14 @@
+
+
+ false
+
+
+ true
+
+
src/main/java
diff --git a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/META-INF/maven/archetype.xml b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index b924882ef3..0000000000
--- a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
- apptbook
-
- src/main/java/Project1.java
-
-
- src/test/java/Project1Test.java
-
-
- src/main/javadoc/edu/pdx/cs/joy/YOU/package.html
-
-
- src/test/javadoc/edu/pdx/cs/joy/YOU/package.html
-
-
\ No newline at end of file
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 48caab94e9..3f5a6a2f97 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.2.0
+ 1.2.2
4.0.0
${groupId}
@@ -32,12 +32,12 @@
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
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 1e31d9ed77..e7ec726e38 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.2.0
+ 2.2.2
apptbook-web-archetype
- 3.0.0
+ 3.0.2
maven-archetype
apptbook-web-archetype
diff --git a/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 30ae062723..a8b315a159 100644
--- a/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -2,6 +2,14 @@
+
+
+ false
+
+
+ true
+
+
src/main/java
diff --git a/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/META-INF/maven/archetype.xml b/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index 7615edc083..0000000000
--- a/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
- apptbook-web
-
- src/main/java/AppointmentBookRestClient.java
- src/main/java/AppointmentBookServlet.java
- src/main/java/Messages.java
- src/main/java/Project4.java
-
-
- src/test/java/Project4Test.java
-
-
- src/main/webapp/WEB-INF/web.xml
-
-
\ No newline at end of file
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 753dbaa04b..43543f0324 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.2.0
+ 1.2.2
4.0.0
${groupId}
@@ -21,17 +21,17 @@
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
io.github.davidwhitlock.joy
examples
- 1.3.0
+ 1.3.3
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
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 2319df03ca..b76266bf5e 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.2.0
+ 2.2.2
4.0.0
java-koans-archetype
- 2.2.0
+ 2.2.2
maven-archetype
java-koans-archetype
@@ -68,9 +68,9 @@
- maven-snapshots
- https://s01.oss.sonatype.org/content/repositories/snapshots
- default
+ Central Portal Snapshots
+ central-portals
+ https://central.sonatype.com/repository/mavens/
false
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 5b45a4b8e5..2b18b6f048 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.2.0
+ 1.2.2
${artifactId}
${groupId}
@@ -50,7 +50,7 @@
io.github.davidwhitlock.joy.com.sandwich
koans-lib
- 1.2.0
+ 1.2.2
@@ -111,9 +111,9 @@
- maven-snapshots
- https://s01.oss.sonatype.org/content/repositories/snapshots
- default
+ Central Portal Snapshots
+ central-portals
+ https://central.sonatype.com/repository/mavens/
false
diff --git a/projects-parent/archetypes-parent/kata-archetype/pom.xml b/projects-parent/archetypes-parent/kata-archetype/pom.xml
index 7062b44979..8b8585b89a 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.2.0
+ 2.2.2
kata-archetype
- 2.2.0
+ 2.2.2
maven-archetype
kata-archetype
diff --git a/projects-parent/archetypes-parent/kata-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/projects-parent/archetypes-parent/kata-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index cd2eec8aac..954ae4b271 100644
--- a/projects-parent/archetypes-parent/kata-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/projects-parent/archetypes-parent/kata-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -2,6 +2,14 @@
+
+
+ false
+
+
+ true
+
+
src/main/java
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 34a56ff079..ca85edf4b3 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.2.0
+ 1.2.2
${groupId}
${artifactId}
@@ -88,7 +88,7 @@
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
tests
test
diff --git a/projects-parent/archetypes-parent/phonebill-archetype/pom.xml b/projects-parent/archetypes-parent/phonebill-archetype/pom.xml
index 724ac2046b..0922c719bf 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.2.0
+ 2.2.2
4.0.0
phonebill-archetype
- 2.2.0
+ 2.2.2
maven-archetype
phonebill-archetype
diff --git a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 6ee2ffa4cc..2d6e6e6f3b 100644
--- a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -2,6 +2,14 @@
+
+
+ false
+
+
+ true
+
+
src/main/java
diff --git a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/META-INF/maven/archetype.xml b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index 5ec434919e..0000000000
--- a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
- phonebill
-
- src/main/java/Project1.java
-
-
- src/test/java/Project1Test.java
-
-
- src/main/javadoc/edu/pdx/cs/joy/YOU/package.html
-
-
- src/test/javadoc/edu/pdx/cs/joy/YOU/package.html
-
-
\ No newline at end of file
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 672245f01f..39dc4293c0 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.2.0
+ 1.2.2
4.0.0
${groupId}
@@ -38,12 +38,12 @@
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
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 80491a6912..e0488e8ee3 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.2.0
+ 2.2.2
phonebill-web-archetype
- 3.0.0
+ 3.0.2
maven-archetype
phonebill-web-archetype
diff --git a/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index c91dad1da7..2cec6eb309 100644
--- a/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -2,6 +2,14 @@
+
+
+ false
+
+
+ true
+
+
src/main/java
diff --git a/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/META-INF/maven/archetype.xml b/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index d46831ecbf..0000000000
--- a/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
- phonebill-web
-
- src/main/java/PhoneBillRestClient.java
- src/main/java/PhobeBillServlet.java
- src/main/java/Messages.java
- src/main/java/Project4.java
-
-
- src/test/java/Project4Test.java
-
-
- src/main/webapp/WEB-INF/web.xml
-
-
\ No newline at end of file
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 50c08c31ac..d81b4f3002 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.2.0
+ 1.2.2
4.0.0
${groupId}
@@ -22,17 +22,17 @@
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
io.github.davidwhitlock.joy
examples
- 1.3.0
+ 1.3.3
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
tests
test
diff --git a/projects-parent/archetypes-parent/pom.xml b/projects-parent/archetypes-parent/pom.xml
index e44ae12a66..a163be0020 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.2.0
+ 2.2.2
archetypes-parent
- 2.2.0
+ 2.2.2
pom
diff --git a/projects-parent/archetypes-parent/student-archetype/pom.xml b/projects-parent/archetypes-parent/student-archetype/pom.xml
index 8001154fb7..5c9bb7fa63 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.2.0
+ 2.2.2
student-archetype
- 2.3.0
+ 2.3.3
maven-archetype
Archetype for Student project
@@ -52,11 +52,25 @@
-
+
+
+ Apache License, Version 2.0
+ https://www.apache.org/licenses/LICENSE-2.0.txt
+ repo
+
+
+
+
+ scm:git:git@github.com:JoyOfCodingPDX/JoyOfCoding.git/projects-parent/originals-parent/student
+ scm:git:git@github.com:JoyOfCodingPDX/JoyOfCoding.git/projects-parent/originals-parent/student
+ https://github.com/JoyOfCodingPDX/JoyOfCoding/tree/main/projects-parent/originals-parent/student
+
+
+
- maven-snapshots
- https://s01.oss.sonatype.org/content/repositories/snapshots
- default
+ Central Portal Snapshots
+ central-portals
+ https://central.sonatype.com/repository/mavens/
false
@@ -64,6 +78,10 @@
true
-
-
+
+ gh-pages
+ GitHub Pages
+ scm:git:git@github.com:JoyOfCodingPDX/JoyOfCoding.git/projects-parent/originals-parent
+
+
diff --git a/projects-parent/archetypes-parent/student-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/projects-parent/archetypes-parent/student-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 0cea09b460..26b7861801 100644
--- a/projects-parent/archetypes-parent/student-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/projects-parent/archetypes-parent/student-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -1,7 +1,15 @@
-
+
+
+ false
+
+
+ true
+
+
src/main/java
@@ -15,27 +23,25 @@
**/*.java
-
- src/it/java
+
+ src/site
- **/*.java
+ **/*.xml
-
-
+
+ src/it/java
- **/*.xml
+ **/*.java
.mvn/wrapper
- **/*.java
**/*.properties
-
mvnw.cmd
mvnw
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 da88f580ce..c9ec52e8af 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.2.0
+ 1.2.2
${groupId}
${artifactId}
@@ -21,9 +21,9 @@
- maven-snapshots
- https://s01.oss.sonatype.org/content/repositories/snapshots
- default
+ Central Portal Snapshots
+ central-portals
+ https://central.sonatype.com/repository/mavens/
false
@@ -102,12 +102,12 @@
io.github.davidwhitlock.joy
examples
- 1.3.0
+ 1.3.3
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
tests
test
diff --git a/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/src/site/site.xml b/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/src/site/site.xml
index 20eef036fa..4bbb76b47a 100644
--- a/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/src/site/site.xml
+++ b/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/src/site/site.xml
@@ -1,3 +1,6 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
diff --git a/projects-parent/archetypes-parent/student-archetype/src/test/resources/projects/basic/archetype.properties b/projects-parent/archetypes-parent/student-archetype/src/test/resources/projects/basic/archetype.properties
index 670ae42567..ff51ce1081 100644
--- a/projects-parent/archetypes-parent/student-archetype/src/test/resources/projects/basic/archetype.properties
+++ b/projects-parent/archetypes-parent/student-archetype/src/test/resources/projects/basic/archetype.properties
@@ -1,5 +1,5 @@
-#Mon May 27 07:53:28 PDT 2019
+#Sat Apr 26 07:11:46 PDT 2025
+artifactId=basic
+groupId=archetype.it
package=it.pkg
version=0.1-SNAPSHOT
-groupId=archetype.it
-artifactId=basic
diff --git a/projects-parent/originals-parent/airline-web/pom.xml b/projects-parent/originals-parent/airline-web/pom.xml
index 0560796702..7b6dba6ecc 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.2.0
+ 2.2.2
4.0.0
io.github.davidwhitlock.joy.original
airline-web
- 3.0.0
+ 3.0.2
8080
@@ -21,17 +21,17 @@
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
io.github.davidwhitlock.joy
examples
- 1.3.0
+ 1.3.3
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
tests
test
diff --git a/projects-parent/originals-parent/airline/pom.xml b/projects-parent/originals-parent/airline/pom.xml
index 0f3cb2b651..5a7c1a730c 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.2.0
+ 2.2.2
4.0.0
io.github.davidwhitlock.joy.original
airline
jar
- 2.2.0
+ 2.2.2
Airline Project
An Airline application for The Joy of Coding at Portland State University
2000
@@ -32,12 +32,12 @@
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
tests
test
diff --git a/projects-parent/originals-parent/apptbook-web/pom.xml b/projects-parent/originals-parent/apptbook-web/pom.xml
index 94cd8a1123..f39e11a475 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.2.0
+ 2.2.2
4.0.0
io.github.davidwhitlock.joy.original
apptbook-web
- 3.0.0
+ 3.0.2
8080
@@ -21,17 +21,17 @@
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
io.github.davidwhitlock.joy
examples
- 1.3.0
+ 1.3.3
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
tests
test
diff --git a/projects-parent/originals-parent/apptbook/pom.xml b/projects-parent/originals-parent/apptbook/pom.xml
index 4936844e7f..0f1fddbd2f 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.2.0
+ 2.2.2
4.0.0
io.github.davidwhitlock.joy.original
apptbook
jar
- 2.2.0
+ 2.2.2
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
- 3.0.0
+ 3.0.2
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
tests
test
diff --git a/projects-parent/originals-parent/kata/pom.xml b/projects-parent/originals-parent/kata/pom.xml
index 0d9392a76b..4c273a0821 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.2.0
+ 2.2.2
io.github.davidwhitlock.joy.original
kata
- 2.2.0
+ 2.2.2
jar
Kata Project
@@ -88,7 +88,7 @@
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
tests
test
diff --git a/projects-parent/originals-parent/phonebill-web/pom.xml b/projects-parent/originals-parent/phonebill-web/pom.xml
index fc4ad13607..6e0b7fa3fe 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.2.0
+ 2.2.2
4.0.0
io.github.davidwhitlock.joy.original
phonebill-web
- 3.0.0
+ 3.0.2
8080
@@ -22,17 +22,17 @@
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
io.github.davidwhitlock.joy
examples
- 1.3.0
+ 1.3.3
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
tests
test
diff --git a/projects-parent/originals-parent/phonebill/pom.xml b/projects-parent/originals-parent/phonebill/pom.xml
index d70423a552..245a3610cd 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.2.0
+ 2.2.2
4.0.0
io.github.davidwhitlock.joy.original
phonebill
jar
- 2.2.0
+ 2.2.2
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
- 3.0.0
+ 3.0.2
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
tests
test
diff --git a/projects-parent/originals-parent/pom.xml b/projects-parent/originals-parent/pom.xml
index 4ceaa38b80..cc0017ba27 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.2.0
+ 2.2.2
originals-parent
- 2.2.0
+ 2.2.2
pom
diff --git a/projects-parent/originals-parent/student/pom.xml b/projects-parent/originals-parent/student/pom.xml
index 83743141bb..6cf0832ef1 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.2.0
+ 2.2.2
io.github.davidwhitlock.joy.original
student
- 2.3.1
+ 2.3.3
jar
Student Project
@@ -88,12 +88,12 @@
io.github.davidwhitlock.joy
examples
- 1.3.0
+ 1.3.3
io.github.davidwhitlock.joy
projects
- 3.0.0
+ 3.0.2
tests
test
diff --git a/projects-parent/pom.xml b/projects-parent/pom.xml
index 0abd54173f..bbee4bd8d5 100644
--- a/projects-parent/pom.xml
+++ b/projects-parent/pom.xml
@@ -7,11 +7,11 @@
io.github.davidwhitlock.joy
joy
- 1.2.0
+ 1.2.2
projects-parent
- 2.2.0
+ 2.2.2
pom
diff --git a/projects-parent/projects/pom.xml b/projects-parent/projects/pom.xml
index be92438667..1384984b5e 100644
--- a/projects-parent/projects/pom.xml
+++ b/projects-parent/projects/pom.xml
@@ -2,13 +2,13 @@
projects-parent
io.github.davidwhitlock.joy
- 2.2.0
+ 2.2.2
4.0.0
projects
Project APIs
Classes needed for the Projects in The Joy of Coding
- 3.0.0
+ 3.0.2
http://www.cs.pdx.edu/~whitlock
diff --git a/web/pom.xml b/web/pom.xml
index a8f202e0f6..c086fcf9ac 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -3,13 +3,13 @@
joy
io.github.davidwhitlock.joy
- 1.2.0
+ 1.2.2
4.0.0
web
war
Web Application examples
- 2.0.0
+ 2.0.2
http://www.cs.pdx.edu/~whitlock
6.2.11.Final
@@ -117,7 +117,7 @@
io.github.davidwhitlock.joy
examples
- 1.3.0
+ 1.3.3
jakarta.xml.bind