29: Use Maven Generator for AssertJ

Task-Url: #29
unitsofmeasurement · Oct 20, 2022 · 9901289 · 9901289
1 parent 01e1cbe
commit 9901289
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 14 deletions.
diff --git a/assertj/pom.xml b/assertj/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.19.0</version>
+            <version>3.23.1</version>
         </dependency>
         <dependency>
             <groupId>javax.measure</groupId>
@@ -57,9 +57,9 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
-            <version>1.3.5</version>
+            <version>2.0.0</version>
             <scope>compile</scope>
-        </dependency>        
+        </dependency>
         <dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-junit</artifactId>

diff --git a/assertj/src/main/java/tech/uom/lib/assertj/Assertions.java b/assertj/src/main/java/tech/uom/lib/assertj/Assertions.java
@@ -33,7 +33,7 @@
  * Entry point for assertions of different data types. Each method in this class is a static factory for the
  * type-specific assertion objects.
  */
-@javax.annotation.Generated(value = "assertj-assertions-generator")
+@jakarta.annotation.Generated(value = "assertj-assertions-generator")
 public class Assertions {
 
     /**

diff --git a/assertj/src/main/java/tech/uom/lib/assertj/BddAssertions.java b/assertj/src/main/java/tech/uom/lib/assertj/BddAssertions.java
@@ -32,7 +32,7 @@
 /**
  * Entry point for BDD assertions of different data types.
  */
-@javax.annotation.Generated(value = "assertj-assertions-generator")
+@jakarta.annotation.Generated(value = "assertj-assertions-generator")
 public class BddAssertions {
 
     /**

diff --git a/assertj/src/main/java/tech/uom/lib/assertj/SoftAssertions.java b/assertj/src/main/java/tech/uom/lib/assertj/SoftAssertions.java
@@ -32,7 +32,7 @@
 /**
  * Entry point for soft assertions of different data types.
  */
-@javax.annotation.Generated(value = "assertj-assertions-generator")
+@jakarta.annotation.Generated(value = "assertj-assertions-generator")
 public class SoftAssertions extends org.assertj.core.api.SoftAssertions {
 
     /**

diff --git a/assertj/src/main/java/tech/uom/lib/assertj/assertions/AbstractDimensionAssert.java b/assertj/src/main/java/tech/uom/lib/assertj/assertions/AbstractDimensionAssert.java
@@ -36,7 +36,7 @@
 /**
  * Abstract base class for {@link Dimension} specific assertions - Generated by CustomAssertionGenerator.
  */
-@javax.annotation.Generated(value = "assertj-assertions-generator")
+@jakarta.annotation.Generated(value = "assertj-assertions-generator")
 public abstract class AbstractDimensionAssert<S extends AbstractDimensionAssert<S, A>, A extends Dimension> extends AbstractObjectAssert<S, A> {
 
     /**

diff --git a/assertj/src/main/java/tech/uom/lib/assertj/assertions/AbstractQuantityAssert.java b/assertj/src/main/java/tech/uom/lib/assertj/assertions/AbstractQuantityAssert.java
@@ -37,7 +37,7 @@
 /**
  * Abstract base class for {@link Quantity} specific assertions - Generated by CustomAssertionGenerator.
  */
-@javax.annotation.Generated(value = "assertj-assertions-generator")
+@jakarta.annotation.Generated(value = "assertj-assertions-generator")
 public abstract class AbstractQuantityAssert<S extends AbstractQuantityAssert<S, A>, A extends Quantity> extends AbstractObjectAssert<S, A> {
 
     /**

diff --git a/assertj/src/main/java/tech/uom/lib/assertj/assertions/AbstractUnitAssert.java b/assertj/src/main/java/tech/uom/lib/assertj/assertions/AbstractUnitAssert.java
@@ -36,7 +36,7 @@
 /**
  * Abstract base class for {@link Unit} specific assertions - Generated by CustomAssertionGenerator.
  */
-@javax.annotation.Generated(value = "assertj-assertions-generator")
+@jakarta.annotation.Generated(value = "assertj-assertions-generator")
 public abstract class AbstractUnitAssert<S extends AbstractUnitAssert<S, A>, A extends Unit> extends AbstractObjectAssert<S, A> {
 
     /**

diff --git a/assertj/src/main/java/tech/uom/lib/assertj/assertions/DimensionAssert.java b/assertj/src/main/java/tech/uom/lib/assertj/assertions/DimensionAssert.java
@@ -37,7 +37,7 @@
  * Although this class is not final to allow Soft assertions proxy, if you wish to extend it,
  * extend {@link AbstractDimensionAssert} instead.
  */
-@javax.annotation.Generated(value = "assertj-assertions-generator")
+@jakarta.annotation.Generated(value = "assertj-assertions-generator")
 public class DimensionAssert extends AbstractDimensionAssert<DimensionAssert, Dimension> {
 
     /**

diff --git a/assertj/src/main/java/tech/uom/lib/assertj/assertions/QuantityAssert.java b/assertj/src/main/java/tech/uom/lib/assertj/assertions/QuantityAssert.java
@@ -37,7 +37,7 @@
  * Although this class is not final to allow Soft assertions proxy, if you wish to extend it,
  * extend {@link AbstractQuantityAssert} instead.
  */
-@javax.annotation.Generated(value = "assertj-assertions-generator")
+@jakarta.annotation.Generated(value = "assertj-assertions-generator")
 public class QuantityAssert extends AbstractQuantityAssert<QuantityAssert, Quantity> {
 
     /**

diff --git a/assertj/src/main/java/tech/uom/lib/assertj/assertions/UnitAssert.java b/assertj/src/main/java/tech/uom/lib/assertj/assertions/UnitAssert.java
@@ -37,7 +37,7 @@
  * Although this class is not final to allow Soft assertions proxy, if you wish to extend it,
  * extend {@link AbstractUnitAssert} instead.
  */
-@javax.annotation.Generated(value = "assertj-assertions-generator")
+@jakarta.annotation.Generated(value = "assertj-assertions-generator")
 public class UnitAssert extends AbstractUnitAssert<UnitAssert, Unit> {
 
     /**

diff --git a/assertj/src/main/jdk9/module-info.java b/assertj/src/main/jdk9/module-info.java
@@ -30,7 +30,7 @@
 module tech.uom.lib.assertj {
     requires transitive java.measure;
     requires tech.uom.lib.common;
-    requires java.annotation;
+    requires jakarta.annotation;
     requires org.assertj.core;
     requires tech.units.indriya;
 

diff --git a/src/main/config/uom-lib clean install.launch b/src/main/config/uom-lib clean install.launch
@@ -18,6 +18,5 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-14"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:uom-lib}"/>
 </launchConfiguration>