Merge pull request #198 from funfried/release/1.14.x

Release/1.14.x

Author: funfried

README.md

@@ -106,6 +106,7 @@ The history of this project
 
 Support
 ---------
-Keep this project alive by supporting it: one-time [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=926F5XBCTK2LQ&source=url) or [![Patreon!](/src/site/resources/imgs/logos/become_a_patron_button.png)](https://www.patreon.com/funfried) or just [![Buy me a drink](https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20drink&emoji=%F0%9F%A5%83&slug=funfried&button_colour=5F7FFF&font_colour=ffffff&font_family=Cookie&outline_colour=000000&coffee_colour=FFDD00)](https://www.buymeacoffee.com/funfried)
+Keep this project alive by supporting it:
+one-time [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=926F5XBCTK2LQ&source=url) or [![Patreon!](/src/site/resources/imgs/logos/become_a_patron_button.png)](https://www.patreon.com/funfried) or just [![Buy me a drink](https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20drink&emoji=%F0%9F%A5%83&slug=funfried&button_colour=5F7FFF&font_colour=ffffff&font_family=Cookie&outline_colour=000000&coffee_colour=FFDD00)](https://www.buymeacoffee.com/funfried)
 
 If you can't or don't want to spend money you can also [![say thanks](https://img.shields.io/static/v1?label=say&message=thanks&color=green&style=for-the-badge&logo=handshake)](https://saythanks.io/to/funfried)

nb-configuration.xml

@@ -1,49 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
-    <!--
+	<!--
 	This file contains additional configuration written by modules in the NetBeans IDE.
 	The configuration is intended to be shared among all the users of project and
 	therefore it is assumed to be part of version control checkout.
 	Without this configuration present, some functionality in the IDE may be limited or fail altogether.
 	-->
-    <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
-        <!--
-		Properties that influence various parts of the IDE, especially code formatting and the like. 
+	<properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+		<!--
+		Properties that influence various parts of the IDE, especially code formatting and the like.
 		You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
 		That way multiple projects can share the same settings (useful for formatting rules for example).
 		Any value defined here will override the pom.xml file value but is only applicable to the current project.
 		-->
-        <netbeans.hint.licensePath>${project.basedir}/licenseheader.txt</netbeans.hint.licensePath>
-        <de-funfried-netbeans-plugins-externalcodeformatter.overrideTabSizeValue>4</de-funfried-netbeans-plugins-externalcodeformatter.overrideTabSizeValue>
-        <de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_JSON>jackson-json-formatter</de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_JSON>
-        <de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_XML>revelc-xml-formatter</de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_XML>
-        <de-funfried-netbeans-plugins-externalcodeformatter.eclipseFormatterActiveProfile>EclipseCodeFormatterForNetBeans</de-funfried-netbeans-plugins-externalcodeformatter.eclipseFormatterActiveProfile>
-        <de-funfried-netbeans-plugins-externalcodeformatter.useProjectPref>true</de-funfried-netbeans-plugins-externalcodeformatter.useProjectPref>
-        <de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_JAVA>eclipse-java-formatter</de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_JAVA>
-        <de-funfried-netbeans-plugins-externalcodeformatter.eclipseFormatterLocation>eclipse_formatter_template.xml</de-funfried-netbeans-plugins-externalcodeformatter.eclipseFormatterLocation>
-        <de-funfried-netbeans-plugins-externalcodeformatter.showNotifications>false</de-funfried-netbeans-plugins-externalcodeformatter.showNotifications>
-        <de-funfried-netbeans-plugins-externalcodeformatter.sourcelevel/>
-        <de-funfried-netbeans-plugins-externalcodeformatter.useProjectSettings>true</de-funfried-netbeans-plugins-externalcodeformatter.useProjectSettings>
-        <de-funfried-netbeans-plugins-externalcodeformatter.enableIndentationSettings>true</de-funfried-netbeans-plugins-externalcodeformatter.enableIndentationSettings>
-        <de-funfried-netbeans-plugins-externalcodeformatter.linefeed/>
-        <de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_JAVASCRIPT>netbeans-formatter</de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_JAVASCRIPT>
-        <de-funfried-netbeans-plugins-externalcodeformatter.overrideTabSize>true</de-funfried-netbeans-plugins-externalcodeformatter.overrideTabSize>
-        <de-funfried-netbeans-plugins-externalcodeformatter.jsoupXmlLinefeed/>
-        <de-funfried-netbeans-plugins-externalcodeformatter.jsoupXmlIndentSize>2</de-funfried-netbeans-plugins-externalcodeformatter.jsoupXmlIndentSize>
-        <de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_SQL>netbeans-formatter</de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_SQL>
-        <de-funfried-netbeans-plugins-externalcodeformatter.jsoupXmlPrettyPrint>true</de-funfried-netbeans-plugins-externalcodeformatter.jsoupXmlPrettyPrint>
-        <de-funfried-netbeans-plugins-externalcodeformatter.jsoupXmlOutline>false</de-funfried-netbeans-plugins-externalcodeformatter.jsoupXmlOutline>
-        <de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlSplitMultiAttrs>false</de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlSplitMultiAttrs>
-        <de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlWellFormedValidation>WARN</de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlWellFormedValidation>
-        <de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonIndentSize>4</de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonIndentSize>
-        <de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlTabWidth>4</de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlTabWidth>
-        <de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlMaxLineLength>120</de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlMaxLineLength>
-        <de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlTabInsteadOfSpaces>true</de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlTabInsteadOfSpaces>
-        <de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonSpaceBeforeSeparator>false</de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonSpaceBeforeSeparator>
-        <de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonSpacesPerTab>4</de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonSpacesPerTab>
-        <de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonLinefeed/>
-        <de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlLinefeed/>
-        <de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonExpandTabsToSpaces>false</de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonExpandTabsToSpaces>
-        <de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlWrapLongLines>false</de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlWrapLongLines>
-    </properties>
+		<netbeans.hint.licensePath>${project.basedir}/licenseheader.txt</netbeans.hint.licensePath>
+		<de-funfried-netbeans-plugins-externalcodeformatter.overrideTabSizeValue>4</de-funfried-netbeans-plugins-externalcodeformatter.overrideTabSizeValue>
+		<de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_JSON>jackson-json-formatter</de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_JSON>
+		<de-funfried-netbeans-plugins-externalcodeformatter.eclipseFormatterActiveProfile>EclipseCodeFormatterForNetBeans</de-funfried-netbeans-plugins-externalcodeformatter.eclipseFormatterActiveProfile>
+		<de-funfried-netbeans-plugins-externalcodeformatter.useProjectPref>true</de-funfried-netbeans-plugins-externalcodeformatter.useProjectPref>
+		<de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_JAVA>eclipse-java-formatter</de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_JAVA>
+		<de-funfried-netbeans-plugins-externalcodeformatter.eclipseFormatterLocation>eclipse_formatter_template.xml</de-funfried-netbeans-plugins-externalcodeformatter.eclipseFormatterLocation>
+		<de-funfried-netbeans-plugins-externalcodeformatter.showNotifications>false</de-funfried-netbeans-plugins-externalcodeformatter.showNotifications>
+		<de-funfried-netbeans-plugins-externalcodeformatter.sourcelevel/>
+		<de-funfried-netbeans-plugins-externalcodeformatter.useProjectSettings>true</de-funfried-netbeans-plugins-externalcodeformatter.useProjectSettings>
+		<de-funfried-netbeans-plugins-externalcodeformatter.enableIndentationSettings>true</de-funfried-netbeans-plugins-externalcodeformatter.enableIndentationSettings>
+		<de-funfried-netbeans-plugins-externalcodeformatter.linefeed/>
+		<de-funfried-netbeans-plugins-externalcodeformatter.overrideTabSize>true</de-funfried-netbeans-plugins-externalcodeformatter.overrideTabSize>
+		<de-funfried-netbeans-plugins-externalcodeformatter.jsoupXmlLinefeed/>
+		<de-funfried-netbeans-plugins-externalcodeformatter.jsoupXmlIndentSize>2</de-funfried-netbeans-plugins-externalcodeformatter.jsoupXmlIndentSize>
+		<de-funfried-netbeans-plugins-externalcodeformatter.jsoupXmlPrettyPrint>true</de-funfried-netbeans-plugins-externalcodeformatter.jsoupXmlPrettyPrint>
+		<de-funfried-netbeans-plugins-externalcodeformatter.jsoupXmlOutline>false</de-funfried-netbeans-plugins-externalcodeformatter.jsoupXmlOutline>
+		<de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlSplitMultiAttrs>false</de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlSplitMultiAttrs>
+		<de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlWellFormedValidation>WARN</de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlWellFormedValidation>
+		<de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonIndentSize>4</de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonIndentSize>
+		<de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlTabWidth>4</de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlTabWidth>
+		<de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlMaxLineLength>120</de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlMaxLineLength>
+		<de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlTabInsteadOfSpaces>true</de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlTabInsteadOfSpaces>
+		<de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonSpaceBeforeSeparator>false</de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonSpaceBeforeSeparator>
+		<de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonSpacesPerTab>4</de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonSpacesPerTab>
+		<de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonLinefeed/>
+		<de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlLinefeed/>
+		<de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonExpandTabsToSpaces>false</de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonExpandTabsToSpaces>
+		<de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlWrapLongLines>false</de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlWrapLongLines>
+	</properties>
 </project-shared-configuration>

src/changes/changes.xml

@@ -1,6 +1,5 @@
-<document xmlns="http://maven.apache.org/changes/1.0.0"
-		  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		  xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/xsd/changes-1.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<document xmlns="https://maven.apache.org/changes/1.0.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/changes/1.0.0 https://maven.apache.org/xsd/changes-1.0.0.xsd">
 
 	<properties>
 		<title>Changes External Code Formatters</title>
@@ -12,6 +11,12 @@
 			<action dev="bahlef" type="fix">
 				Fixed editor issues when using revelc.net XML formatter
 			</action>
+			<action dev="bahlef" type="fix">
+				Fixed editor behavior when using JSoup XML formatter
+			</action>
+			<action dev="bahlef" type="fix">
+				Fixed usage of JSON formatters
+			</action>
 		</release>
 
 		<release version="1.14.4" date="2022-02-07" description="Bug fix release">