JSpecify is not an optional dependency, because its annotations have …

…'runtime' retention.
wrandelshofer · Jul 16, 2024 · 4a10db6 · 4a10db6
1 parent a8a8fd2
commit 4a10db6
Show file tree

Hide file tree

Showing 38 changed files with 20 additions and 37 deletions.
diff --git a/org.jhotdraw8.application/pom.xml b/org.jhotdraw8.application/pom.xml
@@ -78,7 +78,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>ch.randelshofer</groupId>

diff --git a/org.jhotdraw8.application/src/main/java/org.jhotdraw8.application/module-info.java b/org.jhotdraw8.application/src/main/java/org.jhotdraw8.application/module-info.java
@@ -18,7 +18,7 @@
     requires transitive java.desktop;
     requires transitive java.prefs;
     requires transitive javafx.fxml;
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
     requires transitive org.jhotdraw8.collection;
     requires transitive org.jhotdraw8.base;

diff --git a/org.jhotdraw8.base/pom.xml b/org.jhotdraw8.base/pom.xml
@@ -52,7 +52,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>

diff --git a/org.jhotdraw8.base/src/main/java/org.jhotdraw8.base/module-info.java b/org.jhotdraw8.base/src/main/java/org.jhotdraw8.base/module-info.java
@@ -10,7 +10,7 @@
 @SuppressWarnings("module")
 @NullMarked
 module org.jhotdraw8.base {
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
     requires java.logging;
     exports org.jhotdraw8.base.converter;

diff --git a/org.jhotdraw8.collection/pom.xml b/org.jhotdraw8.collection/pom.xml
@@ -52,7 +52,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
         <groupId>ch.randelshofer</groupId>

diff --git a/org.jhotdraw8.collection/src/main/java/org.jhotdraw8.collection/module-info.java b/org.jhotdraw8.collection/src/main/java/org.jhotdraw8.collection/module-info.java
@@ -11,7 +11,7 @@
 @SuppressWarnings("module")
 @NullMarked
 module org.jhotdraw8.collection {
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
     requires transitive org.jhotdraw8.icollection;
     requires java.logging;

diff --git a/org.jhotdraw8.color/pom.xml b/org.jhotdraw8.color/pom.xml
@@ -54,7 +54,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>

diff --git a/org.jhotdraw8.color/src/main/java/org.jhotdraw8.color/module-info.java b/org.jhotdraw8.color/src/main/java/org.jhotdraw8.color/module-info.java
@@ -13,7 +13,7 @@
 module org.jhotdraw8.color {
     requires transitive java.desktop;
     requires transitive javafx.graphics;
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
     requires java.logging;
 

diff --git a/org.jhotdraw8.css/pom.xml b/org.jhotdraw8.css/pom.xml
@@ -54,7 +54,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>ch.randelshofer</groupId>

diff --git a/org.jhotdraw8.css/src/main/java/org.jhotdraw8.css/module-info.java b/org.jhotdraw8.css/src/main/java/org.jhotdraw8.css/module-info.java
@@ -14,7 +14,7 @@
     requires transitive java.logging;
     requires transitive java.xml;
     requires transitive javafx.graphics;
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
     requires transitive org.jhotdraw8.base;
     requires transitive org.jhotdraw8.collection;

diff --git a/org.jhotdraw8.draw/pom.xml b/org.jhotdraw8.draw/pom.xml
@@ -55,7 +55,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>ch.randelshofer</groupId>

diff --git a/org.jhotdraw8.draw/src/main/java/org.jhotdraw8.draw/module-info.java b/org.jhotdraw8.draw/src/main/java/org.jhotdraw8.draw/module-info.java
@@ -18,7 +18,7 @@
     requires transitive javafx.controls;
     requires transitive javafx.fxml;
     requires transitive javafx.graphics;
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
     requires transitive org.jhotdraw8.application;
     requires transitive org.jhotdraw8.base;

diff --git a/org.jhotdraw8.examples/pom.xml b/org.jhotdraw8.examples/pom.xml
@@ -56,7 +56,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>ch.randelshofer</groupId>

diff --git a/org.jhotdraw8.examples/src/main/java/org.jhotdraw8.examples/module-info.java b/org.jhotdraw8.examples/src/main/java/org.jhotdraw8.examples/module-info.java
@@ -12,7 +12,7 @@
 module org.jhotdraw8.examples {
     requires transitive java.desktop;
     requires transitive org.jhotdraw8.draw;
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
     requires transitive org.jhotdraw8.color;
     requires transitive org.jhotdraw8.os;

diff --git a/org.jhotdraw8.fxbase/pom.xml b/org.jhotdraw8.fxbase/pom.xml
@@ -54,7 +54,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>ch.randelshofer</groupId>

diff --git a/org.jhotdraw8.fxbase/src/main/java/org.jhotdraw8.fxbase/module-info.java b/org.jhotdraw8.fxbase/src/main/java/org.jhotdraw8.fxbase/module-info.java
@@ -11,7 +11,7 @@
 @SuppressWarnings("module")
 @NullMarked
 module org.jhotdraw8.fxbase {
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
     requires transitive org.jhotdraw8.base;
     requires transitive javafx.base;

diff --git a/org.jhotdraw8.fxcollection/pom.xml b/org.jhotdraw8.fxcollection/pom.xml
@@ -54,7 +54,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>ch.randelshofer</groupId>

diff --git a/org.jhotdraw8.fxcollection/src/main/java/org.jhotdraw8.fxcollection/module-info.java b/org.jhotdraw8.fxcollection/src/main/java/org.jhotdraw8.fxcollection/module-info.java
@@ -11,7 +11,7 @@
 @SuppressWarnings("module")
 @NullMarked
 module org.jhotdraw8.fxcollection {
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
     requires transitive javafx.base;
     requires transitive org.jhotdraw8.collection;

diff --git a/org.jhotdraw8.fxcontrols/src/main/java/org.jhotdraw8.fxcontrols/module-info.java b/org.jhotdraw8.fxcontrols/src/main/java/org.jhotdraw8.fxcontrols/module-info.java
@@ -17,7 +17,7 @@
     requires transitive javafx.graphics;
     requires transitive javafx.controls;
     requires transitive javafx.fxml;
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
     requires transitive org.jhotdraw8.application;
     requires transitive org.jhotdraw8.base;

diff --git a/org.jhotdraw8.geom/pom.xml b/org.jhotdraw8.geom/pom.xml
@@ -52,7 +52,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>ch.randelshofer</groupId>

diff --git a/org.jhotdraw8.geom/src/main/java/org.jhotdraw8.geom/module-info.java b/org.jhotdraw8.geom/src/main/java/org.jhotdraw8.geom/module-info.java
@@ -12,7 +12,7 @@
 @NullMarked
 module org.jhotdraw8.geom {
     requires transitive javafx.graphics;
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
     requires transitive java.desktop;
     requires transitive org.jhotdraw8.collection;
     requires transitive org.jhotdraw8.base;

diff --git a/org.jhotdraw8.graph/pom.xml b/org.jhotdraw8.graph/pom.xml
@@ -54,7 +54,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>ch.randelshofer</groupId>

diff --git a/org.jhotdraw8.graph/src/main/java/org.jhotdraw8.graph/module-info.java b/org.jhotdraw8.graph/src/main/java/org.jhotdraw8.graph/module-info.java
@@ -11,7 +11,7 @@
 @SuppressWarnings("module")
 @NullMarked
 module org.jhotdraw8.graph {
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
     requires transitive org.jhotdraw8.base;
     requires transitive org.jhotdraw8.collection;

diff --git a/org.jhotdraw8.grapher/pom.xml b/org.jhotdraw8.grapher/pom.xml
@@ -55,7 +55,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>ch.randelshofer</groupId>

diff --git a/org.jhotdraw8.grapher/src/main/java/org.jhotdraw8.grapher/module-info.java b/org.jhotdraw8.grapher/src/main/java/org.jhotdraw8.grapher/module-info.java
@@ -21,7 +21,7 @@
     requires transitive org.jhotdraw8.os;
     requires transitive org.jhotdraw8.svg;
     requires transitive org.jhotdraw8.theme;
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
 
     opens org.jhotdraw8.grapher to javafx.fxml, javafx.graphics;

diff --git a/org.jhotdraw8.icollection/pom.xml b/org.jhotdraw8.icollection/pom.xml
@@ -58,7 +58,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>

diff --git a/org.jhotdraw8.icollection/src/main/java/org.jhotdraw8.icollection/module-info.java b/org.jhotdraw8.icollection/src/main/java/org.jhotdraw8.icollection/module-info.java
@@ -12,7 +12,7 @@
 @SuppressWarnings("module")
 @NullMarked
 module org.jhotdraw8.icollection {
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
     requires java.logging;
     exports org.jhotdraw8.icollection.exception;

diff --git a/org.jhotdraw8.os/pom.xml b/org.jhotdraw8.os/pom.xml
@@ -54,7 +54,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>ch.randelshofer</groupId>

diff --git a/org.jhotdraw8.os/src/main/java/org.jhotdraw8.os/module-info.java b/org.jhotdraw8.os/src/main/java/org.jhotdraw8.os/module-info.java
@@ -13,7 +13,7 @@
 module org.jhotdraw8.os {
     requires transitive java.xml;
     requires transitive javafx.graphics;
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
     requires transitive org.jhotdraw8.collection;
     requires transitive org.jhotdraw8.icollection;

diff --git a/org.jhotdraw8.svg/pom.xml b/org.jhotdraw8.svg/pom.xml
@@ -54,7 +54,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>ch.randelshofer</groupId>

diff --git a/org.jhotdraw8.svg/src/main/java/org.jhotdraw8.svg/module-info.java b/org.jhotdraw8.svg/src/main/java/org.jhotdraw8.svg/module-info.java
@@ -15,7 +15,7 @@
     requires transitive java.logging;
     requires transitive java.xml;
     requires transitive javafx.graphics;
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
     requires transitive org.jhotdraw8.base;
     requires transitive org.jhotdraw8.collection;

diff --git a/org.jhotdraw8.teddy/pom.xml b/org.jhotdraw8.teddy/pom.xml
@@ -55,7 +55,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>ch.randelshofer</groupId>

diff --git a/org.jhotdraw8.teddy/src/main/java/org.jhotdraw8.teddy/module-info.java b/org.jhotdraw8.teddy/src/main/java/org.jhotdraw8.teddy/module-info.java
@@ -11,7 +11,7 @@
 module org.jhotdraw8.teddy {
     requires transitive java.desktop;
     requires transitive org.jhotdraw8.application;
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
     requires transitive org.jhotdraw8.collection;
     requires transitive org.jhotdraw8.fxcontrols;

diff --git a/org.jhotdraw8.theme/pom.xml b/org.jhotdraw8.theme/pom.xml
@@ -54,7 +54,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>ch.randelshofer</groupId>

diff --git a/org.jhotdraw8.theme/src/main/java/org.jhotdraw8.theme/module-info.java b/org.jhotdraw8.theme/src/main/java/org.jhotdraw8.theme/module-info.java
@@ -12,7 +12,7 @@
 @NullMarked
 module org.jhotdraw8.theme {
     requires transitive org.jhotdraw8.color;
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
     requires transitive org.jhotdraw8.fxbase;
     exports org.jhotdraw8.theme;

diff --git a/org.jhotdraw8.xml/pom.xml b/org.jhotdraw8.xml/pom.xml
@@ -54,7 +54,6 @@
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>ch.randelshofer</groupId>

diff --git a/org.jhotdraw8.xml/src/main/java/org.jhotdraw8.xml/module-info.java b/org.jhotdraw8.xml/src/main/java/org.jhotdraw8.xml/module-info.java
@@ -14,7 +14,7 @@
     requires transitive java.logging;
     requires transitive java.xml;
     requires transitive javafx.graphics;
-    requires transitive static org.jspecify;
+    requires transitive org.jspecify;
 
     requires transitive org.jhotdraw8.base;
     requires transitive org.jhotdraw8.css;

diff --git a/...draw8.xml/src/main/java/org.jhotdraw8.xml/org/jhotdraw8/xml/IndentingXMLStreamWriter.java b/...draw8.xml/src/main/java/org.jhotdraw8.xml/org/jhotdraw8/xml/IndentingXMLStreamWriter.java
@@ -767,6 +767,7 @@ public void writeProcessingInstruction(String target) throws XMLStreamException
         write(START_PROCESSING_INSTRUCTION);
         write(target);
         write(END_PROCESSING_INSTRUCTION);
+        write
     }
 
     @Override