From 2ca4fb4f9615a52f319e0b871688aa4e5f01b013 Mon Sep 17 00:00:00 2001 From: Mark Raynsford Date: Wed, 1 May 2024 19:32:45 +0000 Subject: [PATCH] Move to new organization. --- .github/workflows/main.linux.temurin.lts.yml | 3 +- .gitmodules | 3 -- .jenkins | 1 - README-CHANGES.xml | 3 +- README.md | 10 +++---- com.io7m.jvindicator.tests/pom.xml | 16 ++-------- .../com/io7m/jvindicator/tests/Empty.java | 29 ------------------- .../jvindicator/tests/VindicationTest.java | 0 .../io7m/jvindicator/tests/package-info.java | 26 ----------------- .../src/main/java/module-info.java | 26 ----------------- pom.xml | 10 +++---- src/site/resources/overview.xml | 8 ++--- 12 files changed, 20 insertions(+), 115 deletions(-) delete mode 160000 .jenkins delete mode 100644 com.io7m.jvindicator.tests/src/main/java/com/io7m/jvindicator/tests/Empty.java rename com.io7m.jvindicator.tests/src/{test => main}/java/com/io7m/jvindicator/tests/VindicationTest.java (100%) delete mode 100644 com.io7m.jvindicator.tests/src/main/java/com/io7m/jvindicator/tests/package-info.java delete mode 100644 com.io7m.jvindicator.tests/src/main/java/module-info.java diff --git a/.github/workflows/main.linux.temurin.lts.yml b/.github/workflows/main.linux.temurin.lts.yml index 384f585..369dc9f 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.jvindicator.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.jvindicator.tests/target/site/jacoco-aggregate/jacoco.xml diff --git a/.gitmodules b/.gitmodules index e8d95e0..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule ".jenkins"] - path = .jenkins - url = https://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 bd9b9cc..279ef70 100644 --- a/README-CHANGES.xml +++ b/README-CHANGES.xml @@ -2,6 +2,7 @@ - + diff --git a/README.md b/README.md index bffc413..4c5c8f3 100644 --- a/README.md +++ b/README.md @@ -3,16 +3,16 @@ jvindicator [![Maven Central](https://img.shields.io/maven-central/v/com.io7m.jvindicator/com.io7m.jvindicator.svg?style=flat-square)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.io7m.jvindicator%22) [![Maven Central (snapshot)](https://img.shields.io/nexus/s/com.io7m.jvindicator/com.io7m.jvindicator?server=https%3A%2F%2Fs01.oss.sonatype.org&style=flat-square)](https://s01.oss.sonatype.org/content/repositories/snapshots/com/io7m/jvindicator/) -[![Codecov](https://img.shields.io/codecov/c/github/io7m/jvindicator.svg?style=flat-square)](https://codecov.io/gh/io7m/jvindicator) +[![Codecov](https://img.shields.io/codecov/c/github/io7m-com/jvindicator.svg?style=flat-square)](https://codecov.io/gh/io7m-com/jvindicator) ![com.io7m.jvindicator](./src/site/resources/jvindicator.jpg?raw=true) | JVM | Platform | Status | |-----|----------|--------| -| OpenJDK (Temurin) Current | Linux | [![Build (OpenJDK (Temurin) Current, Linux)](https://img.shields.io/github/actions/workflow/status/io7m/jvindicator/main.linux.temurin.current.yml)](https://github.com/io7m/jvindicator/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/jvindicator/main.linux.temurin.lts.yml)](https://github.com/io7m/jvindicator/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/jvindicator/main.windows.temurin.current.yml)](https://github.com/io7m/jvindicator/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/jvindicator/main.windows.temurin.lts.yml)](https://github.com/io7m/jvindicator/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/jvindicator/main.linux.temurin.current.yml)](https://www.github.com/io7m-com/jvindicator/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/jvindicator/main.linux.temurin.lts.yml)](https://www.github.com/io7m-com/jvindicator/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/jvindicator/main.windows.temurin.current.yml)](https://www.github.com/io7m-com/jvindicator/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/jvindicator/main.windows.temurin.lts.yml)](https://www.github.com/io7m-com/jvindicator/actions?query=workflow%3Amain.windows.temurin.lts)| ## Usage diff --git a/com.io7m.jvindicator.tests/pom.xml b/com.io7m.jvindicator.tests/pom.xml index fdf9a9c..0e112fa 100644 --- a/com.io7m.jvindicator.tests/pom.xml +++ b/com.io7m.jvindicator.tests/pom.xml @@ -19,7 +19,9 @@ https://www.io7m.com/software/jvindicator + true true + true @@ -52,20 +54,6 @@ - - org.apache.maven.plugins - maven-surefire-plugin - - - ${argLine} - --add-opens - org.junit.platform.commons/org.junit.platform.commons.logging=ALL-UNNAMED - --add-opens - org.junit.platform.commons/org.junit.platform.commons.util=ALL-UNNAMED - - - - org.jacoco diff --git a/com.io7m.jvindicator.tests/src/main/java/com/io7m/jvindicator/tests/Empty.java b/com.io7m.jvindicator.tests/src/main/java/com/io7m/jvindicator/tests/Empty.java deleted file mode 100644 index 836db38..0000000 --- a/com.io7m.jvindicator.tests/src/main/java/com/io7m/jvindicator/tests/Empty.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright © 2022 Mark Raynsford https://www.io7m.com - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR - * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -package com.io7m.jvindicator.tests; - -/** - * Empty marker class for module descriptor. - */ - -public final class Empty -{ - private Empty() - { - - } -} diff --git a/com.io7m.jvindicator.tests/src/test/java/com/io7m/jvindicator/tests/VindicationTest.java b/com.io7m.jvindicator.tests/src/main/java/com/io7m/jvindicator/tests/VindicationTest.java similarity index 100% rename from com.io7m.jvindicator.tests/src/test/java/com/io7m/jvindicator/tests/VindicationTest.java rename to com.io7m.jvindicator.tests/src/main/java/com/io7m/jvindicator/tests/VindicationTest.java diff --git a/com.io7m.jvindicator.tests/src/main/java/com/io7m/jvindicator/tests/package-info.java b/com.io7m.jvindicator.tests/src/main/java/com/io7m/jvindicator/tests/package-info.java deleted file mode 100644 index 81b995f..0000000 --- a/com.io7m.jvindicator.tests/src/main/java/com/io7m/jvindicator/tests/package-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright © 2022 Mark Raynsford https://www.io7m.com - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR - * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -/** - * Servlet parameter validation (Test suite) - */ - -@Export -@Version("1.0.0") -package com.io7m.jvindicator.tests; - -import org.osgi.annotation.bundle.Export; -import org.osgi.annotation.versioning.Version; diff --git a/com.io7m.jvindicator.tests/src/main/java/module-info.java b/com.io7m.jvindicator.tests/src/main/java/module-info.java deleted file mode 100644 index 2eb387d..0000000 --- a/com.io7m.jvindicator.tests/src/main/java/module-info.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright © 2022 Mark Raynsford https://www.io7m.com - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY - * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR - * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -open module com.io7m.jvindicator.tests -{ - requires static org.osgi.annotation.bundle; - requires static org.osgi.annotation.versioning; - - requires com.io7m.jvindicator.core; - requires transitive org.junit.jupiter.api; - - exports com.io7m.jvindicator.tests; -} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 07afa84..965748b 100644 --- a/pom.xml +++ b/pom.xml @@ -40,9 +40,9 @@ - https://www.github.com/io7m/jvindicator - scm:git:https://github.com/io7m/jvindicator - scm:git:https://github.com/io7m/jvindicator + https://www.github.com/io7m-com/jvindicator + scm:git:https://www.github.com/io7m-com/jvindicator + scm:git:https://www.github.com/io7m-com/jvindicator @@ -55,7 +55,7 @@ - https://www.github.com/io7m/jvindicator/issues + https://www.github.com/io7m-com/jvindicator/issues GitHub Issues @@ -77,7 +77,7 @@ GitHub Actions - https://github.com/jvindicator/actions + https://www.github.com/io7m-com/jvindicator/actions diff --git a/src/site/resources/overview.xml b/src/site/resources/overview.xml index 1ecadf9..30a1b64 100644 --- a/src/site/resources/overview.xml +++ b/src/site/resources/overview.xml @@ -1,15 +1,15 @@