1.1 --- a/boot-fx/pom.xml Mon Jan 13 09:29:36 2014 +0100
1.2 +++ b/boot-fx/pom.xml Tue Jan 21 09:00:01 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 13 09:29:36 2014 +0100
2.2 +++ b/boot/pom.xml Tue Jan 21 09:00:01 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 13 09:29:36 2014 +0100
3.2 +++ b/ko-archetype/pom.xml Tue Jan 21 09:00:01 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/pom.xml Mon Jan 13 09:29:36 2014 +0100
4.2 +++ b/ko-osgi-test/pom.xml Tue Jan 21 09:00:01 2014 +0100
4.3 @@ -20,15 +20,6 @@
4.4 <artifactId>maven-bundle-plugin</artifactId>
4.5 </plugin>
4.6 <plugin>
4.7 - <groupId>org.apache.maven.plugins</groupId>
4.8 - <artifactId>maven-compiler-plugin</artifactId>
4.9 - <version>2.3.2</version>
4.10 - <configuration>
4.11 - <source>1.7</source>
4.12 - <target>1.7</target>
4.13 - </configuration>
4.14 - </plugin>
4.15 - <plugin>
4.16 <artifactId>maven-failsafe-plugin</artifactId>
4.17 <version>2.16</version>
4.18 <configuration>
5.1 --- a/ko-osgi-test/src/test/java/org/netbeans/html/ko/osgi/test/KOFx.java Mon Jan 13 09:29:36 2014 +0100
5.2 +++ b/ko-osgi-test/src/test/java/org/netbeans/html/ko/osgi/test/KOFx.java Tue Jan 21 09:00:01 2014 +0100
5.3 @@ -43,8 +43,11 @@
5.4 package org.netbeans.html.ko.osgi.test;
5.5
5.6 import java.io.Closeable;
5.7 +import java.io.IOException;
5.8 import java.lang.reflect.InvocationTargetException;
5.9 import java.lang.reflect.Method;
5.10 +import java.util.logging.Level;
5.11 +import java.util.logging.Logger;
5.12 import javafx.application.Platform;
5.13 import org.apidesign.html.boot.spi.Fn;
5.14 import org.testng.ITest;
5.15 @@ -88,7 +91,9 @@
5.16 @Override
5.17 public synchronized void run() {
5.18 boolean notify = true;
5.19 - try (Closeable a = KnockoutEquinoxIT.activateInOSGi(p)) {
5.20 + Closeable a = null;
5.21 + try {
5.22 + a = KnockoutEquinoxIT.activateInOSGi(p);
5.23 if (inst == null) {
5.24 inst = m.getDeclaringClass().newInstance();
5.25 }
5.26 @@ -112,6 +117,11 @@
5.27 if (notify) {
5.28 notifyAll();
5.29 }
5.30 + try {
5.31 + if (a != null) a.close();
5.32 + } catch (IOException ex) {
5.33 + throw new IllegalStateException(ex);
5.34 + }
5.35 }
5.36 }
5.37
6.1 --- a/ko-osgi-test/src/test/java/org/netbeans/html/ko/osgi/test/KnockoutEquinoxIT.java Mon Jan 13 09:29:36 2014 +0100
6.2 +++ b/ko-osgi-test/src/test/java/org/netbeans/html/ko/osgi/test/KnockoutEquinoxIT.java Tue Jan 21 09:00:01 2014 +0100
6.3 @@ -90,7 +90,7 @@
6.4 dir = new File(target, "osgi");
6.5 dir.mkdirs();
6.6
6.7 - Map<String,String> config = new HashMap<>();
6.8 + Map<String,String> config = new HashMap<String, String>();
6.9 config.put(Constants.FRAMEWORK_STORAGE, dir.getPath());
6.10 config.put(Constants.FRAMEWORK_STORAGE_CLEAN, "true");
6.11 config.put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, "sun.misc,"
7.1 --- a/ko-ws-tyrus/pom.xml Mon Jan 13 09:29:36 2014 +0100
7.2 +++ b/ko-ws-tyrus/pom.xml Tue Jan 21 09:00:01 2014 +0100
7.3 @@ -15,15 +15,6 @@
7.4 <build>
7.5 <plugins>
7.6 <plugin>
7.7 - <groupId>org.apache.maven.plugins</groupId>
7.8 - <artifactId>maven-compiler-plugin</artifactId>
7.9 - <version>2.3.2</version>
7.10 - <configuration>
7.11 - <source>1.7</source>
7.12 - <target>1.7</target>
7.13 - </configuration>
7.14 - </plugin>
7.15 - <plugin>
7.16 <groupId>org.apache.felix</groupId>
7.17 <artifactId>maven-bundle-plugin</artifactId>
7.18 </plugin>
8.1 --- a/ko-ws-tyrus/src/main/java/org/netbeans/html/wstyrus/TyrusContext.java Mon Jan 13 09:29:36 2014 +0100
8.2 +++ b/ko-ws-tyrus/src/main/java/org/netbeans/html/wstyrus/TyrusContext.java Tue Jan 21 09:00:01 2014 +0100
8.3 @@ -59,7 +59,6 @@
8.4 import net.java.html.json.OnReceive;
8.5 import org.apidesign.html.context.spi.Contexts;
8.6 import org.apidesign.html.json.spi.JSONCall;
8.7 -import org.apidesign.html.json.spi.Technology;
8.8 import org.apidesign.html.json.spi.Transfer;
8.9 import org.apidesign.html.json.spi.WSTransfer;
8.10 import org.netbeans.html.wstyrus.TyrusContext.Comm;
8.11 @@ -149,7 +148,7 @@
8.12 try {
8.13 final WebSocketContainer c = ContainerProvider.getWebSocketContainer();
8.14 c.connectToServer(Comm.this, url);
8.15 - } catch (DeploymentException | IOException ex) {
8.16 + } catch (Exception ex) {
8.17 wasAnError(ex);
8.18 }
8.19 }
9.1 --- a/ko4j/pom.xml Mon Jan 13 09:29:36 2014 +0100
9.2 +++ b/ko4j/pom.xml Tue Jan 21 09:00:01 2014 +0100
9.3 @@ -29,15 +29,6 @@
9.4 <skip>false</skip>
9.5 </configuration>
9.6 </plugin>
9.7 - <plugin>
9.8 - <groupId>org.apache.maven.plugins</groupId>
9.9 - <artifactId>maven-compiler-plugin</artifactId>
9.10 - <version>2.3.2</version>
9.11 - <configuration>
9.12 - <source>1.7</source>
9.13 - <target>1.7</target>
9.14 - </configuration>
9.15 - </plugin>
9.16 </plugins>
9.17 </build>
9.18 <dependencies>
10.1 --- a/ko4j/src/test/java/org/netbeans/html/ko4j/KOFx.java Mon Jan 13 09:29:36 2014 +0100
10.2 +++ b/ko4j/src/test/java/org/netbeans/html/ko4j/KOFx.java Tue Jan 21 09:00:01 2014 +0100
10.3 @@ -43,8 +43,11 @@
10.4 package org.netbeans.html.ko4j;
10.5
10.6 import java.io.Closeable;
10.7 +import java.io.IOException;
10.8 import java.lang.reflect.InvocationTargetException;
10.9 import java.lang.reflect.Method;
10.10 +import java.util.logging.Level;
10.11 +import java.util.logging.Logger;
10.12 import javafx.application.Platform;
10.13 import org.apidesign.html.boot.spi.Fn;
10.14 import org.testng.ITest;
10.15 @@ -88,7 +91,8 @@
10.16 @Override
10.17 public synchronized void run() {
10.18 boolean notify = true;
10.19 - try (Closeable a = Fn.activate(p)) {
10.20 + Closeable a = Fn.activate(p);
10.21 + try {
10.22 if (inst == null) {
10.23 inst = m.getDeclaringClass().newInstance();
10.24 }
10.25 @@ -112,6 +116,11 @@
10.26 if (notify) {
10.27 notifyAll();
10.28 }
10.29 + try {
10.30 + a.close();
10.31 + } catch (IOException ex) {
10.32 + throw new IllegalStateException(ex);
10.33 + }
10.34 }
10.35 }
10.36
11.1 --- a/pom.xml Mon Jan 13 09:29:36 2014 +0100
11.2 +++ b/pom.xml Tue Jan 21 09:00:01 2014 +0100
11.3 @@ -127,15 +127,6 @@
11.4 </configuration>
11.5 </plugin>
11.6 <plugin>
11.7 - <groupId>org.apache.maven.plugins</groupId>
11.8 - <artifactId>maven-compiler-plugin</artifactId>
11.9 - <version>2.3.2</version>
11.10 - <configuration>
11.11 - <source>1.6</source>
11.12 - <target>1.6</target>
11.13 - </configuration>
11.14 - </plugin>
11.15 - <plugin>
11.16 <groupId>org.apache.felix</groupId>
11.17 <artifactId>maven-bundle-plugin</artifactId>
11.18 <version>2.4.0</version>