diff --git a/.github/workflows/linux_maven.yml b/.github/workflows/linux_maven.yml
index cde026825..6e0324652 100644
--- a/.github/workflows/linux_maven.yml
+++ b/.github/workflows/linux_maven.yml
@@ -16,10 +16,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
         cache: maven
     - name: Build with Maven
diff --git a/.github/workflows/release_maven.yml b/.github/workflows/release_maven.yml
index 8be273aa8..c77a0f178 100644
--- a/.github/workflows/release_maven.yml
+++ b/.github/workflows/release_maven.yml
@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
         cache: maven
     - name: Build and Deploy with Maven
diff --git a/.github/workflows/windows_maven.yml b/.github/workflows/windows_maven.yml
index 626bb6d3e..fab3e55b6 100644
--- a/.github/workflows/windows_maven.yml
+++ b/.github/workflows/windows_maven.yml
@@ -17,10 +17,10 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
         cache: maven
     - name: Build with Maven
diff --git a/README.md b/README.md
index 7d67ee9c1..afd317253 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ the same way as e.g. your co-workers do with their Eclipse IDE.
 
 Compatibility
 -------------
-Compatible with NetBeans 12.0+ and JDK 17+.
+Compatible with NetBeans 12.0+ and JDK 21+.
 
 Downloads
 ---------
diff --git a/pom.xml b/pom.xml
index 6cf65d883..32a56f97b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 
 	<groupId>de.funfried.netbeans.plugins</groupId>
 	<artifactId>externalcodeformatter</artifactId>
-	<version>1.15.5</version>
+	<version>1.15.6-SNAPSHOT</version>
 	<packaging>nbm</packaging>
 
 	<developers>
@@ -111,20 +111,21 @@
 	</distributionManagement>
 
 	<properties>
-		<java.version>17</java.version>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<java.version>21</java.version>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<keystore.file>${project.build.directory}/keystore</keystore.file>
-		<google-java-format.version>1.23.0</google-java-format.version>
-		<palantir-java-format.version>2.50.0</palantir-java-format.version>
+		<google-java-format.version>1.30.0</google-java-format.version>
+		<palantir-java-format.version>2.81.0</palantir-java-format.version>
 		<xml-formatter.version>0.4.0</xml-formatter.version>
-		<commons-lang.version>3.17.0</commons-lang.version>
+		<commons-lang.version>3.19.0</commons-lang.version>
 		<netbeans.version>RELEASE120</netbeans.version>
-		<jsoup.version>1.18.1</jsoup.version>
-		<pmd.version>7.3.0</pmd.version>
+		<jsoup.version>1.21.2</jsoup.version>
+		<pmd.version>7.17.0</pmd.version>
+		<scm.version>2.2.1</scm.version>
 		<argLine></argLine>
 	</properties>
 
@@ -133,7 +134,7 @@
 		<dependency>
 			<groupId>org.eclipse.platform</groupId>
 			<artifactId>org.eclipse.text</artifactId>
-			<version>3.14.100</version>
+			<version>3.14.400</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.eclipse.platform</groupId>
@@ -150,7 +151,7 @@
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
 			<artifactId>org.eclipse.jdt.core</artifactId>
-			<version>3.39.0</version>
+			<version>3.43.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.eclipse.platform</groupId>
@@ -167,7 +168,7 @@
 		<dependency>
 			<groupId>de.funfried.libraries</groupId>
 			<artifactId>jsdt-core</artifactId>
-			<version>1.0.10</version>
+			<version>1.0.11</version>
 			<exclusions>
 				<exclusion>
 					<groupId>com.google.guava</groupId>
@@ -198,7 +199,7 @@
 		<dependency>
 			<groupId>io.spring.javaformat</groupId>
 			<artifactId>spring-javaformat-formatter</artifactId>
-			<version>0.0.43</version>
+			<version>0.0.47</version>
 		</dependency>
 
 		<!-- Google Formatter -->
@@ -253,7 +254,7 @@
 		<dependency>
 			<groupId>com.diffplug.spotless</groupId>
 			<artifactId>spotless-lib</artifactId>
-			<version>2.44.0</version>
+			<version>4.0.0</version>
 		</dependency>
 
 		<!-- XML Formatter -->
@@ -273,13 +274,13 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
-			<version>2.17.2</version>
+			<version>2.20.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.17.2</version>
+			<version>2.20.0</version>
 		</dependency>
 
 		<!-- CSS Parser -->
@@ -299,7 +300,7 @@
 		<dependency>
 			<groupId>com.manticore-projects.jsqlformatter</groupId>
 			<artifactId>jsqlformatter</artifactId>
-			<version>1.0.0</version>
+			<version>5.3</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.apache.commons</groupId>
@@ -309,9 +310,23 @@
 					<groupId>org.graalvm.sdk</groupId>
 					<artifactId>graal-sdk</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.glassfish</groupId>
+					<artifactId>javax.json</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.github.jsqlparser</groupId>
+					<artifactId>jsqlparser</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>com.github.jsqlparser</groupId>
+			<artifactId>jsqlparser</artifactId>
+			<version>5.3</version>
+		</dependency>
+
 		<!-- Vertical Blank SQL Formatter -->
 		<dependency>
 			<groupId>com.github.vertical-blank</groupId>
@@ -474,32 +489,57 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-collections4</artifactId>
-			<version>4.4</version>
+			<version>4.5.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-text</artifactId>
-			<version>1.12.0</version>
+			<version>1.14.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.17.0</version>
+			<version>2.20.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>commons-validator</groupId>
 			<artifactId>commons-validator</artifactId>
-			<version>1.9.0</version>
+			<version>1.10.0</version>
+		</dependency>
+
+		<!-- Apache Maven -->
+		<dependency>
+			<groupId>org.apache.maven.scm</groupId>
+			<artifactId>maven-scm-api</artifactId>
+			<version>${scm.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.maven.scm</groupId>
+			<artifactId>maven-scm-provider-gitexe</artifactId>
+			<version>${scm.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.maven.scm</groupId>
+			<artifactId>maven-scm-provider-git-commons</artifactId>
+			<version>${scm.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.maven.scm</groupId>
+			<artifactId>maven-scm-provider-jgit</artifactId>
+			<version>${scm.version}</version>
 		</dependency>
 
 		<!-- Google -->
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>33.3.1-jre</version>
+			<version>33.5.0-jre</version>
 		</dependency>
 
 		<!-- Test -->
@@ -524,12 +564,12 @@
 				<plugin>
 					<groupId>org.apache.netbeans.utilities</groupId>
 					<artifactId>nbm-maven-plugin</artifactId>
-					<version>14.2</version>
+					<version>14.4</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.13.0</version>
+					<version>3.14.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -539,7 +579,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-install-plugin</artifactId>
-					<version>3.1.3</version>
+					<version>3.1.4</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -549,7 +589,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-clean-plugin</artifactId>
-					<version>3.4.0</version>
+					<version>3.5.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -559,7 +599,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-deploy-plugin</artifactId>
-					<version>3.1.3</version>
+					<version>3.1.4</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -594,17 +634,17 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-gpg-plugin</artifactId>
-					<version>3.2.6</version>
+					<version>3.2.8</version>
 				</plugin>
 				<plugin>
 					<groupId>net.revelc.code.formatter</groupId>
 					<artifactId>formatter-maven-plugin</artifactId>
-					<version>2.24.1</version>
+					<version>2.29.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>3.20.0</version>
+					<version>3.21.0</version>
 					<configuration>
 						<skipDeploy>true</skipDeploy>
 					</configuration>
@@ -612,12 +652,12 @@
 						<dependency>
 							<groupId>org.apache.maven.skins</groupId>
 							<artifactId>maven-fluido-skin</artifactId>
-							<version>2.0.0-M10</version>
+							<version>2.0.1</version>
 						</dependency>
 						<dependency>
 							<groupId>org.apache.maven.doxia</groupId>
 							<artifactId>doxia-module-xdoc</artifactId>
-							<version>2.0.0-M12</version>
+							<version>2.0.0</version>
 						</dependency>
 					</dependencies>
 				</plugin>
@@ -629,12 +669,12 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-project-info-reports-plugin</artifactId>
-					<version>3.7.0</version>
+					<version>3.9.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>3.10.0</version>
+					<version>3.12.0</version>
 					<configuration>
 						<quiet>true</quiet>
 						<doclint>all,-missing</doclint>
@@ -660,7 +700,7 @@
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>versions-maven-plugin</artifactId>
-					<version>2.17.1</version>
+					<version>2.19.1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
@@ -678,27 +718,27 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-changelog-plugin</artifactId>
-					<version>2.3</version>
+					<version>3.0.0-M1</version>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>license-maven-plugin</artifactId>
-					<version>2.4.0</version>
+					<version>2.7.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>3.5.0</version>
+					<version>3.5.4</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.8.0</version>
+					<version>3.9.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.jacoco</groupId>
 					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>0.8.12</version>
+					<version>0.8.14</version>
 					<configuration>
 						<includes>
 							<include>de/funfried/netbeans/plugins/external/formatter/**/*</include>
@@ -717,12 +757,12 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jxr-plugin</artifactId>
-					<version>3.5.0</version>
+					<version>3.6.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-pmd-plugin</artifactId>
-					<version>3.24.0</version>
+					<version>3.28.0</version>
 					<dependencies>
 						<dependency>
 							<groupId>net.sourceforge.pmd</groupId>
@@ -749,12 +789,12 @@
 				<plugin>
 					<groupId>com.github.spotbugs</groupId>
 					<artifactId>spotbugs-maven-plugin</artifactId>
-					<version>4.8.6.4</version>
+					<version>4.9.7.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.owasp</groupId>
 					<artifactId>dependency-check-maven</artifactId>
-					<version>10.0.4</version>
+					<version>12.1.6</version>
 					<configuration>
 						<nvdApiServerId>nvd-api-key</nvdApiServerId>
 						<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
@@ -818,6 +858,7 @@
 					<release>${java.version}</release>
 					<forceJavacCompilerUse>true</forceJavacCompilerUse>
 					<fork>true</fork>
+					<proc>full</proc>
 					<compilerArgs>
 						<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
 						<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
@@ -950,6 +991,17 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>license-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-changelog-plugin</artifactId>
+				<dependencies>
+					<dependency>
+						<groupId>org.apache.maven.scm</groupId>
+						<artifactId>maven-scm-provider-jgit</artifactId>
+						<version>${scm.version}</version>
+					</dependency>
+				</dependencies>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
@@ -965,6 +1017,7 @@
 								<ignoredUnusedDeclaredDependency>org.apache.commons:commons-text</ignoredUnusedDeclaredDependency>
 								<ignoredUnusedDeclaredDependency>org.osgi:org.osgi.service.prefs</ignoredUnusedDeclaredDependency>
 								<ignoredUnusedDeclaredDependency>org.functionaljava:functionaljava</ignoredUnusedDeclaredDependency>
+								<ignoredUnusedDeclaredDependency>com.github.jsqlparser:jsqlparser</ignoredUnusedDeclaredDependency>
 							</ignoredUnusedDeclaredDependencies>
 						</configuration>
 					</execution>
@@ -984,6 +1037,14 @@
 				</executions>
 			</plugin>
 		</plugins>
+
+		<extensions>
+			<extension>
+				<groupId>org.apache.maven.scm</groupId>
+				<artifactId>maven-scm-provider-jgit</artifactId>
+				<version>${scm.version}</version>
+			</extension>
+		</extensions>
 	</build>
 
 	<reporting>
@@ -1024,6 +1085,11 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-changelog-plugin</artifactId>
+				<configuration>
+					<providerImplementations>
+						<git>jgit</git>
+					</providerImplementations>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.jacoco</groupId>
diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/sql/jsqlformatter/JSQLFormatterJob.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/sql/jsqlformatter/JSQLFormatterJob.java
index 5daeeb2b0..84650b008 100644
--- a/src/main/java/de/funfried/netbeans/plugins/external/formatter/sql/jsqlformatter/JSQLFormatterJob.java
+++ b/src/main/java/de/funfried/netbeans/plugins/external/formatter/sql/jsqlformatter/JSQLFormatterJob.java
@@ -85,13 +85,16 @@ public void format() throws BadLocationException {
 	private String[] getOptions(Preferences pref) {
 		int i = 0;
 		String[] options = new String[FormattingOption.values().length];
-		options[i++] = toOption(pref, FormattingOption.OUTPUT_FORMAT, JSQLFormatter.getOutputFormat());
-		options[i++] = toOption(pref, FormattingOption.KEYWORD_SPELLING, JSQLFormatter.getKeywordSpelling());
+		options[i++] = toOption(pref, FormattingOption.BACKSLASH_QUOTING, JSQLFormatter.getBackSlashQuoting());
 		options[i++] = toOption(pref, FormattingOption.FUNCTION_SPELLING, JSQLFormatter.getFunctionSpelling());
-		options[i++] = toOption(pref, FormattingOption.OBJECT_SPELLING, JSQLFormatter.getObjectSpelling());
 		options[i++] = toOption(pref, FormattingOption.INDENT_WIDTH, JSQLFormatter.getIndentWidth());
+		options[i++] = toOption(pref, FormattingOption.KEYWORD_SPELLING, JSQLFormatter.getKeywordSpelling());
+		options[i++] = toOption(pref, FormattingOption.OBJECT_SPELLING, JSQLFormatter.getObjectSpelling());
+		options[i++] = toOption(pref, FormattingOption.OUTPUT_FORMAT, JSQLFormatter.getOutputFormat());
 		options[i++] = toOption(pref, FormattingOption.SEPARATION, JSQLFormatter.getSeparation());
+		options[i++] = toOption(pref, FormattingOption.SHOW_LINE_NUMBERS, JSQLFormatter.ShowLineNumbers.NO);
 		options[i++] = toOption(pref, FormattingOption.SQUARE_BRACKET_QUOTATION, JSQLFormatter.getSquaredBracketQuotation());
+		options[i++] = toOption(pref, FormattingOption.STATEMENT_TERMINATOR, JSQLFormatter.getStatementTerminator());
 
 		return options;
 	}
diff --git a/src/main/java/de/funfried/netbeans/plugins/external/formatter/ui/customizer/ExternalFormatterCustomizerTab.java b/src/main/java/de/funfried/netbeans/plugins/external/formatter/ui/customizer/ExternalFormatterCustomizerTab.java
index 7df7919cf..c31549af9 100644
--- a/src/main/java/de/funfried/netbeans/plugins/external/formatter/ui/customizer/ExternalFormatterCustomizerTab.java
+++ b/src/main/java/de/funfried/netbeans/plugins/external/formatter/ui/customizer/ExternalFormatterCustomizerTab.java
@@ -59,7 +59,8 @@ public class ExternalFormatterCustomizerTab implements ProjectCustomizer.Composi
 	 */
 	@Override
 	public Category createCategory(Lookup lkp) {
-		return ProjectCustomizer.Category.create("external-format", Bundle.LBL_Config(), ImageUtilities.loadImage(Icons.EXTERNAL_FORMATTER_ICON_PATH, false));
+		return ProjectCustomizer.Category.create("external-format", NbBundle.getMessage(ExternalFormatterCustomizerTab.class, "LBL_Config"),
+				ImageUtilities.loadImage(Icons.EXTERNAL_FORMATTER_ICON_PATH, false));
 	}
 
 	/**
@@ -105,7 +106,7 @@ private static class ValidationListener implements ChangeListener {
 		/**
 		 * Creates a new instance of the {@link ValidationListener}.
 		 *
-		 * @param category             the {@link Category} where to update the validation
+		 * @param category the {@link Category} where to update the validation
 		 * @param projectSpecificPanel the {@link ProjectSpecificSettingsPanel} where to check the validation
 		 */
 		private ValidationListener(Category category, ProjectSpecificSettingsPanel projectSpecificPanel) {
diff --git a/src/main/nbm/manifest.mf b/src/main/nbm/manifest.mf
index b93b248e7..4981982d1 100644
--- a/src/main/nbm/manifest.mf
+++ b/src/main/nbm/manifest.mf
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 OpenIDE-Module-Layer: de/funfried/netbeans/plugins/external/formatter/layer.xml
 OpenIDE-Module-Localizing-Bundle: de/funfried/netbeans/plugins/external/formatter/Bundle.properties
-OpenIDE-Module-Java-Dependencies: Java > 17
+OpenIDE-Module-Java-Dependencies: Java > 21
diff --git a/src/site/site.xml b/src/site/site.xml
index 393d41333..2c199362a 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -16,7 +16,7 @@
 	<skin>
 		<groupId>org.apache.maven.skins</groupId>
 		<artifactId>maven-fluido-skin</artifactId>
-		<version>1.11.1</version>
+		<version>2.0.1</version>
 	</skin>
 
 	<custom>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index a7b9c31aa..e8efa18df 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -93,7 +93,7 @@
 			</subsection>
 			<subsection name="Compatibility">
 				<p>
-					Compatible with NetBeans 12.0+ and JDK 17+.
+					Compatible with NetBeans 12.0+ and JDK 21+.
 				</p>
 			</subsection>
 		</section>
diff --git a/src/test/java/de/funfried/netbeans/plugins/external/formatter/html/jsoup/JsoupHtmlFormatterServiceTest.java b/src/test/java/de/funfried/netbeans/plugins/external/formatter/html/jsoup/JsoupHtmlFormatterServiceTest.java
index c28fd31a4..a5a6fc2bc 100644
--- a/src/test/java/de/funfried/netbeans/plugins/external/formatter/html/jsoup/JsoupHtmlFormatterServiceTest.java
+++ b/src/test/java/de/funfried/netbeans/plugins/external/formatter/html/jsoup/JsoupHtmlFormatterServiceTest.java
@@ -45,7 +45,8 @@ public void testFormat() throws Exception {
 				+ " </head>\n"
 				+ " <body width=\"100%\">\n"
 				+ "  <div>\n"
-				+ "   <p>some text</p><img src=\"../img.png\" alt=\"Some image\">\n"
+				+ "   <p>some text</p>\n"
+				+ "   <img src=\"../img.png\" alt=\"Some image\">\n"
 				+ "  </div>\n"
 				+ " </body>\n"
 				+ "</html>\n"
diff --git a/src/test/java/de/funfried/netbeans/plugins/external/formatter/html/jsoup/JsoupHtmlFormatterWrapperTest.java b/src/test/java/de/funfried/netbeans/plugins/external/formatter/html/jsoup/JsoupHtmlFormatterWrapperTest.java
index 886f6e794..5335236e9 100644
--- a/src/test/java/de/funfried/netbeans/plugins/external/formatter/html/jsoup/JsoupHtmlFormatterWrapperTest.java
+++ b/src/test/java/de/funfried/netbeans/plugins/external/formatter/html/jsoup/JsoupHtmlFormatterWrapperTest.java
@@ -38,7 +38,8 @@ public void testFormat() {
 				+ " </head>\n"
 				+ " <body width=\"100%\">\n"
 				+ "  <div>\n"
-				+ "   <p>some text</p><img src=\"../img.png\" alt=\"Some image\">\n"
+				+ "   <p>some text</p>\n"
+				+ "   <img src=\"../img.png\" alt=\"Some image\">\n"
 				+ "  </div>\n"
 				+ " </body>\n"
 				+ "</html>";
@@ -58,7 +59,8 @@ public void testFormatUsingLinefeed_CR() {
 				+ " </head>\r"
 				+ " <body width=\"100%\">\r"
 				+ "  <div>\r"
-				+ "   <p>some text</p><img src=\"../img.png\" alt=\"Some image\">\r"
+				+ "   <p>some text</p>\r"
+				+ "   <img src=\"../img.png\" alt=\"Some image\">\r"
 				+ "  </div>\r"
 				+ " </body>\r"
 				+ "</html>";
@@ -78,7 +80,8 @@ public void testFormatUsingLinefeed_LF() {
 				+ " </head>\n"
 				+ " <body width=\"100%\">\n"
 				+ "  <div>\n"
-				+ "   <p>some text</p><img src=\"../img.png\" alt=\"Some image\">\n"
+				+ "   <p>some text</p>\n"
+				+ "   <img src=\"../img.png\" alt=\"Some image\">\n"
 				+ "  </div>\n"
 				+ " </body>\n"
 				+ "</html>";
@@ -98,7 +101,8 @@ public void testFormatUsingLinefeed_CRLF() {
 				+ " </head>\r\n"
 				+ " <body width=\"100%\">\r\n"
 				+ "  <div>\r\n"
-				+ "   <p>some text</p><img src=\"../img.png\" alt=\"Some image\">\r\n"
+				+ "   <p>some text</p>\r\n"
+				+ "   <img src=\"../img.png\" alt=\"Some image\">\r\n"
 				+ "  </div>\r\n"
 				+ " </body>\r\n"
 				+ "</html>";
@@ -118,7 +122,8 @@ public void testNullFormatterConfig() {
 				+ " </head>\n"
 				+ " <body width=\"100%\">\n"
 				+ "  <div>\n"
-				+ "   <p>some text</p><img src=\"../img.png\" alt=\"Some image\">\n"
+				+ "   <p>some text</p>\n"
+				+ "   <img src=\"../img.png\" alt=\"Some image\">\n"
 				+ "  </div>\n"
 				+ " </body>\n"
 				+ "</html>";
diff --git a/src/test/java/de/funfried/netbeans/plugins/external/formatter/java/eclipse/EclipseJavaFormatterWrapperTest.java b/src/test/java/de/funfried/netbeans/plugins/external/formatter/java/eclipse/EclipseJavaFormatterWrapperTest.java
index 9beaebecf..6741fb561 100644
--- a/src/test/java/de/funfried/netbeans/plugins/external/formatter/java/eclipse/EclipseJavaFormatterWrapperTest.java
+++ b/src/test/java/de/funfried/netbeans/plugins/external/formatter/java/eclipse/EclipseJavaFormatterWrapperTest.java
@@ -247,7 +247,13 @@ public void testFormatUsingLinefeed_CRLF() {
 	@Test
 	public void testFormatSourceLevel_1dot3() {
 		final String text = "package foo;public enum NewEmptyJUnitTest { A, B, C}";
-		final String expected = null;
+		final String expected = "package foo;\n"
+				+ "\n"
+				+ "public enum NewEmptyJUnitTest {\n"
+				+ "			       A,\n"
+				+ "				   B,\n"
+				+ "				   C\n"
+				+ "}";
 
 		String actual = instance.format("src/test/resources/org.eclipse.jdt.core.prefs", null, text, Settings.getLineFeed("\\n", null), "1.3", null);
 		Assert.assertEquals("Invalid source code for 1.3 - enum is not a keyword", expected, actual);
@@ -256,7 +262,13 @@ public void testFormatSourceLevel_1dot3() {
 	@Test
 	public void testFormatSourceLevel_1dot4() {
 		final String text = "package foo;public enum NewEmptyJUnitTest { A, B, C}";
-		final String expected = null;
+		final String expected = "package foo;\n"
+				+ "\n"
+				+ "public enum NewEmptyJUnitTest {\n"
+				+ "			       A,\n"
+				+ "				   B,\n"
+				+ "				   C\n"
+				+ "}";
 
 		String actual = instance.format("src/test/resources/org.eclipse.jdt.core.prefs", null, text, Settings.getLineFeed("\\n", null), "1.4", null);
 		Assert.assertEquals("Invalid source code for 1.4 - enum is not a keyword", expected, actual);
diff --git a/src/test/java/de/funfried/netbeans/plugins/external/formatter/java/google/GoogleJavaFormatterWrapperTest.java b/src/test/java/de/funfried/netbeans/plugins/external/formatter/java/google/GoogleJavaFormatterWrapperTest.java
index 4c07258f1..518feb49b 100644
--- a/src/test/java/de/funfried/netbeans/plugins/external/formatter/java/google/GoogleJavaFormatterWrapperTest.java
+++ b/src/test/java/de/funfried/netbeans/plugins/external/formatter/java/google/GoogleJavaFormatterWrapperTest.java
@@ -9,6 +9,7 @@
  */
 package de.funfried.netbeans.plugins.external.formatter.java.google;
 
+import java.util.Locale;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
@@ -28,6 +29,8 @@ public class GoogleJavaFormatterWrapperTest {
 
 	@BeforeClass
 	public static void setUpClass() {
+		Locale.setDefault(Locale.ENGLISH);
+
 		instance = new GoogleJavaFormatterWrapper();
 	}
 
diff --git a/src/test/java/de/funfried/netbeans/plugins/external/formatter/java/palantir/PalantirJavaFormatterWrapperTest.java b/src/test/java/de/funfried/netbeans/plugins/external/formatter/java/palantir/PalantirJavaFormatterWrapperTest.java
index 340caa270..1b8f3d314 100644
--- a/src/test/java/de/funfried/netbeans/plugins/external/formatter/java/palantir/PalantirJavaFormatterWrapperTest.java
+++ b/src/test/java/de/funfried/netbeans/plugins/external/formatter/java/palantir/PalantirJavaFormatterWrapperTest.java
@@ -9,6 +9,7 @@
  */
 package de.funfried.netbeans.plugins.external.formatter.java.palantir;
 
+import java.util.Locale;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
@@ -26,6 +27,8 @@ public class PalantirJavaFormatterWrapperTest {
 
 	@BeforeClass
 	public static void setUpClass() {
+		Locale.setDefault(Locale.ENGLISH);
+
 		instance = new PalantirJavaFormatterWrapper();
 	}
 
diff --git a/src/test/java/de/funfried/netbeans/plugins/external/formatter/xml/jsoup/JsoupXmlFormatterServiceTest.java b/src/test/java/de/funfried/netbeans/plugins/external/formatter/xml/jsoup/JsoupXmlFormatterServiceTest.java
index 1b51fdd3c..bf1882a23 100644
--- a/src/test/java/de/funfried/netbeans/plugins/external/formatter/xml/jsoup/JsoupXmlFormatterServiceTest.java
+++ b/src/test/java/de/funfried/netbeans/plugins/external/formatter/xml/jsoup/JsoupXmlFormatterServiceTest.java
@@ -40,13 +40,9 @@ public void testFormat() throws Exception {
 		final String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 				+ "<root>\n"
 				+ " <foo bar=\"value\">\n"
-				+ "  <elem>\n"
-				+ "   val\n"
-				+ "  </elem>\n"
+				+ "  <elem>val</elem>\n"
 				+ " </foo>\n"
-				+ " <otherTag attrib=\"attribValue\" attrib2=\"attribValue2\">\n"
-				+ "  otherValue\n"
-				+ " </otherTag>\n"
+				+ " <otherTag attrib=\"attribValue\" attrib2=\"attribValue2\">otherValue</otherTag>\n"
 				+ "</root>\n"
 				+ "";
 
diff --git a/src/test/java/de/funfried/netbeans/plugins/external/formatter/xml/jsoup/JsoupXmlFormatterWrapperTest.java b/src/test/java/de/funfried/netbeans/plugins/external/formatter/xml/jsoup/JsoupXmlFormatterWrapperTest.java
index 1e7218514..c81b8aa9f 100644
--- a/src/test/java/de/funfried/netbeans/plugins/external/formatter/xml/jsoup/JsoupXmlFormatterWrapperTest.java
+++ b/src/test/java/de/funfried/netbeans/plugins/external/formatter/xml/jsoup/JsoupXmlFormatterWrapperTest.java
@@ -34,13 +34,9 @@ public void testFormat() {
 		final String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 				+ "<root>\n"
 				+ " <foo bar=\"value\">\n"
-				+ "  <elem>\n"
-				+ "   val\n"
-				+ "  </elem>\n"
+				+ "  <elem>val</elem>\n"
 				+ " </foo>\n"
-				+ " <otherTag attrib=\"attribValue\" attrib2=\"attribValue2\">\n"
-				+ "  otherValue\n"
-				+ " </otherTag>\n"
+				+ " <otherTag attrib=\"attribValue\" attrib2=\"attribValue2\">otherValue</otherTag>\n"
 				+ "</root>";
 
 		String actual = instance.format(text, null, new Document.OutputSettings());
@@ -54,13 +50,9 @@ public void testFormatUsingLinefeed_CR() {
 		final String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r"
 				+ "<root>\r"
 				+ " <foo bar=\"value\">\r"
-				+ "  <elem>\r"
-				+ "   val\r"
-				+ "  </elem>\r"
+				+ "  <elem>val</elem>\r"
 				+ " </foo>\r"
-				+ " <otherTag attrib=\"attribValue\" attrib2=\"attribValue2\">\r"
-				+ "  otherValue\r"
-				+ " </otherTag>\r"
+				+ " <otherTag attrib=\"attribValue\" attrib2=\"attribValue2\">otherValue</otherTag>\r"
 				+ "</root>";
 
 		String actual = instance.format(text, Settings.getLineFeed("\\r", null), new Document.OutputSettings());
@@ -74,13 +66,9 @@ public void testFormatUsingLinefeed_LF() {
 		final String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 				+ "<root>\n"
 				+ " <foo bar=\"value\">\n"
-				+ "  <elem>\n"
-				+ "   val\n"
-				+ "  </elem>\n"
+				+ "  <elem>val</elem>\n"
 				+ " </foo>\n"
-				+ " <otherTag attrib=\"attribValue\" attrib2=\"attribValue2\">\n"
-				+ "  otherValue\n"
-				+ " </otherTag>\n"
+				+ " <otherTag attrib=\"attribValue\" attrib2=\"attribValue2\">otherValue</otherTag>\n"
 				+ "</root>";
 
 		String actual = instance.format(text, Settings.getLineFeed("\\n", null), new Document.OutputSettings());
@@ -94,13 +82,9 @@ public void testFormatUsingLinefeed_CRLF() {
 		final String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"
 				+ "<root>\r\n"
 				+ " <foo bar=\"value\">\r\n"
-				+ "  <elem>\r\n"
-				+ "   val\r\n"
-				+ "  </elem>\r\n"
+				+ "  <elem>val</elem>\r\n"
 				+ " </foo>\r\n"
-				+ " <otherTag attrib=\"attribValue\" attrib2=\"attribValue2\">\r\n"
-				+ "  otherValue\r\n"
-				+ " </otherTag>\r\n"
+				+ " <otherTag attrib=\"attribValue\" attrib2=\"attribValue2\">otherValue</otherTag>\r\n"
 				+ "</root>";
 
 		String actual = instance.format(text, Settings.getLineFeed("\\r\\n", null), new Document.OutputSettings());
@@ -114,13 +98,9 @@ public void testNullFormatterConfig() {
 		final String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 				+ "<root>\n"
 				+ " <foo bar=\"value\">\n"
-				+ "  <elem>\n"
-				+ "   val\n"
-				+ "  </elem>\n"
+				+ "  <elem>val</elem>\n"
 				+ " </foo>\n"
-				+ " <otherTag attrib=\"attribValue\" attrib2=\"attribValue2\">\n"
-				+ "  otherValue\n"
-				+ " </otherTag>\n"
+				+ " <otherTag attrib=\"attribValue\" attrib2=\"attribValue2\">otherValue</otherTag>\n"
 				+ "</root>";
 
 		String actual = instance.format(text, null, null);