From 1dedd1a8d094616e80fce9145b9eb99ff8d9aed9 Mon Sep 17 00:00:00 2001 From: FrankHuxol Date: Thu, 28 Apr 2022 07:57:38 +0200 Subject: [PATCH] changed dependency to jakarta.annotation-api:2.0.0 --- common/pom.xml | 5 +++++ .../java/systems/uom/common/spi/CommonServiceProvider.java | 2 +- common/src/main/jdk9/module-info.java | 2 +- pom.xml | 6 +++++- ucum/pom.xml | 6 +++++- ucum/src/etc/jdk9/module-info.java | 2 +- ucum/src/main/jdk9/module-info.java | 2 +- 7 files changed, 19 insertions(+), 6 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 991ff8b9..d400ee7e 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -56,6 +56,11 @@ si.uom si-units + + jakarta.annotation + jakarta.annotation-api + + systems.uom systems-quantity diff --git a/common/src/main/java/systems/uom/common/spi/CommonServiceProvider.java b/common/src/main/java/systems/uom/common/spi/CommonServiceProvider.java index 012693d7..2a8201f4 100644 --- a/common/src/main/java/systems/uom/common/spi/CommonServiceProvider.java +++ b/common/src/main/java/systems/uom/common/spi/CommonServiceProvider.java @@ -30,7 +30,7 @@ package systems.uom.common.spi; import static systems.uom.common.spi.ServiceConstants.*; -import javax.annotation.Priority; +import jakarta.annotation.Priority; import javax.inject.Named; import javax.measure.spi.ServiceProvider; import javax.measure.spi.SystemOfUnitsService; diff --git a/common/src/main/jdk9/module-info.java b/common/src/main/jdk9/module-info.java index f1db6d0d..ba2d6341 100644 --- a/common/src/main/jdk9/module-info.java +++ b/common/src/main/jdk9/module-info.java @@ -31,7 +31,7 @@ requires transitive java.measure; requires transitive si.uom.quantity; requires transitive tech.uom.lib.common; - requires transitive java.annotation; + requires transitive jakarta.annotation; requires transitive systems.uom.quantity; requires tech.units.indriya; requires si.uom.units; diff --git a/pom.xml b/pom.xml index a9b36c0d..627ef44d 100644 --- a/pom.xml +++ b/pom.xml @@ -209,7 +209,11 @@ si-units ${si.version} - + + jakarta.annotation + jakarta.annotation-api + 2.0.0 + diff --git a/ucum/pom.xml b/ucum/pom.xml index 9714a563..43ed43db 100644 --- a/ucum/pom.xml +++ b/ucum/pom.xml @@ -113,7 +113,11 @@ junit-platform-runner test - + + jakarta.annotation + jakarta.annotation-api + + diff --git a/ucum/src/etc/jdk9/module-info.java b/ucum/src/etc/jdk9/module-info.java index 2cd66724..80232d73 100644 --- a/ucum/src/etc/jdk9/module-info.java +++ b/ucum/src/etc/jdk9/module-info.java @@ -32,7 +32,7 @@ requires transitive si.uom.quantity; requires transitive si.uom.units; requires transitive tech.units.indriya; - requires transitive java.annotation; + requires transitive jakarta.annotation; requires transitive systems.uom.quantity; exports systems.uom.ucum; diff --git a/ucum/src/main/jdk9/module-info.java b/ucum/src/main/jdk9/module-info.java index a867ca34..a52d47d5 100644 --- a/ucum/src/main/jdk9/module-info.java +++ b/ucum/src/main/jdk9/module-info.java @@ -32,7 +32,7 @@ requires transitive si.uom.quantity; requires transitive si.uom.units; requires transitive tech.units.indriya; - requires transitive java.annotation; + requires transitive jakarta.annotation; requires transitive systems.uom.quantity; exports systems.uom.ucum;