Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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@v3
Expand Down
23 changes: 19 additions & 4 deletions koans/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,29 @@
<parent>
<groupId>io.github.davidwhitlock.joy.com.sandwich</groupId>
<artifactId>koans-parent</artifactId>
<version>1.2.0</version>
<version>1.2.2</version>
</parent>
<artifactId>java-koans</artifactId>
<packaging>jar</packaging>
<version>1.2.0</version>
<version>1.2.2</version>
<name>Java Koans</name>
<inceptionYear>2012</inceptionYear>
<url>https://github.com/DavidWhitlock/java-koans</url>
<description>Java Koans to learn the Java language and APIs</description>
<url>https://github.com/JoyOfCodingPDX/java-koans</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:git:git@github.com:JoyOfCodingPDX/java-koans.git</connection>
<developerConnection>scm:git:git@github.com:JoyOfCodingPDX/java-koans.git</developerConnection>
<url>https://github.com/JoyOfCodingPDX/java-koans/tree/main</url>
<tag>HEAD</tag>
</scm>

<developers>
<developer>
<id>matyb</id>
Expand Down Expand Up @@ -49,7 +64,7 @@
<dependency>
<groupId>io.github.davidwhitlock.joy.com.sandwich</groupId>
<artifactId>koans-lib</artifactId>
<version>1.2.0</version>
<version>1.2.2</version>
</dependency>
</dependencies>
<properties>
Expand Down
24 changes: 18 additions & 6 deletions lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,28 @@
<parent>
<groupId>io.github.davidwhitlock.joy.com.sandwich</groupId>
<artifactId>koans-parent</artifactId>
<version>1.2.0</version>
<version>1.2.2</version>
</parent>
<artifactId>koans-lib</artifactId>
<packaging>jar</packaging>
<version>1.2.0</version>
<version>1.2.2</version>
<name>Java Koans Framework</name>
<description>Supporting library code for running Java Koans</description>
<url>https://github.com/DavidWhitlock/java-koans</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<connection>scm:git:git@github.com:DavidWhitlock/java-koans.git</connection>
<connection>scm:git:git@github.com:JoyOfCodingPDX/java-koans.git</connection>
<developerConnection>scm:git:git@github.com:JoyOfCodingPDX/java-koans.git</developerConnection>
<url>https://github.com/JoyOfCodingPDX/java-koans/tree/main</url>
<tag>HEAD</tag>
</scm>

<developers>
<developer>
<id>matyb</id>
Expand Down Expand Up @@ -65,9 +77,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
45 changes: 40 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,58 @@
<parent>
<artifactId>joy</artifactId>
<groupId>io.github.davidwhitlock.joy</groupId>
<version>1.2.0</version>
<version>1.2.2</version>
</parent>
<groupId>io.github.davidwhitlock.joy.com.sandwich</groupId>
<version>1.2.0</version>
<version>1.2.2</version>
<artifactId>koans-parent</artifactId>
<packaging>pom</packaging>
<name>Java Koans Parent POM</name>
<description>Parent project for the Joy of Coding take on Java Koans</description>
<url>https://web.cecs.pdx.edu/~whitlock/</url>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>matyb</id>
<name>Mat Bentley</name>
<url>https://github.com/matyb</url>
<roles>
<role>java-koans author</role>
</roles>
</developer>
<developer>
<id>dwhitlock</id>
<name>David Whitlock</name>
<url>https://www.cs.pdx.edu/~whitlock</url>
<roles>
<role>Maven-izer</role>
</roles>
</developer>
</developers>

<scm>
<connection>scm:git:git@github.com:JoyOfCodingPDX/java-koans.git</connection>
<developerConnection>scm:git:git@github.com:JoyOfCodingPDX/java-koans.git</developerConnection>
<url>https://github.com/JoyOfCodingPDX/java-koans/tree/main</url>
<tag>HEAD</tag>
</scm>

<modules>
<module>lib</module>
<module>koans</module>
</modules>

<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