diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9bc33ae4d..02dda54d5 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -43,17 +43,17 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v7 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v6 with: distribution: 'temurin' - java-version: 17 + java-version: 21 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@v4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -64,7 +64,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v3 + uses: github/codeql-action/autobuild@v4 # â„šī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -78,4 +78,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@v4 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a736a09b6..9fc1585f0 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -20,12 +20,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ '21', '24' ] + java: [ '21', '25', '27' ] name: JDK ${{ matrix.Java }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - name: Set up JDK ${{ matrix.Java }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v6 with: distribution: 'temurin' java-version: ${{ matrix.java }} diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index ae275e301..a8c7093af 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -21,10 +21,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v5 + uses: actions/checkout@v7 - name: Set up JDK 21 - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: temurin java-version: '21' @@ -51,4 +51,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4 + uses: actions/deploy-pages@v5 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 52913720f..216df0589 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,3 +1,3 @@ wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip diff --git a/examples/pom.xml b/examples/pom.xml index ae20dfab0..766902add 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -3,7 +3,7 @@ joy io.github.davidwhitlock.joy - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 examples @@ -34,7 +34,7 @@ com.sun.xml.bind jaxb-impl - 4.0.8 + 4.0.9 runtime diff --git a/family/pom.xml b/family/pom.xml index f313dda9b..a2abde26a 100644 --- a/family/pom.xml +++ b/family/pom.xml @@ -3,7 +3,7 @@ joy io.github.davidwhitlock.joy - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 family diff --git a/family/src/main/java/edu/pdx/cs/joy/family/FamilyTreeApplet.java b/family/src/main/java/edu/pdx/cs/joy/family/FamilyTreeApplet.java deleted file mode 100644 index 2473d3f84..000000000 --- a/family/src/main/java/edu/pdx/cs/joy/family/FamilyTreeApplet.java +++ /dev/null @@ -1,36 +0,0 @@ -package edu.pdx.cs.joy.family; - -import java.net.MalformedURLException; -import java.net.URL; - -import javax.swing.JApplet; - -/** - * This class is an applet that displays an immutable family tree. - */ -@SuppressWarnings("serial") -public class FamilyTreeApplet extends JApplet { - - /** - * Creates a FamilyTreePanel to view a family tree. - */ - public void init() { - FamilyTreePanel viewer = new FamilyTreePanel(); - viewer.addComponents(); - this.getContentPane().add(viewer); - - String xmlFile = this.getParameter("xmlFile"); - if (xmlFile != null) { - URL url = null; - try { -// URL base = this.getDocumentBase(); -// url = new URL(base, xmlFile); - url = new URL(xmlFile); - viewer.setURLSource(url); - - } catch (MalformedURLException ex) { - viewer.setSourceText(ex.toString()); - } - } - } -} diff --git a/grader/pom.xml b/grader/pom.xml index 18a91ac6b..370d74ffe 100644 --- a/grader/pom.xml +++ b/grader/pom.xml @@ -2,7 +2,7 @@ joy io.github.davidwhitlock.joy - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 grader @@ -21,7 +21,7 @@ org.apache.commons commons-lang3 - 3.20.0 + 3.21.0 @@ -44,7 +44,7 @@ ch.qos.logback logback-classic - 1.5.32 + 1.6.6 com.google.inject @@ -59,12 +59,12 @@ org.eclipse.parsson parsson - 1.1.7 + 1.1.9 com.icegreen greenmail - 2.1.12 + 2.1.15 test diff --git a/pom.xml b/pom.xml index e2e2f93ca..df705d73b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.github.davidwhitlock.joy - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT joy pom Java Example Code @@ -57,39 +57,39 @@ 21 21 - 33.6.0-jre + 33.8.0-jre 7.0.0 - 2.4.240 + 2.5.252 6.1.0 UTF-8 UTF-8 - 7.24.0 + 7.29.0 2.0.4 3.5.3 - 5.12.2 + 6.1.3 3.0 - 5.23.0 - 3.5.5 - 3.5.0 - 3.6.1 - 3.15.0 - 12.1.9 - 4.9.8.3 - 0.8.14 + 5.24.0 + 3.6.1 + 3.5.1 + 3.6.2 + 3.16.0 + 12.1.14 + 4.10.5.0 + 0.8.16 3.6.2 3.4.0 3.9.0 - 3.5.5 + 3.6.1 3.6.0 - 13.4.2 + 14.4.0 3.4.1 3.12.0 3.28.0 - 2.21.0 - 3.6.3 + 2.23.0 + 3.6.4 0.75 0 @@ -126,7 +126,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.6.2 + 3.7.0 enforce-versions @@ -196,7 +196,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.4 + 3.2.0 org.apache.maven.plugins @@ -206,7 +206,7 @@ org.codehaus.mojo buildnumber-maven-plugin - 3.3.0 + 3.3.1 validate @@ -243,7 +243,7 @@ org.sonatype.central central-publishing-maven-plugin - 0.10.0 + 0.12.0 true central @@ -483,7 +483,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.10.0 + 3.11.0 org.apache.maven.plugins @@ -557,7 +557,7 @@ org.apache.maven.plugins maven-site-plugin - 4.0.0-M16 + 3.22.0 . diff --git a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties index 19ddbde16..f4ae0aab3 100644 --- a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties +++ b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties @@ -19,4 +19,4 @@ ${symbol_pound} specific language governing permissions and limitations ${symbol_pound} under the License. wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip 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 f3be8580c..0f92472c8 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.1-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 ${groupId} diff --git a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/site/site.xml b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/site/site.xml index 4bbb76b47..b3bfa59ec 100644 --- a/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/site/site.xml +++ b/projects-parent/archetypes-parent/airline-archetype/src/main/resources/archetype-resources/src/site/site.xml @@ -6,7 +6,7 @@ org.apache.maven.skins maven-fluido-skin - 1.11.0 + 2.1.0 diff --git a/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties b/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties index 19ddbde16..f4ae0aab3 100644 --- a/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties +++ b/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties @@ -19,4 +19,4 @@ ${symbol_pound} specific language governing permissions and limitations ${symbol_pound} under the License. wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip 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 8516a0d05..7605f8663 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.1-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 ${groupId} diff --git a/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/src/site/site.xml b/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/src/site/site.xml index 4bbb76b47..b3bfa59ec 100644 --- a/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/src/site/site.xml +++ b/projects-parent/archetypes-parent/airline-web-archetype/src/main/resources/archetype-resources/src/site/site.xml @@ -6,7 +6,7 @@ org.apache.maven.skins maven-fluido-skin - 1.11.0 + 2.1.0 diff --git a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties index 19ddbde16..f4ae0aab3 100644 --- a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties +++ b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties @@ -19,4 +19,4 @@ ${symbol_pound} specific language governing permissions and limitations ${symbol_pound} under the License. wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip 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 d1f526941..5a8142045 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.1-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 ${groupId} diff --git a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/site/site.xml b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/site/site.xml index 4bbb76b47..b3bfa59ec 100644 --- a/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/site/site.xml +++ b/projects-parent/archetypes-parent/apptbook-archetype/src/main/resources/archetype-resources/src/site/site.xml @@ -6,7 +6,7 @@ org.apache.maven.skins maven-fluido-skin - 1.11.0 + 2.1.0 diff --git a/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties b/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties index 19ddbde16..f4ae0aab3 100644 --- a/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties +++ b/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties @@ -19,4 +19,4 @@ ${symbol_pound} specific language governing permissions and limitations ${symbol_pound} under the License. wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip 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 1f2be235c..e0f47be4b 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.1-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 ${groupId} diff --git a/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/src/site/site.xml b/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/src/site/site.xml index 4bbb76b47..b3bfa59ec 100644 --- a/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/src/site/site.xml +++ b/projects-parent/archetypes-parent/apptbook-web-archetype/src/main/resources/archetype-resources/src/site/site.xml @@ -6,7 +6,7 @@ org.apache.maven.skins maven-fluido-skin - 1.11.0 + 2.1.0 diff --git a/projects-parent/archetypes-parent/java-koans-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties b/projects-parent/archetypes-parent/java-koans-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties index 19ddbde16..f4ae0aab3 100644 --- a/projects-parent/archetypes-parent/java-koans-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties +++ b/projects-parent/archetypes-parent/java-koans-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties @@ -19,4 +19,4 @@ ${symbol_pound} specific language governing permissions and limitations ${symbol_pound} under the License. wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip 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 ba03338b5..ba2300b6f 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.1-SNAPSHOT + 1.4.0-SNAPSHOT ${artifactId} ${groupId} diff --git a/projects-parent/archetypes-parent/kata-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties b/projects-parent/archetypes-parent/kata-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties index 19ddbde16..f4ae0aab3 100644 --- a/projects-parent/archetypes-parent/kata-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties +++ b/projects-parent/archetypes-parent/kata-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties @@ -19,4 +19,4 @@ ${symbol_pound} specific language governing permissions and limitations ${symbol_pound} under the License. wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip 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 03a919172..af5184a20 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.1-SNAPSHOT + 1.4.0-SNAPSHOT ${groupId} ${artifactId} diff --git a/projects-parent/archetypes-parent/kata-archetype/src/main/resources/archetype-resources/src/site/site.xml b/projects-parent/archetypes-parent/kata-archetype/src/main/resources/archetype-resources/src/site/site.xml index 20eef036f..7fce45aa4 100644 --- a/projects-parent/archetypes-parent/kata-archetype/src/main/resources/archetype-resources/src/site/site.xml +++ b/projects-parent/archetypes-parent/kata-archetype/src/main/resources/archetype-resources/src/site/site.xml @@ -3,7 +3,7 @@ org.apache.maven.skins maven-fluido-skin - 1.11.0 + 2.1.0 diff --git a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties index 19ddbde16..f4ae0aab3 100644 --- a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties +++ b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties @@ -19,4 +19,4 @@ ${symbol_pound} specific language governing permissions and limitations ${symbol_pound} under the License. wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip 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 b7bed8643..800ee421e 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.1-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 ${groupId} diff --git a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/site/site.xml b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/site/site.xml index 4bbb76b47..b3bfa59ec 100644 --- a/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/site/site.xml +++ b/projects-parent/archetypes-parent/phonebill-archetype/src/main/resources/archetype-resources/src/site/site.xml @@ -6,7 +6,7 @@ org.apache.maven.skins maven-fluido-skin - 1.11.0 + 2.1.0 diff --git a/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties b/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties index 19ddbde16..f4ae0aab3 100644 --- a/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties +++ b/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties @@ -19,4 +19,4 @@ ${symbol_pound} specific language governing permissions and limitations ${symbol_pound} under the License. wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip 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 347714da1..c76ac8319 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.1-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 ${groupId} diff --git a/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/src/site/site.xml b/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/src/site/site.xml index 4bbb76b47..b3bfa59ec 100644 --- a/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/src/site/site.xml +++ b/projects-parent/archetypes-parent/phonebill-web-archetype/src/main/resources/archetype-resources/src/site/site.xml @@ -6,7 +6,7 @@ org.apache.maven.skins maven-fluido-skin - 1.11.0 + 2.1.0 diff --git a/projects-parent/archetypes-parent/pom.xml b/projects-parent/archetypes-parent/pom.xml index ba1da8613..f6470244f 100644 --- a/projects-parent/archetypes-parent/pom.xml +++ b/projects-parent/archetypes-parent/pom.xml @@ -40,7 +40,7 @@ org.apache.groovy groovy - 4.0.32 + 6.0.0 diff --git a/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties b/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties index 19ddbde16..f4ae0aab3 100644 --- a/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties +++ b/projects-parent/archetypes-parent/student-archetype/src/main/resources/archetype-resources/.mvn/wrapper/maven-wrapper.properties @@ -19,4 +19,4 @@ ${symbol_pound} specific language governing permissions and limitations ${symbol_pound} under the License. wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip 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 76483be9c..1ba66437e 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.1-SNAPSHOT + 1.4.0-SNAPSHOT ${groupId} ${artifactId} 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 4bbb76b47..b3bfa59ec 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 @@ -6,7 +6,7 @@ org.apache.maven.skins maven-fluido-skin - 1.11.0 + 2.1.0 diff --git a/projects-parent/originals-parent/airline-web/.mvn/wrapper/maven-wrapper.properties b/projects-parent/originals-parent/airline-web/.mvn/wrapper/maven-wrapper.properties index 52913720f..216df0589 100644 --- a/projects-parent/originals-parent/airline-web/.mvn/wrapper/maven-wrapper.properties +++ b/projects-parent/originals-parent/airline-web/.mvn/wrapper/maven-wrapper.properties @@ -1,3 +1,3 @@ wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip diff --git a/projects-parent/originals-parent/airline-web/src/site/site.xml b/projects-parent/originals-parent/airline-web/src/site/site.xml index 20eef036f..7fce45aa4 100644 --- a/projects-parent/originals-parent/airline-web/src/site/site.xml +++ b/projects-parent/originals-parent/airline-web/src/site/site.xml @@ -3,7 +3,7 @@ org.apache.maven.skins maven-fluido-skin - 1.11.0 + 2.1.0 diff --git a/projects-parent/originals-parent/airline/.mvn/wrapper/maven-wrapper.properties b/projects-parent/originals-parent/airline/.mvn/wrapper/maven-wrapper.properties index 52913720f..216df0589 100644 --- a/projects-parent/originals-parent/airline/.mvn/wrapper/maven-wrapper.properties +++ b/projects-parent/originals-parent/airline/.mvn/wrapper/maven-wrapper.properties @@ -1,3 +1,3 @@ wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip diff --git a/projects-parent/originals-parent/airline/src/site/site.xml b/projects-parent/originals-parent/airline/src/site/site.xml index 20eef036f..7fce45aa4 100644 --- a/projects-parent/originals-parent/airline/src/site/site.xml +++ b/projects-parent/originals-parent/airline/src/site/site.xml @@ -3,7 +3,7 @@ org.apache.maven.skins maven-fluido-skin - 1.11.0 + 2.1.0 diff --git a/projects-parent/originals-parent/apptbook-web/.mvn/wrapper/maven-wrapper.properties b/projects-parent/originals-parent/apptbook-web/.mvn/wrapper/maven-wrapper.properties index 325370489..c1677b683 100644 --- a/projects-parent/originals-parent/apptbook-web/.mvn/wrapper/maven-wrapper.properties +++ b/projects-parent/originals-parent/apptbook-web/.mvn/wrapper/maven-wrapper.properties @@ -16,4 +16,4 @@ # under the License. wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip diff --git a/projects-parent/originals-parent/apptbook-web/src/site/site.xml b/projects-parent/originals-parent/apptbook-web/src/site/site.xml index 20eef036f..7fce45aa4 100644 --- a/projects-parent/originals-parent/apptbook-web/src/site/site.xml +++ b/projects-parent/originals-parent/apptbook-web/src/site/site.xml @@ -3,7 +3,7 @@ org.apache.maven.skins maven-fluido-skin - 1.11.0 + 2.1.0 diff --git a/projects-parent/originals-parent/apptbook/.mvn/wrapper/maven-wrapper.properties b/projects-parent/originals-parent/apptbook/.mvn/wrapper/maven-wrapper.properties index 325370489..c1677b683 100644 --- a/projects-parent/originals-parent/apptbook/.mvn/wrapper/maven-wrapper.properties +++ b/projects-parent/originals-parent/apptbook/.mvn/wrapper/maven-wrapper.properties @@ -16,4 +16,4 @@ # under the License. wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip diff --git a/projects-parent/originals-parent/apptbook/src/site/site.xml b/projects-parent/originals-parent/apptbook/src/site/site.xml index 20eef036f..7fce45aa4 100644 --- a/projects-parent/originals-parent/apptbook/src/site/site.xml +++ b/projects-parent/originals-parent/apptbook/src/site/site.xml @@ -3,7 +3,7 @@ org.apache.maven.skins maven-fluido-skin - 1.11.0 + 2.1.0 diff --git a/projects-parent/originals-parent/kata/.mvn/wrapper/maven-wrapper.properties b/projects-parent/originals-parent/kata/.mvn/wrapper/maven-wrapper.properties index 325370489..c1677b683 100644 --- a/projects-parent/originals-parent/kata/.mvn/wrapper/maven-wrapper.properties +++ b/projects-parent/originals-parent/kata/.mvn/wrapper/maven-wrapper.properties @@ -16,4 +16,4 @@ # under the License. wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip diff --git a/projects-parent/originals-parent/kata/src/site/site.xml b/projects-parent/originals-parent/kata/src/site/site.xml index 20eef036f..7fce45aa4 100644 --- a/projects-parent/originals-parent/kata/src/site/site.xml +++ b/projects-parent/originals-parent/kata/src/site/site.xml @@ -3,7 +3,7 @@ org.apache.maven.skins maven-fluido-skin - 1.11.0 + 2.1.0 diff --git a/projects-parent/originals-parent/phonebill-web/.mvn/wrapper/maven-wrapper.properties b/projects-parent/originals-parent/phonebill-web/.mvn/wrapper/maven-wrapper.properties index 325370489..c1677b683 100644 --- a/projects-parent/originals-parent/phonebill-web/.mvn/wrapper/maven-wrapper.properties +++ b/projects-parent/originals-parent/phonebill-web/.mvn/wrapper/maven-wrapper.properties @@ -16,4 +16,4 @@ # under the License. wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip diff --git a/projects-parent/originals-parent/phonebill-web/src/site/site.xml b/projects-parent/originals-parent/phonebill-web/src/site/site.xml index 20eef036f..7fce45aa4 100644 --- a/projects-parent/originals-parent/phonebill-web/src/site/site.xml +++ b/projects-parent/originals-parent/phonebill-web/src/site/site.xml @@ -3,7 +3,7 @@ org.apache.maven.skins maven-fluido-skin - 1.11.0 + 2.1.0 diff --git a/projects-parent/originals-parent/phonebill/.mvn/wrapper/maven-wrapper.properties b/projects-parent/originals-parent/phonebill/.mvn/wrapper/maven-wrapper.properties index 325370489..c1677b683 100644 --- a/projects-parent/originals-parent/phonebill/.mvn/wrapper/maven-wrapper.properties +++ b/projects-parent/originals-parent/phonebill/.mvn/wrapper/maven-wrapper.properties @@ -16,4 +16,4 @@ # under the License. wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip diff --git a/projects-parent/originals-parent/phonebill/src/site/site.xml b/projects-parent/originals-parent/phonebill/src/site/site.xml index 20eef036f..7fce45aa4 100644 --- a/projects-parent/originals-parent/phonebill/src/site/site.xml +++ b/projects-parent/originals-parent/phonebill/src/site/site.xml @@ -3,7 +3,7 @@ org.apache.maven.skins maven-fluido-skin - 1.11.0 + 2.1.0 diff --git a/projects-parent/originals-parent/student/.mvn/wrapper/maven-wrapper.properties b/projects-parent/originals-parent/student/.mvn/wrapper/maven-wrapper.properties index 325370489..c1677b683 100644 --- a/projects-parent/originals-parent/student/.mvn/wrapper/maven-wrapper.properties +++ b/projects-parent/originals-parent/student/.mvn/wrapper/maven-wrapper.properties @@ -16,4 +16,4 @@ # under the License. wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.15/apache-maven-3.9.15-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip diff --git a/projects-parent/originals-parent/student/src/site/site.xml b/projects-parent/originals-parent/student/src/site/site.xml index 20eef036f..7fce45aa4 100644 --- a/projects-parent/originals-parent/student/src/site/site.xml +++ b/projects-parent/originals-parent/student/src/site/site.xml @@ -3,7 +3,7 @@ org.apache.maven.skins maven-fluido-skin - 1.11.0 + 2.1.0 diff --git a/projects-parent/pom.xml b/projects-parent/pom.xml index 65d7ff4ab..0099c089e 100644 --- a/projects-parent/pom.xml +++ b/projects-parent/pom.xml @@ -7,7 +7,7 @@ io.github.davidwhitlock.joy joy - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT projects-parent diff --git a/src/site/site.xml b/src/site/site.xml index 2c6a880fd..b2682621e 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -3,7 +3,7 @@ org.apache.maven.skins maven-fluido-skin - 1.11.0 + 2.1.0 @@ -21,11 +21,6 @@ right black - - agilevalentine - - - \ No newline at end of file diff --git a/web/pom.xml b/web/pom.xml index ed75560a5..4d77619c8 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -3,7 +3,7 @@ joy io.github.davidwhitlock.joy - 1.3.1-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 web @@ -12,9 +12,20 @@ 2.1.1-SNAPSHOT http://www.cs.pdx.edu/~whitlock - 7.0.2.Final + 7.0.5.Final 8080 + + + + org.jboss.resteasy + resteasy-bom + ${resteasy.version} + pom + import + + + web @@ -129,13 +140,6 @@ jakarta.xml.bind-api 4.0.5 - - org.jboss.resteasy - resteasy-bom - ${resteasy.version} - pom - import - jakarta.ws.rs jakarta.ws.rs-api