From c7bf2c39bfde5ad1a156b0fdeaca8bcfd11ee6d4 Mon Sep 17 00:00:00 2001 From: Mark Raynsford Date: Mon, 29 Apr 2024 21:51:35 +0000 Subject: [PATCH] Move to new organization. --- .github/workflows/main.linux.temurin.lts.yml | 3 +- .gitmodules | 3 - .jenkins | 1 - README-CHANGES.xml | 2 +- README.md | 10 +-- com.io7m.jfsm.core/pom.xml | 22 ------- com.io7m.jfsm.tests/pom.xml | 61 +++++++++++++++++++ .../jfsm/tests/core/FSMEnumMutableTest.java | 0 .../io7m/jfsm/tests/core/package-info.java | 0 pom.xml | 12 ++-- src/site/resources/overview.xml | 8 +-- 11 files changed, 80 insertions(+), 42 deletions(-) delete mode 160000 .jenkins create mode 100644 com.io7m.jfsm.tests/pom.xml rename {com.io7m.jfsm.core/src/test => com.io7m.jfsm.tests/src/main}/java/com/io7m/jfsm/tests/core/FSMEnumMutableTest.java (100%) rename {com.io7m.jfsm.core/src/test => com.io7m.jfsm.tests/src/main}/java/com/io7m/jfsm/tests/core/package-info.java (100%) diff --git a/.github/workflows/main.linux.temurin.lts.yml b/.github/workflows/main.linux.temurin.lts.yml index aa46f9c..60a7638 100644 --- a/.github/workflows/main.linux.temurin.lts.yml +++ b/.github/workflows/main.linux.temurin.lts.yml @@ -25,6 +25,7 @@ jobs: name: test-logs path: ./com.io7m.jfsm.tests/target/surefire-reports - name: Coverage - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4.3.0 with: + token: ${{ secrets.CODECOV_TOKEN }} file: com.io7m.jfsm.tests/target/site/jacoco-aggregate/jacoco.xml diff --git a/.gitmodules b/.gitmodules index fade7d7..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule ".jenkins"] - path = .jenkins - url = http://www.github.com/io7m/jenkinsfiles diff --git a/.jenkins b/.jenkins deleted file mode 160000 index 3213e21..0000000 --- a/.jenkins +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3213e21cdb5549e59c16e21658a9e87443301c7e diff --git a/README-CHANGES.xml b/README-CHANGES.xml index b856ec0..4f5797a 100644 --- a/README-CHANGES.xml +++ b/README-CHANGES.xml @@ -23,6 +23,6 @@ - + diff --git a/README.md b/README.md index e1ec2af..e1983cb 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,13 @@ jfsm [![Maven Central](https://img.shields.io/maven-central/v/com.io7m.jfsm/com.io7m.jfsm.svg?style=flat-square)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.io7m.jfsm%22) [![Maven Central (snapshot)](https://img.shields.io/nexus/s/com.io7m.jfsm/com.io7m.jfsm?server=https%3A%2F%2Fs01.oss.sonatype.org&style=flat-square)](https://s01.oss.sonatype.org/content/repositories/snapshots/com/io7m/jfsm/) -[![Codecov](https://img.shields.io/codecov/c/github/io7m/jfsm.svg?style=flat-square)](https://codecov.io/gh/io7m/jfsm) +[![Codecov](https://img.shields.io/codecov/c/github/io7m-com/jfsm.svg?style=flat-square)](https://codecov.io/gh/io7m-com/jfsm) ![com.io7m.jfsm](./src/site/resources/jfsm.jpg?raw=true) | JVM | Platform | Status | |-----|----------|--------| -| OpenJDK (Temurin) Current | Linux | [![Build (OpenJDK (Temurin) Current, Linux)](https://img.shields.io/github/actions/workflow/status/io7m/jfsm/main.linux.temurin.current.yml)](https://github.com/io7m/jfsm/actions?query=workflow%3Amain.linux.temurin.current)| -| OpenJDK (Temurin) LTS | Linux | [![Build (OpenJDK (Temurin) LTS, Linux)](https://img.shields.io/github/actions/workflow/status/io7m/jfsm/main.linux.temurin.lts.yml)](https://github.com/io7m/jfsm/actions?query=workflow%3Amain.linux.temurin.lts)| -| OpenJDK (Temurin) Current | Windows | [![Build (OpenJDK (Temurin) Current, Windows)](https://img.shields.io/github/actions/workflow/status/io7m/jfsm/main.windows.temurin.current.yml)](https://github.com/io7m/jfsm/actions?query=workflow%3Amain.windows.temurin.current)| -| OpenJDK (Temurin) LTS | Windows | [![Build (OpenJDK (Temurin) LTS, Windows)](https://img.shields.io/github/actions/workflow/status/io7m/jfsm/main.windows.temurin.lts.yml)](https://github.com/io7m/jfsm/actions?query=workflow%3Amain.windows.temurin.lts)| +| OpenJDK (Temurin) Current | Linux | [![Build (OpenJDK (Temurin) Current, Linux)](https://img.shields.io/github/actions/workflow/status/io7m-com/jfsm/main.linux.temurin.current.yml)](https://www.github.com/io7m-com/jfsm/actions?query=workflow%3Amain.linux.temurin.current)| +| OpenJDK (Temurin) LTS | Linux | [![Build (OpenJDK (Temurin) LTS, Linux)](https://img.shields.io/github/actions/workflow/status/io7m-com/jfsm/main.linux.temurin.lts.yml)](https://www.github.com/io7m-com/jfsm/actions?query=workflow%3Amain.linux.temurin.lts)| +| OpenJDK (Temurin) Current | Windows | [![Build (OpenJDK (Temurin) Current, Windows)](https://img.shields.io/github/actions/workflow/status/io7m-com/jfsm/main.windows.temurin.current.yml)](https://www.github.com/io7m-com/jfsm/actions?query=workflow%3Amain.windows.temurin.current)| +| OpenJDK (Temurin) LTS | Windows | [![Build (OpenJDK (Temurin) LTS, Windows)](https://img.shields.io/github/actions/workflow/status/io7m-com/jfsm/main.windows.temurin.lts.yml)](https://www.github.com/io7m-com/jfsm/actions?query=workflow%3Amain.windows.temurin.lts)| diff --git a/com.io7m.jfsm.core/pom.xml b/com.io7m.jfsm.core/pom.xml index 29fffa0..ec909d8 100644 --- a/com.io7m.jfsm.core/pom.xml +++ b/com.io7m.jfsm.core/pom.xml @@ -29,28 +29,6 @@ org.osgi.annotation.bundle provided - - - junit - junit - test - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - true - - junit:junit:* - - - - - - diff --git a/com.io7m.jfsm.tests/pom.xml b/com.io7m.jfsm.tests/pom.xml new file mode 100644 index 0000000..caf2711 --- /dev/null +++ b/com.io7m.jfsm.tests/pom.xml @@ -0,0 +1,61 @@ + + + + + 4.0.0 + + com.io7m.jfsm + com.io7m.jfsm + 2.0.1-SNAPSHOT + + com.io7m.jfsm.tests + + jar + com.io7m.jfsm.tests + Finite state machines (Test suite) + https://www.io7m.com/software/jfsm + + + true + true + true + + + + + ${project.groupId} + com.io7m.jfsm.core + ${project.version} + + + + org.osgi + org.osgi.annotation.versioning + provided + + + org.osgi + org.osgi.annotation.bundle + provided + + + + junit + junit + + + + + + + + org.jacoco + jacoco-maven-plugin + + + + + diff --git a/com.io7m.jfsm.core/src/test/java/com/io7m/jfsm/tests/core/FSMEnumMutableTest.java b/com.io7m.jfsm.tests/src/main/java/com/io7m/jfsm/tests/core/FSMEnumMutableTest.java similarity index 100% rename from com.io7m.jfsm.core/src/test/java/com/io7m/jfsm/tests/core/FSMEnumMutableTest.java rename to com.io7m.jfsm.tests/src/main/java/com/io7m/jfsm/tests/core/FSMEnumMutableTest.java diff --git a/com.io7m.jfsm.core/src/test/java/com/io7m/jfsm/tests/core/package-info.java b/com.io7m.jfsm.tests/src/main/java/com/io7m/jfsm/tests/core/package-info.java similarity index 100% rename from com.io7m.jfsm.core/src/test/java/com/io7m/jfsm/tests/core/package-info.java rename to com.io7m.jfsm.tests/src/main/java/com/io7m/jfsm/tests/core/package-info.java diff --git a/pom.xml b/pom.xml index b675e47..f45d39b 100644 --- a/pom.xml +++ b/pom.xml @@ -25,9 +25,11 @@ com.io7m.jfsm.core com.io7m.jfsm.documentation + com.io7m.jfsm.tests + 1.0.0 21 @@ -40,9 +42,9 @@ - https://github.com/io7m/jfsm - scm:git:https://github.com/io7m/jfsm - scm:git:https://github.com/io7m/jfsm + https://www.github.com/io7m-com/jfsm + scm:git:https://www.github.com/io7m-com/jfsm + scm:git:https://www.github.com/io7m-com/jfsm @@ -55,7 +57,7 @@ - https://github.com/io7m/jfsm/issues + https://www.github.com/io7m-com/jfsm/issues GitHub Issues @@ -73,7 +75,7 @@ GitHub Actions - https://github.com/jfsm/actions + https://www.github.com/io7m-com/jfsm/actions diff --git a/src/site/resources/overview.xml b/src/site/resources/overview.xml index db1ffa5..8ba37d9 100644 --- a/src/site/resources/overview.xml +++ b/src/site/resources/overview.xml @@ -1,15 +1,15 @@

- - + Build status Maven Central - - + Codecov