Compatibility with Java 9 and latest Maven. #38

eclipse-paho · Mar 13, 2018 · 3674493 · 3674493
1 parent defb1d5
commit 3674493
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 39 deletions.
diff --git a/mqtt-spy-common/pom.xml b/mqtt-spy-common/pom.xml
@@ -3,17 +3,21 @@
 
 	<groupId>org.eclipse.paho.mqttspy</groupId>
 	<artifactId>mqtt-spy-common</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.1</version>
 
 	<name>mqtt-spy-common</name>
 	<url>https://github.com/eclipse/paho.mqtt-spy</url>
 
   	<properties>
   		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>  		
    		<timestamp>${maven.build.timestamp}</timestamp>
+
    		<maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
    		<maven.compiler.source>1.8</maven.compiler.source>
     	<maven.compiler.target>1.8</maven.compiler.target>   		
+
+    	<jaxb2.plugin.version>0.12.1</jaxb2.plugin.version>
+		<jaxb2.basics.version>0.11.1</jaxb2.basics.version>
 	</properties>
 
   	<repositories>
@@ -51,7 +55,7 @@
 		<dependency>
 			<groupId>org.eclipse.paho.mqttspy</groupId>
 			<artifactId>spy-common</artifactId>
-			<version>1.0.0</version>
+			<version>1.0.1</version>
 		</dependency>		
 
 		<dependency>
@@ -69,19 +73,19 @@
 		<dependency>
 			<groupId>org.eclipse.kura</groupId>
 			<artifactId>org.eclipse.kura.core.cloud</artifactId>
-			<version>1.0.6</version>	
+			<version>1.0.9</version>	
 		</dependency> 
 
 		<dependency>
 			<groupId>org.eclipse.kura</groupId>
 			<artifactId>org.eclipse.kura.core</artifactId>
-			<version>1.0.6</version>	
+			<version>1.0.9</version>	
 		</dependency> 
 
 		<dependency>
 			<groupId>org.eclipse.kura</groupId>
 			<artifactId>org.eclipse.kura.api</artifactId>
-			<version>1.0.6</version>	
+			<version>1.0.9</version>	
 		</dependency> 
 
 		<dependency>
@@ -162,7 +166,7 @@
 	    <dependency>
 	      <groupId>org.jvnet.jaxb2.maven2</groupId>
 	      <artifactId>maven-jaxb2-plugin</artifactId>
-	      <version>0.9.0</version>
+	      <version>${jaxb2.plugin.version}</version>
 	      <exclusions>
 	        <exclusion>
 	          <groupId>javax.xml.bind</groupId>
@@ -180,15 +184,15 @@
 		<dependency>
 			<groupId>org.jvnet.jaxb2_commons</groupId>
 			<artifactId>jaxb2-basics-runtime</artifactId>
-			<version>0.9.4</version>
+			<version>${jaxb2.basics.version}</version>
 		</dependency>	
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 			<version>3.4</version>
-		</dependency>					
-
+		</dependency>		
+		
 		<!--=== TEST === -->
 
 		<dependency>
@@ -229,12 +233,12 @@
 	        <plugin>
 	            <groupId>org.jvnet.jaxb2_commons</groupId>
 	            <artifactId>jaxb2-basics</artifactId>
-	            <version>0.9.4</version>
+	            <version>${jaxb2.basics.version}</version>
 	        </plugin>       
 			<plugin>
 			    <groupId>org.jvnet.jaxb2.maven2</groupId>
 			    <artifactId>maven-jaxb2-plugin</artifactId>
-			    <version>0.12.0</version>
+			    <version>${jaxb2.plugin.version}</version>
 			    <executions>						     
 
 			        <execution>
@@ -284,7 +288,7 @@
 								<plugin>
 									<groupId>org.jvnet.jaxb2_commons</groupId>
 									<artifactId>jaxb2-basics</artifactId>
-									<version>0.9.4</version>
+									<version>${jaxb2.basics.version}</version>
 								</plugin>
 							</plugins>
 			            </configuration>			            			          

diff --git a/mqtt-spy-daemon/pom.xml b/mqtt-spy-daemon/pom.xml
@@ -21,14 +21,17 @@
    		<maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
    		<maven.compiler.source>1.8</maven.compiler.source>
     	<maven.compiler.target>1.8</maven.compiler.target>   		
+
+    	<jaxb2.plugin.version>0.12.1</jaxb2.plugin.version>
+		<jaxb2.basics.version>0.11.1</jaxb2.basics.version>
 	</properties>
 
   <dependencies>
 
   		<dependency>
 			<groupId>org.eclipse.paho.mqttspy</groupId>
 			<artifactId>spy-common</artifactId>
-			<version>1.0.0</version>
+			<version>1.0.1</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>maven-jaxb2-plugin</artifactId>
@@ -40,7 +43,7 @@
 		<dependency>
 			<groupId>org.eclipse.paho.mqttspy</groupId>
 			<artifactId>mqtt-spy-common</artifactId>
-			<version>1.0.0</version>			 
+			<version>1.0.1</version>			 
 			<exclusions>
 				<exclusion>
 					<artifactId>maven-jaxb2-plugin</artifactId>
@@ -177,12 +180,12 @@
 	        <plugin>
 	            <groupId>org.jvnet.jaxb2_commons</groupId>
 	            <artifactId>jaxb2-basics</artifactId>
-	            <version>0.9.4</version>
+	            <version>${jaxb2.basics.version}</version>
 	        </plugin>        	
 			<plugin>
 			    <groupId>org.jvnet.jaxb2.maven2</groupId>
 			    <artifactId>maven-jaxb2-plugin</artifactId>
-			    <version>0.12.0</version>
+			    <version>${jaxb2.plugin.version}</version>
 			    <executions>
 
 			        <execution>
@@ -236,14 +239,13 @@
 			                <args>			                
 						        <arg>-XtoString</arg>
 						        <arg>-Xequals</arg>
-						        <arg>-XhashCode</arg>						        
-                    			<!-- <arg>-Xcopyable</arg> -->					    
+						        <arg>-XhashCode</arg>						        				    
 			                </args>						 
 			                <plugins>
 								<plugin>
 									<groupId>org.jvnet.jaxb2_commons</groupId>
 									<artifactId>jaxb2-basics</artifactId>
-									<version>0.9.4</version>
+									<version>${jaxb2.basics.version}</version>
 								</plugin>
 							</plugins>
 			            </configuration>			            			          

diff --git a/mqtt-spy/pom.xml b/mqtt-spy/pom.xml
@@ -22,7 +22,10 @@
 		<timestamp>${maven.build.timestamp}</timestamp>
    		<maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
    		<maven.compiler.source>1.8</maven.compiler.source>
-    	<maven.compiler.target>1.8</maven.compiler.target>   		
+    	<maven.compiler.target>1.8</maven.compiler.target>   	
+
+    	<jaxb2.plugin.version>0.12.1</jaxb2.plugin.version>
+		<jaxb2.basics.version>0.11.1</jaxb2.basics.version>	
 	</properties>
 
 	<dependencies>
@@ -54,7 +57,7 @@
 		<dependency>
 			<groupId>org.eclipse.paho.mqttspy</groupId>
 			<artifactId>mqtt-spy-common</artifactId>
-			<version>1.0.0</version>			 
+			<version>1.0.1</version>			 
 			<exclusions>
 				<exclusion>
 					<artifactId>maven-jaxb2-plugin</artifactId>
@@ -198,12 +201,12 @@
 	        <plugin>
 	            <groupId>org.jvnet.jaxb2_commons</groupId>
 	            <artifactId>jaxb2-basics</artifactId>
-	            <version>0.9.4</version>
+	            <version>${jaxb2.basics.version}</version>
 	        </plugin>        	
 			<plugin>
 			    <groupId>org.jvnet.jaxb2.maven2</groupId>
 			    <artifactId>maven-jaxb2-plugin</artifactId>
-			    <version>0.12.0</version>
+			    <version>${jaxb2.plugin.version}</version>
 			    <executions>
 			        <execution>
 			            <id>configuration</id>
@@ -273,7 +276,7 @@
 								<plugin>
 									<groupId>org.jvnet.jaxb2_commons</groupId>
 									<artifactId>jaxb2-basics</artifactId>
-									<version>0.9.4</version>
+									<version>${jaxb2.basics.version}</version>
 								</plugin>
 							</plugins>
 			            </configuration>			            			          
@@ -318,7 +321,7 @@
 								<plugin>
 									<groupId>org.jvnet.jaxb2_commons</groupId>
 									<artifactId>jaxb2-basics</artifactId>
-									<version>0.9.4</version>
+									<version>${jaxb2.basics.version}</version>
 								</plugin>
 							</plugins>
 			            </configuration>			            			          

diff --git a/mqtt-spy/src/main/java/pl/baczkowicz/mqttspy/Main.java b/mqtt-spy/src/main/java/pl/baczkowicz/mqttspy/Main.java
@@ -118,6 +118,8 @@ else if (configurationFileLocation != null)
 
 	public static void main(String[] args)
 	{
+		System.setProperty("javax.xml.bind.JAXBContextFactory", "org.eclipse.persistence.jaxb.JAXBContextFactory");
+
 		launch(args);
 	}
 }
diff --git a/spy-common-ui/pom.xml b/spy-common-ui/pom.xml
@@ -20,6 +20,9 @@
 		<maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
+
+		<jaxb2.plugin.version>0.12.1</jaxb2.plugin.version>
+		<jaxb2.basics.version>0.11.1</jaxb2.basics.version>
 	</properties>
 
 	<repositories>
@@ -45,13 +48,13 @@
 		<dependency>
 			<groupId>org.fxmisc.richtext</groupId>
 			<artifactId>richtextfx</artifactId>
-			<version>0.6.10</version>
+			<version>0.8.2</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.gillius</groupId>
 			<artifactId>jfxutils</artifactId>
-			<version>0.4-SNAPSHOT</version>
+			<version>1.0</version>
 		</dependency>
 
 		<!--=== TEST === -->
@@ -73,12 +76,12 @@
 	        <plugin>
 	            <groupId>org.jvnet.jaxb2_commons</groupId>
 	            <artifactId>jaxb2-basics</artifactId>
-	            <version>0.9.4</version>
+	            <version>${jaxb2.basics.version}</version>
 	        </plugin>        	
 			<plugin>
 			    <groupId>org.jvnet.jaxb2.maven2</groupId>
 			    <artifactId>maven-jaxb2-plugin</artifactId>
-			    <version>0.12.0</version>
+			    <version>${jaxb2.plugin.version}</version>
 			    <executions>
 
 			        <execution>
@@ -106,7 +109,7 @@
 								<plugin>
 									<groupId>org.jvnet.jaxb2_commons</groupId>
 									<artifactId>jaxb2-basics</artifactId>
-									<version>0.9.4</version>
+									<version>${jaxb2.basics.version}</version>
 								</plugin>
 							</plugins>
 			            </configuration>			            			          

diff --git a/spy-common-ui/src/main/java/pl/baczkowicz/spy/ui/controllers/BaseMessageController.java b/spy-common-ui/src/main/java/pl/baczkowicz/spy/ui/controllers/BaseMessageController.java
@@ -98,8 +98,12 @@ public abstract class BaseMessageController<T extends FormattedMessage>
 
 	public void init()
 	{
+		// Styling won't work in Java 9 and version 0.8.2 of RichTextFX, so having to force it to false
+		styled = false;
+
 		if (styled)
 		{		
+			// NOT USET due to RichTextFX not being compatible with Java 9
 			styledDataField = new StyleClassedTextArea();
 
 			AnchorPane.setBottomAnchor(styledDataField, AnchorPane.getBottomAnchor(dataField) - 1);

diff --git a/spy-common-ui/src/main/java/pl/baczkowicz/spy/ui/controls/StyledTextAreaWrapper.java b/spy-common-ui/src/main/java/pl/baczkowicz/spy/ui/controls/StyledTextAreaWrapper.java
@@ -55,7 +55,8 @@ public ObservableValue<String> selectedTextProperty()
 	@Override
 	public void setTooltip(Tooltip tooltip)
 	{
-		dataField.setTooltip(tooltip);		
+		// NOT AVAILABLE in 0.8.2 of RichTextFX
+		// dataField.setTooltip(tooltip);		
 	}
 
 	@Override
@@ -73,7 +74,8 @@ public void appendText(String text)
 	@Override
 	public void positionCaret(int position)
 	{
-		dataField.positionCaret(position);		
+		// NOT AVAILABLE in 0.8.2 of RichTextFX
+		// dataField.positionCaret(position);		
 	}
 
 	@Override