1.1 --- a/boot-fx/pom.xml Mon Jan 20 11:02:01 2014 +0100
1.2 +++ b/boot-fx/pom.xml Tue Jan 21 08:54:02 2014 +0100
1.3 @@ -29,15 +29,6 @@
1.4 <forkMode>always</forkMode>
1.5 </configuration>
1.6 </plugin>
1.7 - <plugin>
1.8 - <groupId>org.apache.maven.plugins</groupId>
1.9 - <artifactId>maven-compiler-plugin</artifactId>
1.10 - <version>2.3.2</version>
1.11 - <configuration>
1.12 - <source>1.6</source>
1.13 - <target>1.6</target>
1.14 - </configuration>
1.15 - </plugin>
1.16 </plugins>
1.17 </build>
1.18 <dependencies>
2.1 --- a/boot/pom.xml Mon Jan 20 11:02:01 2014 +0100
2.2 +++ b/boot/pom.xml Tue Jan 21 08:54:02 2014 +0100
2.3 @@ -28,15 +28,6 @@
2.4 </instructions>
2.5 </configuration>
2.6 </plugin>
2.7 - <plugin>
2.8 - <groupId>org.apache.maven.plugins</groupId>
2.9 - <artifactId>maven-compiler-plugin</artifactId>
2.10 - <version>2.3.2</version>
2.11 - <configuration>
2.12 - <source>1.6</source>
2.13 - <target>1.6</target>
2.14 - </configuration>
2.15 - </plugin>
2.16 </plugins>
2.17 </build>
2.18 <dependencies>
3.1 --- a/ko-archetype/pom.xml Mon Jan 20 11:02:01 2014 +0100
3.2 +++ b/ko-archetype/pom.xml Tue Jan 21 08:54:02 2014 +0100
3.3 @@ -37,15 +37,6 @@
3.4 <plugins>
3.5 <plugin>
3.6 <groupId>org.apache.maven.plugins</groupId>
3.7 - <artifactId>maven-compiler-plugin</artifactId>
3.8 - <version>2.3.2</version>
3.9 - <configuration>
3.10 - <source>1.6</source>
3.11 - <target>1.6</target>
3.12 - </configuration>
3.13 - </plugin>
3.14 - <plugin>
3.15 - <groupId>org.apache.maven.plugins</groupId>
3.16 <artifactId>maven-resources-plugin</artifactId>
3.17 <version>2.6</version>
3.18 <configuration>
4.1 --- a/ko-osgi-test/src/test/java/org/netbeans/html/ko/osgi/test/KOFx.java Mon Jan 20 11:02:01 2014 +0100
4.2 +++ b/ko-osgi-test/src/test/java/org/netbeans/html/ko/osgi/test/KOFx.java Tue Jan 21 08:54:02 2014 +0100
4.3 @@ -43,8 +43,11 @@
4.4 package org.netbeans.html.ko.osgi.test;
4.5
4.6 import java.io.Closeable;
4.7 +import java.io.IOException;
4.8 import java.lang.reflect.InvocationTargetException;
4.9 import java.lang.reflect.Method;
4.10 +import java.util.logging.Level;
4.11 +import java.util.logging.Logger;
4.12 import javafx.application.Platform;
4.13 import org.apidesign.html.boot.spi.Fn;
4.14 import org.testng.ITest;
4.15 @@ -114,9 +117,9 @@
4.16 if (notify) {
4.17 notifyAll();
4.18 }
4.19 - if (a != null) try {
4.20 - a.close();
4.21 - } catch (java.io.IOException ex) {
4.22 + try {
4.23 + if (a != null) a.close();
4.24 + } catch (IOException ex) {
4.25 throw new IllegalStateException(ex);
4.26 }
4.27 }
5.1 --- a/ko-osgi-test/src/test/java/org/netbeans/html/ko/osgi/test/KnockoutEquinoxIT.java Mon Jan 20 11:02:01 2014 +0100
5.2 +++ b/ko-osgi-test/src/test/java/org/netbeans/html/ko/osgi/test/KnockoutEquinoxIT.java Tue Jan 21 08:54:02 2014 +0100
5.3 @@ -90,7 +90,7 @@
5.4 dir = new File(target, "osgi");
5.5 dir.mkdirs();
5.6
5.7 - Map<String,String> config = new HashMap<String,String>();
5.8 + Map<String,String> config = new HashMap<String, String>();
5.9 config.put(Constants.FRAMEWORK_STORAGE, dir.getPath());
5.10 config.put(Constants.FRAMEWORK_STORAGE_CLEAN, "true");
5.11 config.put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, "sun.misc,"
6.1 --- a/ko-ws-tyrus/src/main/java/org/netbeans/html/wstyrus/TyrusContext.java Mon Jan 20 11:02:01 2014 +0100
6.2 +++ b/ko-ws-tyrus/src/main/java/org/netbeans/html/wstyrus/TyrusContext.java Tue Jan 21 08:54:02 2014 +0100
6.3 @@ -59,7 +59,6 @@
6.4 import net.java.html.json.OnReceive;
6.5 import org.apidesign.html.context.spi.Contexts;
6.6 import org.apidesign.html.json.spi.JSONCall;
6.7 -import org.apidesign.html.json.spi.Technology;
6.8 import org.apidesign.html.json.spi.Transfer;
6.9 import org.apidesign.html.json.spi.WSTransfer;
6.10 import org.netbeans.html.wstyrus.TyrusContext.Comm;
7.1 --- a/ko4j/src/test/java/org/netbeans/html/ko4j/KOFx.java Mon Jan 20 11:02:01 2014 +0100
7.2 +++ b/ko4j/src/test/java/org/netbeans/html/ko4j/KOFx.java Tue Jan 21 08:54:02 2014 +0100
7.3 @@ -43,8 +43,11 @@
7.4 package org.netbeans.html.ko4j;
7.5
7.6 import java.io.Closeable;
7.7 +import java.io.IOException;
7.8 import java.lang.reflect.InvocationTargetException;
7.9 import java.lang.reflect.Method;
7.10 +import java.util.logging.Level;
7.11 +import java.util.logging.Logger;
7.12 import javafx.application.Platform;
7.13 import org.apidesign.html.boot.spi.Fn;
7.14 import org.testng.ITest;
7.15 @@ -115,7 +118,7 @@
7.16 }
7.17 try {
7.18 a.close();
7.19 - } catch (java.io.IOException ex) {
7.20 + } catch (IOException ex) {
7.21 throw new IllegalStateException(ex);
7.22 }
7.23 }
8.1 --- a/pom.xml Mon Jan 20 11:02:01 2014 +0100
8.2 +++ b/pom.xml Tue Jan 21 08:54:02 2014 +0100
8.3 @@ -128,15 +128,6 @@
8.4 </configuration>
8.5 </plugin>
8.6 <plugin>
8.7 - <groupId>org.apache.maven.plugins</groupId>
8.8 - <artifactId>maven-compiler-plugin</artifactId>
8.9 - <version>2.3.2</version>
8.10 - <configuration>
8.11 - <source>1.6</source>
8.12 - <target>1.6</target>
8.13 - </configuration>
8.14 - </plugin>
8.15 - <plugin>
8.16 <groupId>org.apache.felix</groupId>
8.17 <artifactId>maven-bundle-plugin</artifactId>
8.18 <version>2.4.0</version>