cleanup org.osgi.annotation -> osgi.annotation

aploese · Dec 27, 2023 · 446987f · 446987f
1 parent 0f1b745
commit 446987f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 27 deletions.
diff --git a/de.ibapl.onewire4j/pom.xml b/de.ibapl.onewire4j/pom.xml
@@ -3,7 +3,8 @@
     <parent>
         <artifactId>onewire4j-project</artifactId>
         <groupId>de.ibapl.onewire4j</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.1-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <artifactId>de.ibapl.onewire4j</artifactId>

diff --git a/de.ibapl.onewire4j/src/main/java/de/ibapl/onewire4j/DS2480BAdapter.java b/de.ibapl.onewire4j/src/main/java/de/ibapl/onewire4j/DS2480BAdapter.java
@@ -21,12 +21,6 @@
  */
 package de.ibapl.onewire4j;
 
-import java.io.IOException;
-import java.util.function.Consumer;
-import java.util.function.LongConsumer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import de.ibapl.onewire4j.container.OneWireContainer;
 import de.ibapl.onewire4j.container.OneWireDevice;
 import de.ibapl.onewire4j.request.CommandRequest;
@@ -62,8 +56,13 @@
 import de.ibapl.spsw.api.SerialPortSocket;
 import de.ibapl.spsw.api.Speed;
 import de.ibapl.spsw.api.StopBits;
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import java.util.function.Consumer;
+import java.util.function.LongConsumer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * This class provides an implementation used for accessing the DS2480B.
@@ -86,7 +85,7 @@ public enum State {
     public final static int DEFAULT_BUFFER_SIZE = 1024;
 
     /**
-     * Creates a new instance ans sets the SerialPortSocket to use.
+     * Creates a new instance and initialize the serial port with 9600,8,n,1.
      *
      * @param serialPortSocket the {@linkplain SerialPortSocket} to use.
      */
@@ -98,10 +97,11 @@ public DS2480BAdapter(SerialPortSocket serialPortSocket) throws IOException {
         try {
             serialPort.setSpeed(Speed._9600_BPS);
             serialPort.setDataBits(DataBits.DB_8);
-            serialPort.setStopBits(StopBits.SB_1);
             serialPort.setParity(Parity.NONE);
+            serialPort.setStopBits(StopBits.SB_1);
             serialPort.setFlowControl(FlowControl.getFC_NONE());
             serialPort.setTimeouts(100, 1000, 1000);
+
             encoder = new Encoder(ByteBuffer.allocateDirect(DEFAULT_BUFFER_SIZE));
             decoder = new Decoder(ByteBuffer.allocateDirect(DEFAULT_BUFFER_SIZE));
             init();

diff --git a/de.ibapl.onewire4j/src/main/java/module-info.java b/de.ibapl.onewire4j/src/main/java/module-info.java
@@ -23,14 +23,8 @@
 
     requires java.logging;
 
-    requires transitive org.osgi.annotation;
-    requires transitive org.osgi.service.component.annotations;
-
     requires transitive de.ibapl.spsw.api;
 
-    //TODO error but junit tests need this....
-    uses de.ibapl.spsw.api.SerialPortSocketFactory;
-
     exports de.ibapl.onewire4j;
     exports de.ibapl.onewire4j.container;
     exports de.ibapl.onewire4j.devices;

diff --git a/de.ibapl.onewire4j/src/test/java/module-info.java b/de.ibapl.onewire4j/src/test/java/module-info.java
@@ -26,8 +26,10 @@
     requires org.junit.jupiter.engine;
     requires com.fasterxml.jackson.databind;
     requires com.fasterxml.jackson.dataformat.yaml;
+
     uses de.ibapl.spsw.api.SerialPortSocketFactory;
 
+
     exports de.ibapl.onewire4j.test;
     exports de.ibapl.onewire4j.test.container;
     exports de.ibapl.onewire4j.test.network;

diff --git a/onewire4j-cli/pom.xml b/onewire4j-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>onewire4j-project</artifactId>
         <groupId>de.ibapl.onewire4j</groupId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.1.1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>de.ibapl.onewire4j</groupId>
             <artifactId>de.ibapl.onewire4j</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>de.ibapl.onewire4j</groupId>
     <artifactId>onewire4j-project</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.1.1-SNAPSHOT</version>
     <name>OneWire4J</name>
     <description>Pure Java lib to access the 1-Wire Network</description>
     <url>http://www.github.com/aploese/OneWire4J</url>
@@ -81,11 +81,6 @@
     <!-- Dependency Management and Dependencies to Inherit -->
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.annotation</artifactId>
-                <version>[6.0.0,7.0.0)</version>
-            </dependency>
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>
@@ -107,12 +102,12 @@
             <dependency>
                 <groupId>de.ibapl.spsw</groupId>
                 <artifactId>de.ibapl.spsw.api</artifactId>
-                <version>[3.1.0,4.0.0)</version>
+                <version>3.2.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>de.ibapl.spsw</groupId>
                 <artifactId>de.ibapl.spsw.jnhwprovider</artifactId>
-                <version>[3.1.0,4.0.0)</version>
+                <version>3.2.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -129,7 +124,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.2.2</version>
+                    <version>3.2.3</version>
                 </plugin>
                 <plugin>
                     <groupId>com.mycila</groupId>
@@ -191,7 +186,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.6.2</version>
+                    <version>3.6.3</version>
                     <executions>
                         <execution>
                             <id>attach-javadocs</id>