port to latest bco version, implement feature message registry.

openbase · Feb 13, 2024 · c24783c · c24783c
1 parent 9c5aae3
commit c24783c
Show file tree

Hide file tree

Showing 5 changed files with 427 additions and 337 deletions.
diff --git a/pom.xml b/pom.xml
@@ -65,15 +65,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <source>${java.source.version}</source>
-                    <target>${java.target.version}</target>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>appassembler-maven-plugin</artifactId>
@@ -197,6 +188,69 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.jetbrains.kotlin</groupId>
+                <artifactId>kotlin-maven-plugin</artifactId>
+                <version>${kotlin.version}</version>
+                <executions>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirs>
+                                <source>src/main/java</source>
+                                <source>target/generated-sources/annotations</source>
+                            </sourceDirs>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <jvmTarget>1.8</jvmTarget>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <executions>
+                    <execution>
+                        <id>default-compile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>default-testCompile</id>
+                        <phase>none</phase>
+                    </execution>
+                    <execution>
+                        <id>compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>testCompile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>testCompile</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <source>${java.source.version}</source>
+                    <target>${java.target.version}</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -277,9 +331,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.target.version>17</java.target.version>
         <java.source.version>17</java.source.version>
-        <dependency.jul.version>3.3-SNAPSHOT</dependency.jul.version>
+        <dependency.jul.version>3.6-SNAPSHOT</dependency.jul.version>
         <dependency.bco.registry.version>3.1-SNAPSHOT</dependency.bco.registry.version>
         <dependency.org.junit.jupiter.version>[5.10,5.11-alpha)</dependency.org.junit.jupiter.version>
+        <kotlin.version>1.9.22</kotlin.version>
     </properties>
 
     <dependencies>
@@ -335,6 +390,17 @@
             <artifactId>javafx-swing</artifactId>
             <version>21.0.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-jdk8</artifactId>
+            <version>${kotlin.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-test</artifactId>
+            <version>${kotlin.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <repositories>

diff --git a/src/main/java/org/openbase/bco/registry/editor/RegistryEditor.java b/src/main/java/org/openbase/bco/registry/editor/RegistryEditor.java
@@ -94,6 +94,7 @@ public void start(Stage primaryStage) {
             globalTabPane.getTabs().add(new RegistryRemoteTab<>(Registries.getClassRegistry(), getClassRegistryGrouping()));
             globalTabPane.getTabs().add(new RegistryRemoteTab<>(Registries.getTemplateRegistry()));
             globalTabPane.getTabs().add(new RegistryRemoteTab<>(Registries.getActivityRegistry()));
+            globalTabPane.getTabs().add(new RegistryRemoteTab<>(Registries.getMessageRegistry()));
 
             final StackPane stackPane = new StackPane();
             // make login panel appear in the top right with small margins at the top and right