Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
07bdbb3
SNAPSHOT artifacts for Summer 2025
DavidWhitlock Apr 20, 2025
480ed4b
Resolve #497 by requiring Java 21 or later.
DavidWhitlock Apr 26, 2025
c2a43b1
The project archetype integration tests don't seem to work with Java …
DavidWhitlock Apr 26, 2025
10d113c
Resolve #491 by upgrading to version 3.3.1 of the maven-archetype-plu…
DavidWhitlock Apr 26, 2025
2a29a55
Add <requiredProperties> to the rest of the Maven archetypes.
DavidWhitlock Apr 26, 2025
1d1cc38
Merge pull request #500 from JoyOfCodingPDX/issue-497/java-21-and-later
DavidWhitlock Apr 26, 2025
631d45d
Merge branch 'Summer2025-SNAPSHOT' into issue-491/maven-archetype-plu…
DavidWhitlock Apr 26, 2025
bfd50f8
Merge pull request #501 from JoyOfCodingPDX/issue-491/maven-archetype…
DavidWhitlock Apr 26, 2025
b8d60a9
Use the central-publishing-maven-plugin to publish to Maven Central.
DavidWhitlock May 18, 2025
5845f5a
Increment artifact versions so that we can be sure that all artifacts…
DavidWhitlock May 18, 2025
8994513
Use the Maven Central snapshot repository because OSSRH is going away.
DavidWhitlock May 18, 2025
6076a50
Don't use "central" as the name of the repository. I think it might …
DavidWhitlock May 20, 2025
0b7900b
Merge pull request #504 from JoyOfCodingPDX/issue-503/publish-to-mave…
DavidWhitlock May 20, 2025
2fd0a77
Begin updating dependencies to the latest (working) version.
DavidWhitlock May 20, 2025
0cd8669
Update the versions of Maven plugins.
DavidWhitlock May 20, 2025
84aa6c2
Merge pull request #505 from JoyOfCodingPDX/Summer2025/update-depende…
DavidWhitlock May 24, 2025
6d15743
Run with Java 24
DavidWhitlock May 24, 2025
9e5b6ab
The student archetype wasn't using the version of the Maven archetype…
DavidWhitlock May 24, 2025
1e241d4
Merge pull request #506 from JoyOfCodingPDX/issue-502/java-24
DavidWhitlock May 24, 2025
7baef96
Revert some changes that broken the student project archetype.
DavidWhitlock May 24, 2025
0afc15a
Deploy production artifacts for Summer 2025.
DavidWhitlock Jun 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@
<parent>
<artifactId>joy</artifactId>
<groupId>io.github.davidwhitlock.joy</groupId>
<version>1.2.0</version>
<version>1.2.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>examples</artifactId>
<name>examples</name>
<version>1.3.0</version>
<version>1.3.3</version>
<url>https://www.cs.pdx.edu/~whitlock</url>
<dependencies>
<dependency>
<groupId>io.github.davidwhitlock.joy</groupId>
<artifactId>family</artifactId>
<version>1.1.2</version>
<version>1.1.4</version>
</dependency>
<dependency>
<groupId>io.github.davidwhitlock.joy</groupId>
<artifactId>projects</artifactId>
<version>3.0.0</version>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
Expand All @@ -45,7 +45,7 @@
<dependency>
<groupId>io.github.davidwhitlock.joy</groupId>
<artifactId>projects</artifactId>
<version>3.0.0</version>
<version>3.0.2</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions family/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
<parent>
<artifactId>joy</artifactId>
<groupId>io.github.davidwhitlock.joy</groupId>
<version>1.2.0</version>
<version>1.2.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>family</artifactId>
<packaging>jar</packaging>
<version>1.1.2</version>
<version>1.1.4</version>
<name>Family Tree Application</name>
<description>An Family Tree application for The Joy of Coding</description>
<url>https://www.cs.pdx.edu/~whitlock</url>
<dependencies>
<dependency>
<groupId>io.github.davidwhitlock.joy</groupId>
<artifactId>projects</artifactId>
<version>3.0.0</version>
<version>3.0.2</version>
</dependency>
</dependencies>
<build>
Expand Down
4 changes: 2 additions & 2 deletions grader/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>joy</artifactId>
<groupId>io.github.davidwhitlock.joy</groupId>
<version>1.2.0</version>
<version>1.2.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>grader</artifactId>
Expand All @@ -19,7 +19,7 @@
<dependency>
<groupId>io.github.davidwhitlock.joy</groupId>
<artifactId>projects</artifactId>
<version>3.0.0</version>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>com.opencsv</groupId>
Expand Down
58 changes: 24 additions & 34 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>io.github.davidwhitlock.joy</groupId>
<version>1.2.0</version>
<version>1.2.2</version>
<artifactId>joy</artifactId>
<packaging>pom</packaging>
<name>Java Example Code</name>
Expand Down Expand Up @@ -54,46 +54,46 @@
<properties>
<haltOnFailingCoverage>true</haltOnFailingCoverage>

<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>

<guava.version>33.3.1-jre</guava.version>
<guava.version>33.4.8-jre</guava.version>
<guice.version>7.0.0</guice.version>
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<pmd.version>7.7.0</pmd.version>
<pmd.version>7.13.0</pmd.version>

<wagon-git.version>2.0.4</wagon-git.version> <!-- Do not upgrade to 2.0.4 as it doesn't work -->
<wagon-ssh.version>3.5.3</wagon-ssh.version>

<junit.version>5.11.3</junit.version>
<junit.version>5.12.2</junit.version>
<hamcrest.version>3.0</hamcrest.version>
<mockito.version>5.14.2</mockito.version>
<surefire.version>3.5.2</surefire.version>
<mockito.version>5.17.0</mockito.version>
<surefire.version>3.5.3</surefire.version>
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<jetty-maven-plugin.version>11.0.24</jetty-maven-plugin.version>
<spotbugs-maven-plugin.version>4.8.6.6</spotbugs-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
<jetty-maven-plugin.version>11.0.25</jetty-maven-plugin.version>
<spotbugs-maven-plugin.version>4.9.3.0</spotbugs-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-project-info-reports-plugin.version>3.8.0</maven-project-info-reports-plugin.version>
<maven-surefire-report-plugin.version>3.5.2</maven-surefire-report-plugin.version>
<maven-project-info-reports-plugin.version>3.9.0</maven-project-info-reports-plugin.version>
<maven-surefire-report-plugin.version>3.5.3</maven-surefire-report-plugin.version>
<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
<checkstyle.version>10.20.1</checkstyle.version>
<maven-archetype-plugin.version>3.3.0</maven-archetype-plugin.version>
<maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
<checkstyle.version>10.23.1</checkstyle.version>
<maven-archetype-plugin.version>3.4.0</maven-archetype-plugin.version>
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
<maven-pmd-plugin.version>3.26.0</maven-pmd-plugin.version>
<versions-maven-plugin.version>2.18.0</versions-maven-plugin.version>
<exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>

<jacoco.min.instruction.covered.ratio>0.75</jacoco.min.instruction.covered.ratio>
<jacoco.max.missed.classes>0</jacoco.max.missed.classes>

<grader.version>1.3.1</grader.version>
<grader.version>1.3.3</grader.version>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -137,7 +137,7 @@
<configuration>
<rules>
<requireMavenVersion>
<version>3.6.1</version>
<version>3.6.3</version>
</requireMavenVersion>
<requireJavaVersion>
<version>${maven.compiler.target}</version>
Expand Down Expand Up @@ -195,7 +195,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.3</version>
<version>3.1.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -240,14 +240,12 @@
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.7.0</version>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.7.0</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<publishingServerId>central</publishingServerId>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -691,14 +689,6 @@
</plugins>
</reporting>
<distributionManagement>
<repository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<snapshotRepository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<site>
<id>gh-pages</id>
<name>GitHub Pages</name>
Expand Down
10 changes: 5 additions & 5 deletions projects-parent/archetypes-parent/airline-archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<parent>
<artifactId>archetypes-parent</artifactId>
<groupId>io.github.davidwhitlock.joy</groupId>
<version>2.2.0</version>
<version>2.2.2</version>
</parent>
<artifactId>airline-archetype</artifactId>
<version>2.2.0</version>
<version>2.2.2</version>
<packaging>maven-archetype</packaging>

<name>airline-archetype</name>
Expand All @@ -34,9 +34,9 @@

<repositories>
<repository>
<id>maven-snapshots</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
<layout>default</layout>
<name>Central Portal Snapshots</name>
<id>central-portals</id>
<url>https://central.sonatype.com/repository/mavens/</url>
<releases>
<enabled>false</enabled>
</releases>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
<archetype-descriptor xsi:schemaLocation="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0 http://maven.apache.org/xsd/archetype-descriptor-1.1.0.xsd" name="airline"
xmlns="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<requiredProperties>
<requiredProperty key="grader">
<defaultValue>false</defaultValue>
</requiredProperty>
<requiredProperty key="haltOnFailingCoverage">
<defaultValue>true</defaultValue>
</requiredProperty>
</requiredProperties>
<fileSets>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/main/java</directory>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>joy</artifactId>
<groupId>io.github.davidwhitlock.joy</groupId>
<version>1.2.0</version>
<version>1.2.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
Expand Down Expand Up @@ -32,12 +32,12 @@
<dependency>
<groupId>io.github.davidwhitlock.joy</groupId>
<artifactId>projects</artifactId>
<version>3.0.0</version>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>io.github.davidwhitlock.joy</groupId>
<artifactId>projects</artifactId>
<version>3.0.0</version>
<version>3.0.2</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -96,9 +96,9 @@
</build>
<repositories>
<repository>
<id>maven-snapshots</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
<layout>default</layout>
<name>Central Portal Snapshots</name>
<id>central-portals</id>
<url>https://central.sonatype.com/repository/mavens/</url>
<releases>
<enabled>false</enabled>
</releases>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<parent>
<artifactId>archetypes-parent</artifactId>
<groupId>io.github.davidwhitlock.joy</groupId>
<version>2.2.0</version>
<version>2.2.2</version>
</parent>
<artifactId>airline-web-archetype</artifactId>
<version>3.0.0</version>
<version>3.0.2</version>
<packaging>maven-archetype</packaging>

<name>airline-web-archetype</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
<archetype-descriptor xsi:schemaLocation="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0 https://maven.apache.org/xsd/archetype-descriptor-1.1.0.xsd" name="airline-web"
xmlns="https://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<requiredProperties>
<requiredProperty key="grader">
<defaultValue>false</defaultValue>
</requiredProperty>
<requiredProperty key="haltOnFailingCoverage">
<defaultValue>true</defaultValue>
</requiredProperty>
</requiredProperties>
<fileSets>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/main/java</directory>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>joy</artifactId>
<groupId>io.github.davidwhitlock.joy</groupId>
<version>1.2.0</version>
<version>1.2.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
Expand All @@ -21,17 +21,17 @@
<dependency>
<groupId>io.github.davidwhitlock.joy</groupId>
<artifactId>projects</artifactId>
<version>3.0.0</version>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>io.github.davidwhitlock.joy</groupId>
<artifactId>examples</artifactId>
<version>1.3.0</version>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>io.github.davidwhitlock.joy</groupId>
<artifactId>projects</artifactId>
<version>3.0.0</version>
<version>3.0.2</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions projects-parent/archetypes-parent/apptbook-archetype/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<parent>
<artifactId>archetypes-parent</artifactId>
<groupId>io.github.davidwhitlock.joy</groupId>
<version>2.2.0</version>
<version>2.2.2</version>
</parent>
<artifactId>apptbook-archetype</artifactId>
<version>2.2.0</version>
<version>2.2.2</version>
<packaging>maven-archetype</packaging>

<name>apptbook-archetype</name>
Expand Down
Loading