diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md new file mode 100644 index 0000000000..ea9bc2c212 --- /dev/null +++ b/.github/copilot-instructions.md @@ -0,0 +1,22 @@ +# JoyOfCoding repository instructions + +## Build, test, and lint + +- Use the Maven Wrapper from the repository root. The CI build is `./mvnw --batch-mode verify --file pom.xml`; it runs unit tests, integration tests, and the configured JaCoCo reporting. CI runs this with JDK 21 and 24. The reactor enforces Java 21, except `projects-parent/projects`, which deliberately compiles Java 8-compatible APIs. +- Run a module's unit tests with its required reactor dependencies: `./mvnw --batch-mode -pl -am test`. For one test or method, add `-Dtest=FullyQualifiedTestClass` or `-Dtest=FullyQualifiedTestClass#method`; for example, `./mvnw --batch-mode -pl projects-parent/projects -am -Dtest=edu.pdx.cs.joy.InvokeMainTest test`. +- Integration tests live in `src/it/java`, are compiled separately, and run through Failsafe during `verify`. Run one with `./mvnw --batch-mode -pl web -am -Dit.test=edu.pdx.cs.joy.servlets.MovieDatabaseServletIT verify`. The `web` module starts Jetty on port 8080 for its integration-test lifecycle. +- The project does not have one reactor-wide lint phase. The reference project modules under `projects-parent/originals-parent` bind Checkstyle; run it for a changed reference project with `./mvnw --batch-mode -pl projects-parent/originals-parent/ checkstyle:check`. Generate the Maven documentation site with `./mvnw --batch-mode site --file pom.xml`. + +## Architecture + +- This is a Maven multi-module codebase for "The Joy of Coding" course. The root reactor builds `examples`, `web`, `family`, `grader`, and `projects-parent`. +- `projects-parent/projects` is the shared course API: abstract domain types, parsers/dumpers, XML helpers, and test utilities used by the course projects. Keep it Java 8-compatible because Android projects consume it. +- `projects-parent/originals-parent` contains the reference implementations of student assignments (airline, appointment book, phone bill, student, and kata, including web variants). `projects-parent/archetypes-parent` packages the corresponding student project templates. Template source is under each archetype's `src/main/resources/archetype-resources`; its `META-INF/maven/archetype-metadata.xml` controls which files are filtered and packaged. +- `examples` contains independent Java examples, while `family` is a family-tree application and `grader` is the course grading/gradebook tooling. The grader produces a shaded executable with `edu.pdx.cs.joy.grader.GraderTools` as its entry point. +- `web` packages a WAR. Traditional servlet endpoints and URL mappings are declared in `web/src/main/webapp/WEB-INF/web.xml`; RESTEasy/Guice REST services are registered in `edu.pdx.cs.joy.di.RestModule` and served beneath `/rest`. + +## Codebase conventions + +- Use JUnit Jupiter for tests, with Hamcrest matchers commonly used for expressive assertions. Keep fast tests in `src/test/java`; put tests that need external services, Jetty, or mail fixtures in `src/it/java` and name them `*IT`. +- Course-project command-line tests should extend `edu.pdx.cs.joy.InvokeMainTestCase` from the shared `projects` test JAR. Its default invocation rejects mutable static fields and captures standard output/error; use its explicit `invokeMainAllowingMutableStaticFields` only when that behavior is intentional. +- Reference projects are built with the `grader` profile, which applies API-doclet validation and JaCoCo thresholds (at least 75% instruction coverage and no missed classes). Preserve the original project and archetype-template distinction when changing assignment-facing behavior. diff --git a/examples/pom.xml b/examples/pom.xml index c6475cd46f..29990daedf 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -3,18 +3,18 @@ joy io.github.davidwhitlock.joy - 1.3.0 + 1.3.1-SNAPSHOT 4.0.0 examples examples - 1.4.1 + 1.4.2-SNAPSHOT https://www.cs.pdx.edu/~whitlock io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT com.sun.mail @@ -45,7 +45,7 @@ io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT tests test diff --git a/examples/src/resources/java/edu/pdx/cs410J/xml/phonebook.dtd b/examples/src/resources/java/edu/pdx/cs410J/xml/phonebook.dtd deleted file mode 100644 index c2d768b356..0000000000 --- a/examples/src/resources/java/edu/pdx/cs410J/xml/phonebook.dtd +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/family/pom.xml b/family/pom.xml index 910c90a1ef..cec52e5c2c 100644 --- a/family/pom.xml +++ b/family/pom.xml @@ -3,12 +3,12 @@ joy io.github.davidwhitlock.joy - 1.3.0 + 1.3.1-SNAPSHOT 4.0.0 family jar - 1.1.7 + 1.1.8-SNAPSHOT Family Tree Application An Family Tree application for The Joy of Coding https://www.cs.pdx.edu/~whitlock @@ -16,12 +16,12 @@ io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT io.github.davidwhitlock.joy examples - 1.4.1 + 1.4.2-SNAPSHOT com.h2database diff --git a/grader/pom.xml b/grader/pom.xml index 8e0db23c6f..18a91ac6b0 100644 --- a/grader/pom.xml +++ b/grader/pom.xml @@ -2,7 +2,7 @@ joy io.github.davidwhitlock.joy - 1.3.0 + 1.3.1-SNAPSHOT 4.0.0 grader @@ -34,7 +34,7 @@ io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT com.opencsv @@ -64,7 +64,7 @@ com.icegreen greenmail - 2.0.1 + 2.1.12 test diff --git a/grader/src/it/java/edu/pdx/cs/joy/grader/GreenmailIntegrationTestCase.java b/grader/src/it/java/edu/pdx/cs/joy/grader/GreenmailIntegrationTestCase.java index 54454abc13..5240be7f23 100644 --- a/grader/src/it/java/edu/pdx/cs/joy/grader/GreenmailIntegrationTestCase.java +++ b/grader/src/it/java/edu/pdx/cs/joy/grader/GreenmailIntegrationTestCase.java @@ -8,14 +8,12 @@ import com.icegreen.greenmail.user.GreenMailUser; import com.icegreen.greenmail.util.GreenMail; import com.icegreen.greenmail.util.ServerSetup; -import com.sun.mail.util.MailSSLSocketFactory; import jakarta.mail.*; import jakarta.mail.internet.InternetAddress; import jakarta.mail.internet.MimeMessage; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; -import java.security.GeneralSecurityException; import java.util.Properties; public class GreenmailIntegrationTestCase { @@ -78,12 +76,10 @@ protected Folder openFolder(Store store, String folderName) throws MessagingExce return folder; } - protected Store connectToIMAPServer() throws GeneralSecurityException, MessagingException { + protected Store connectToIMAPServer() throws MessagingException { Properties props = new Properties(); - - MailSSLSocketFactory socketFactory = new MailSSLSocketFactory(); - socketFactory.setTrustedHosts(new String[]{"127.0.0.1", "localhost"}); - props.put("mail.imaps.ssl.socketFactory", socketFactory); + props.put("mail.imaps.ssl.trust", emailServerHost); + props.put("mail.imaps.ssl.checkserveridentity", "false"); Session session = Session.getInstance(props, null); Store store = session.getStore("imaps"); diff --git a/grader/src/it/java/edu/pdx/cs/joy/grader/poa/POASubmissionsDownloaderIT.java b/grader/src/it/java/edu/pdx/cs/joy/grader/poa/POASubmissionsDownloaderIT.java index 5e8d6f72d5..1ab5de13b0 100644 --- a/grader/src/it/java/edu/pdx/cs/joy/grader/poa/POASubmissionsDownloaderIT.java +++ b/grader/src/it/java/edu/pdx/cs/joy/grader/poa/POASubmissionsDownloaderIT.java @@ -23,6 +23,7 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalToIgnoringCase; import static org.mockito.Mockito.*; public class POASubmissionsDownloaderIT extends GreenmailIntegrationTestCase { @@ -88,7 +89,7 @@ private void assertEmailIsProperlyProcessed(String subject, String poa, String s POASubmission submission = captor.getValue(); assertThat(submission.getSubject(), equalTo(subject)); assertThat(submission.getContent(), equalTo(poa)); - assertThat(submission.getContentType(), equalTo(contentType)); + assertThat(submission.getContentType(), equalToIgnoringCase(contentType)); assertThat(submission.getSubmitter(), equalTo(sender)); ArgumentCaptor statusCaptor = ArgumentCaptor.forClass(StatusMessage.class); diff --git a/grader/src/main/java/edu/pdx/cs/joy/grader/GraderEmailAccount.java b/grader/src/main/java/edu/pdx/cs/joy/grader/GraderEmailAccount.java index 1614dca453..6bc25a756d 100644 --- a/grader/src/main/java/edu/pdx/cs/joy/grader/GraderEmailAccount.java +++ b/grader/src/main/java/edu/pdx/cs/joy/grader/GraderEmailAccount.java @@ -1,13 +1,11 @@ package edu.pdx.cs.joy.grader; import com.google.common.annotations.VisibleForTesting; -import com.sun.mail.util.MailSSLSocketFactory; import jakarta.mail.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; -import java.security.GeneralSecurityException; import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -280,9 +278,8 @@ private Store connectToIMAPServer() { Properties props = new Properties(); if (this.trustLocalhostSSL) { - MailSSLSocketFactory socketFactory= new MailSSLSocketFactory(); - socketFactory.setTrustedHosts("127.0.0.1", "localhost"); - props.put("mail.imaps.ssl.socketFactory", socketFactory); + props.put("mail.imaps.ssl.trust", "127.0.0.1 localhost"); + props.put("mail.imaps.ssl.checkserveridentity", "false"); } Session session = Session.getInstance(props, null); @@ -290,7 +287,7 @@ private Store connectToIMAPServer() { store.connect(this.emailServerHostName, this.emailServerPort, this.userName, this.password); return store; - } catch (MessagingException | GeneralSecurityException ex) { + } catch (MessagingException ex) { throw new IllegalStateException("While connecting to " + this.emailServerHostName + ":" + this.emailServerPort, ex); } } diff --git a/grader/src/main/resources/edu/pdx/cs410J/whitlock/noExtension b/grader/src/main/resources/edu/pdx/cs410J/whitlock/noExtension deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/pom.xml b/pom.xml index 80e1f83ffa..f814793935 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.github.davidwhitlock.joy - 1.3.0 + 1.3.1-SNAPSHOT joy pom Java Example Code @@ -94,7 +94,7 @@ 0.75 0 - 1.6.0 + 1.6.1-SNAPSHOT diff --git a/projects-parent/archetypes-parent/airline-archetype/pom.xml b/projects-parent/archetypes-parent/airline-archetype/pom.xml index 4c3d67ea9a..315faf73d6 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.6 + 2.2.7-SNAPSHOT airline-archetype - 2.2.6 + 2.2.7-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 678d68f69d..f3be8580c9 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.3.0 + 1.3.1-SNAPSHOT 4.0.0 ${groupId} @@ -32,12 +32,12 @@ io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT tests test diff --git a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/main/javadoc/edu/pdx/cs410J/__artifactId__/package.html b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/main/javadoc/edu/pdx/cs410J/__artifactId__/package.html deleted file mode 100644 index 4f17af6f2c..0000000000 --- a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/main/javadoc/edu/pdx/cs410J/__artifactId__/package.html +++ /dev/null @@ -1,6 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - -

Contains the application classes for the Airline project.

- \ No newline at end of file diff --git a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/test/javadoc/edu/pdx/cs410J/__artifactId__/package.html b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/test/javadoc/edu/pdx/cs410J/__artifactId__/package.html deleted file mode 100644 index 63197885a4..0000000000 --- a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/test/javadoc/edu/pdx/cs410J/__artifactId__/package.html +++ /dev/null @@ -1,6 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - -

Contains the test classes for the Airline project.

- \ No newline at end of file diff --git a/projects-parent/archetypes-parent/airline-web-archetype/pom.xml b/projects-parent/archetypes-parent/airline-web-archetype/pom.xml index 86cb159639..e4295b13b0 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.6 + 2.2.7-SNAPSHOT airline-web-archetype - 3.1.0 + 3.1.1-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 9d63ab6b3f..6f4d4c3cec 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.3.0 + 1.3.1-SNAPSHOT 4.0.0 ${groupId} @@ -21,17 +21,17 @@ io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT io.github.davidwhitlock.joy examples - 1.4.1 + 1.4.2-SNAPSHOT io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT tests test diff --git a/projects-parent/archetypes-parent/apptbook-archetype/pom.xml b/projects-parent/archetypes-parent/apptbook-archetype/pom.xml index b815d9a477..3cc0e758b6 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.6 + 2.2.7-SNAPSHOT apptbook-archetype - 2.2.6 + 2.2.7-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 f79a65986f..d1f5269415 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.3.0 + 1.3.1-SNAPSHOT 4.0.0 ${groupId} @@ -32,12 +32,12 @@ io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT tests test diff --git a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/main/javadoc/edu/pdx/cs410J/__artifactId__/package.html b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/main/javadoc/edu/pdx/cs410J/__artifactId__/package.html deleted file mode 100644 index 54dbc66f8b..0000000000 --- a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/main/javadoc/edu/pdx/cs410J/__artifactId__/package.html +++ /dev/null @@ -1,6 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - -

Contains the application classes for the Appointment Book project.

- \ No newline at end of file diff --git a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/test/javadoc/edu/pdx/cs410J/__artifactId__/package.html b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/test/javadoc/edu/pdx/cs410J/__artifactId__/package.html deleted file mode 100644 index 9777aff71c..0000000000 --- a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/test/javadoc/edu/pdx/cs410J/__artifactId__/package.html +++ /dev/null @@ -1,6 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - -

Contains the test classes for the Appointment Book project.

- \ No newline at end of file diff --git a/projects-parent/archetypes-parent/apptbook-web-archetype/pom.xml b/projects-parent/archetypes-parent/apptbook-web-archetype/pom.xml index 9cf375b48c..8845a05df7 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.6 + 2.2.7-SNAPSHOT apptbook-web-archetype - 3.1.0 + 3.1.1-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 ff44dc535e..02cdd6f6e4 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.3.0 + 1.3.1-SNAPSHOT 4.0.0 ${groupId} @@ -21,17 +21,17 @@ io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT io.github.davidwhitlock.joy examples - 1.4.1 + 1.4.2-SNAPSHOT io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-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 f2ab6868eb..874c5df7d6 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.6 + 2.2.7-SNAPSHOT 4.0.0 java-koans-archetype - 2.2.10 + 2.2.11-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 c6516918a6..ba03338b55 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.3.0 + 1.3.1-SNAPSHOT ${artifactId} ${groupId} @@ -50,7 +50,7 @@ io.github.davidwhitlock.joy.com.sandwich koans-lib - 1.3.0 + 1.3.1-SNAPSHOT
diff --git a/projects-parent/archetypes-parent/kata-archetype/pom.xml b/projects-parent/archetypes-parent/kata-archetype/pom.xml index 57fb323cd4..38a4d1262d 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.6 + 2.2.7-SNAPSHOT kata-archetype - 2.2.7 + 2.2.8-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 a28049c39b..03a9191728 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.3.0 + 1.3.1-SNAPSHOT ${groupId} ${artifactId} @@ -97,7 +97,7 @@ io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT tests test diff --git a/projects-parent/archetypes-parent/phonebill-archetype/pom.xml b/projects-parent/archetypes-parent/phonebill-archetype/pom.xml index 2169bcc9e2..246c16e60b 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.6 + 2.2.7-SNAPSHOT 4.0.0 phonebill-archetype - 2.3.1 + 2.3.2-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 99e815e4b1..159deb35da 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.3.0 + 1.3.1-SNAPSHOT 4.0.0 ${groupId} @@ -43,17 +43,17 @@ io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT io.github.davidwhitlock.joy examples - 1.4.1 + 1.4.2-SNAPSHOT io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT tests test diff --git a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/main/javadoc/edu/pdx/cs410J/__artifactId__/package.html b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/main/javadoc/edu/pdx/cs410J/__artifactId__/package.html deleted file mode 100644 index 6d4adf245a..0000000000 --- a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/main/javadoc/edu/pdx/cs410J/__artifactId__/package.html +++ /dev/null @@ -1,6 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - -

Contains the application classes for the Phone Bill project.

- \ No newline at end of file diff --git a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/test/javadoc/edu/pdx/cs410J/__artifactId__/package.html b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/test/javadoc/edu/pdx/cs410J/__artifactId__/package.html deleted file mode 100644 index a579da692a..0000000000 --- a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/test/javadoc/edu/pdx/cs410J/__artifactId__/package.html +++ /dev/null @@ -1,6 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - -

Contains the test classes for the Phone Bill project.

- \ No newline at end of file diff --git a/projects-parent/archetypes-parent/phonebill-web-archetype/pom.xml b/projects-parent/archetypes-parent/phonebill-web-archetype/pom.xml index 959cc2a183..f4bf0f25bb 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.6 + 2.2.7-SNAPSHOT phonebill-web-archetype - 3.1.0 + 3.1.1-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 8f4f4bdc54..ca1e850bf8 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.3.0 + 1.3.1-SNAPSHOT 4.0.0 ${groupId} @@ -22,17 +22,17 @@ io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT io.github.davidwhitlock.joy examples - 1.4.1 + 1.4.2-SNAPSHOT io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT tests test diff --git a/projects-parent/archetypes-parent/pom.xml b/projects-parent/archetypes-parent/pom.xml index 65d31e5433..ba1da8613c 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.6 + 2.2.7-SNAPSHOT archetypes-parent - 2.2.6 + 2.2.7-SNAPSHOT pom diff --git a/projects-parent/archetypes-parent/student-archetype/pom.xml b/projects-parent/archetypes-parent/student-archetype/pom.xml index 0c6fd69359..ff4eab52b6 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.6 + 2.2.7-SNAPSHOT student-archetype - 2.3.6 + 2.3.7-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 ae287d2fad..80af68124d 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.3.0 + 1.3.1-SNAPSHOT ${groupId} ${artifactId} @@ -102,12 +102,12 @@ io.github.davidwhitlock.joy examples - 1.4.1 + 1.4.2-SNAPSHOT io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT tests test diff --git a/projects-parent/originals-parent/airline-web/pom.xml b/projects-parent/originals-parent/airline-web/pom.xml index 27839f0be2..5fbcf107f2 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.6 + 2.2.7-SNAPSHOT 4.0.0 io.github.davidwhitlock.joy.original airline-web - 3.1.0 + 3.1.1-SNAPSHOT 8080 @@ -21,17 +21,17 @@ io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT io.github.davidwhitlock.joy examples - 1.4.1 + 1.4.2-SNAPSHOT io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT tests test diff --git a/projects-parent/originals-parent/airline/pom.xml b/projects-parent/originals-parent/airline/pom.xml index 08f9d2924e..ace9835ad5 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.6 + 2.2.7-SNAPSHOT 4.0.0 io.github.davidwhitlock.joy.original airline jar - 2.2.6 + 2.2.7-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 - 3.0.5 + 3.0.6-SNAPSHOT io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT tests test diff --git a/projects-parent/originals-parent/airline/src/main/javadoc/edu/pdx/cs410J/airline/package.html b/projects-parent/originals-parent/airline/src/main/javadoc/edu/pdx/cs410J/airline/package.html deleted file mode 100644 index 02be23647a..0000000000 --- a/projects-parent/originals-parent/airline/src/main/javadoc/edu/pdx/cs410J/airline/package.html +++ /dev/null @@ -1,3 +0,0 @@ - -

Contains the application classes for the Airline project.

- \ No newline at end of file diff --git a/projects-parent/originals-parent/airline/src/test/javadoc/edu/pdx/cs410J/airline/package.html b/projects-parent/originals-parent/airline/src/test/javadoc/edu/pdx/cs410J/airline/package.html deleted file mode 100644 index bed1173886..0000000000 --- a/projects-parent/originals-parent/airline/src/test/javadoc/edu/pdx/cs410J/airline/package.html +++ /dev/null @@ -1,3 +0,0 @@ - -

Contains the test classes for the Airline project.

- \ No newline at end of file diff --git a/projects-parent/originals-parent/apptbook-web/pom.xml b/projects-parent/originals-parent/apptbook-web/pom.xml index 21f8a96e71..dc2f18c8ff 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.6 + 2.2.7-SNAPSHOT 4.0.0 io.github.davidwhitlock.joy.original apptbook-web - 3.1.0 + 3.1.1-SNAPSHOT 8080 @@ -21,17 +21,17 @@ io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT io.github.davidwhitlock.joy examples - 1.4.1 + 1.4.2-SNAPSHOT io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT tests test diff --git a/projects-parent/originals-parent/apptbook/pom.xml b/projects-parent/originals-parent/apptbook/pom.xml index c3444c439b..2d15a35b00 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.6 + 2.2.7-SNAPSHOT 4.0.0 io.github.davidwhitlock.joy.original apptbook jar - 2.2.6 + 2.2.7-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 - 3.0.5 + 3.0.6-SNAPSHOT io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT tests test diff --git a/projects-parent/originals-parent/apptbook/src/main/javadoc/edu/pdx/cs410J/apptbook/package.html b/projects-parent/originals-parent/apptbook/src/main/javadoc/edu/pdx/cs410J/apptbook/package.html deleted file mode 100644 index 3a7e4bb21a..0000000000 --- a/projects-parent/originals-parent/apptbook/src/main/javadoc/edu/pdx/cs410J/apptbook/package.html +++ /dev/null @@ -1,3 +0,0 @@ - -

Contains the application classes for the Appointment Book project.

- \ No newline at end of file diff --git a/projects-parent/originals-parent/apptbook/src/test/javadoc/edu/pdx/cs410J/apptbook/package.html b/projects-parent/originals-parent/apptbook/src/test/javadoc/edu/pdx/cs410J/apptbook/package.html deleted file mode 100644 index 8d4ef70cbf..0000000000 --- a/projects-parent/originals-parent/apptbook/src/test/javadoc/edu/pdx/cs410J/apptbook/package.html +++ /dev/null @@ -1,3 +0,0 @@ - -

Contains the test classes for the Appointment Book project.

- \ No newline at end of file diff --git a/projects-parent/originals-parent/kata/pom.xml b/projects-parent/originals-parent/kata/pom.xml index 3db3a97909..4d9c5209aa 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.6 + 2.2.7-SNAPSHOT io.github.davidwhitlock.joy.original kata - 2.2.6 + 2.2.7-SNAPSHOT jar Kata Project @@ -98,7 +98,7 @@ io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT tests test diff --git a/projects-parent/originals-parent/phonebill-web/pom.xml b/projects-parent/originals-parent/phonebill-web/pom.xml index 810e266e8e..7d04b11145 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.6 + 2.2.7-SNAPSHOT 4.0.0 io.github.davidwhitlock.joy.original phonebill-web - 3.1.0 + 3.1.1-SNAPSHOT 8080 @@ -22,17 +22,17 @@ io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT io.github.davidwhitlock.joy examples - 1.4.1 + 1.4.2-SNAPSHOT io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT tests test diff --git a/projects-parent/originals-parent/phonebill/pom.xml b/projects-parent/originals-parent/phonebill/pom.xml index f1b6c5c351..b82827d215 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.6 + 2.2.7-SNAPSHOT 4.0.0 io.github.davidwhitlock.joy.original phonebill jar - 2.3.1 + 2.3.2-SNAPSHOT Phone Bill Project A Phone Bill application for The Joy of Coding at Portland State University 2000 @@ -43,17 +43,17 @@ io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT io.github.davidwhitlock.joy examples - 1.4.1 + 1.4.2-SNAPSHOT io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT tests test diff --git a/projects-parent/originals-parent/phonebill/src/main/javadoc/edu/pdx/cs410J/phonebill/package.html b/projects-parent/originals-parent/phonebill/src/main/javadoc/edu/pdx/cs410J/phonebill/package.html deleted file mode 100644 index e0071f61b0..0000000000 --- a/projects-parent/originals-parent/phonebill/src/main/javadoc/edu/pdx/cs410J/phonebill/package.html +++ /dev/null @@ -1,3 +0,0 @@ - -

Contains the application classes for the Phone Bill project.

- \ No newline at end of file diff --git a/projects-parent/originals-parent/phonebill/src/test/javadoc/edu/pdx/cs410J/phonebill/package.html b/projects-parent/originals-parent/phonebill/src/test/javadoc/edu/pdx/cs410J/phonebill/package.html deleted file mode 100644 index fd40306218..0000000000 --- a/projects-parent/originals-parent/phonebill/src/test/javadoc/edu/pdx/cs410J/phonebill/package.html +++ /dev/null @@ -1,3 +0,0 @@ - -

Contains the test classes for the Phone Bill project.

- \ No newline at end of file diff --git a/projects-parent/originals-parent/pom.xml b/projects-parent/originals-parent/pom.xml index f5917e6869..9d0bae24f3 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.6 + 2.2.7-SNAPSHOT originals-parent - 2.2.6 + 2.2.7-SNAPSHOT pom diff --git a/projects-parent/originals-parent/student/pom.xml b/projects-parent/originals-parent/student/pom.xml index bb3a0bbc1f..28b9c87ecc 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.6 + 2.2.7-SNAPSHOT io.github.davidwhitlock.joy.original student - 2.3.6 + 2.3.7-SNAPSHOT jar Student Project @@ -88,12 +88,12 @@ io.github.davidwhitlock.joy examples - 1.4.1 + 1.4.2-SNAPSHOT io.github.davidwhitlock.joy projects - 3.0.5 + 3.0.6-SNAPSHOT tests test diff --git a/projects-parent/pom.xml b/projects-parent/pom.xml index 06bcf62c0e..65d7ff4aba 100644 --- a/projects-parent/pom.xml +++ b/projects-parent/pom.xml @@ -7,11 +7,11 @@ io.github.davidwhitlock.joy joy - 1.3.0 + 1.3.1-SNAPSHOT projects-parent - 2.2.6 + 2.2.7-SNAPSHOT pom diff --git a/projects-parent/projects/pom.xml b/projects-parent/projects/pom.xml index 49d1eb4f7b..21451ba6c0 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.6 + 2.2.7-SNAPSHOT 4.0.0 projects Project APIs Classes needed for the Projects in The Joy of Coding - 3.0.5 + 3.0.6-SNAPSHOT http://www.cs.pdx.edu/~whitlock diff --git a/web/pom.xml b/web/pom.xml index 68f3cbb96d..2ff7363684 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -3,13 +3,13 @@ joy io.github.davidwhitlock.joy - 1.3.0 + 1.3.1-SNAPSHOT 4.0.0 web war Web Application examples - 2.1.0 + 2.1.1-SNAPSHOT http://www.cs.pdx.edu/~whitlock 7.0.2.Final @@ -117,12 +117,12 @@ io.github.davidwhitlock.joy examples - 1.4.1 + 1.4.2-SNAPSHOT io.github.davidwhitlock.joy family - 1.1.7 + 1.1.8-SNAPSHOT jakarta.xml.bind