diff --git a/pom.xml b/pom.xml index 2ba3992ec..7df98f81d 100644 --- a/pom.xml +++ b/pom.xml @@ -230,6 +230,11 @@ + + org.apache.felix + maven-bundle-plugin + 2.5.3 + diff --git a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPDebugger.java b/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPDebugger.java index d9f425035..79b934ff1 100644 --- a/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPDebugger.java +++ b/teavm-chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPDebugger.java @@ -99,7 +99,10 @@ public class ChromeRDPDebugger implements JavaScriptDebugger, ChromeRDPExchangeC if (jsonMessage.has("id")) { Response response = mapper.reader(Response.class).readValue(jsonMessage); if (response.getError() != null) { - System.err.println("#" + jsonMessage.get("id") + ": " + response.getError().toString()); + if (logger.isWarnEnabled()) { + logger.warn("Error message #{} received from browser: {}", jsonMessage.get("id"), + response.getError().toString()); + } } responseHandlers.remove(response.getId()).received(response.getResult()); } else { @@ -338,7 +341,6 @@ public class ChromeRDPDebugger implements JavaScriptDebugger, ChromeRDPExchangeC logger.warn("Error setting breakpoint at {}, message id is {}", breakpoint.getLocation(), message.getId()); } - System.err.println(); breakpoint.chromeId = null; } for (JavaScriptDebuggerListener listener : getListeners()) { diff --git a/teavm-classlib/pom.xml b/teavm-classlib/pom.xml index b9fc345ec..e6ed96817 100644 --- a/teavm-classlib/pom.xml +++ b/teavm-classlib/pom.xml @@ -72,7 +72,6 @@ process-test-classes false - 1 en, en_US, en_GB, ru, ru_RU diff --git a/teavm-core/src/main/java/org/teavm/codegen/SourceWriter.java b/teavm-core/src/main/java/org/teavm/codegen/SourceWriter.java index aabebf1e5..5e2749cb4 100644 --- a/teavm-core/src/main/java/org/teavm/codegen/SourceWriter.java +++ b/teavm-core/src/main/java/org/teavm/codegen/SourceWriter.java @@ -83,7 +83,7 @@ public class SourceWriter implements Appendable, LocationProvider { if (csq.charAt(i) == '\n') { appendSingleLine(csq, last, i); newLine(); - last = i; + last = i + 1; } } appendSingleLine(csq, last, end); diff --git a/teavm-html4j/pom.xml b/teavm-html4j/pom.xml index b9ad71bd3..cbbf55eae 100644 --- a/teavm-html4j/pom.xml +++ b/teavm-html4j/pom.xml @@ -79,7 +79,6 @@ process-test-classes false - 1 ${project.build.directory}/javascript-test true true @@ -93,7 +92,6 @@ process-test-classes false - 1 true ${project.build.directory}/javascript-tck org.teavm.html4j.testing.KOTestAdapter