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

Release/1.14.x

Author: funfried

README.md

@@ -65,7 +65,7 @@ the same way as e.g. your co-workers do with their Eclipse IDE.
 *   Support for revelc.net XML formatter (since 1.14)
 *   Support for Jsoup XML formatter (since 1.14)
 *   Support for Jackson Json formatter (since 1.14)
-*   Support for manticore JSQLFormatter (Special thanks to [Andreas Reichel](https://github.com/manticore-projects) for the contribution) (since 1.14)
+*   Support for manticore JSQLFormatter (Special thanks to [Andreas Reichel](https://github.com/manticore-projects) for the contribution) (since 1.14.1)
 *   Support for remote configurations for Eclipse formatters (since 1.14.1)
 
 Compatibility

appveyor.yml

@@ -18,12 +18,12 @@ install:
   - ps: |
       Add-Type -AssemblyName System.IO.Compression.FileSystem
       if (!(Test-Path -Path "C:\maven" )) {
-        (new-object System.Net.WebClient).DownloadFile('https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip', 'C:\maven-bin.zip')
+        (new-object System.Net.WebClient).DownloadFile('https://downloads.apache.org/maven/maven-3/3.8.1/binaries/apache-maven-3.8.1-bin.zip', 'C:\maven-bin.zip')
         [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
       }
-  - cmd: SET PATH=C:\maven\apache-maven-3.6.3\bin;%JAVA_HOME%\bin;%PATH%
+  - cmd: SET PATH=C:\maven\apache-maven-3.8.1\bin;%JAVA_HOME%\bin;%PATH%
   - cmd: SET MAVEN_OPTS=-Xms128m -Xmx512m
   - cmd: mvn --version
   - cmd: java -version
 build_script:
-  - cp .ci.settings.xml C:\maven\apache-maven-3.6.3\conf\settings.xml && mvn --no-transfer-progress -Denv.github_username=%github_username% -Denv.github_token=%github_token% clean package site
+  - cp .ci.settings.xml C:\maven\apache-maven-3.8.1\conf\settings.xml && mvn --no-transfer-progress -Denv.github_username=%github_username% -Denv.github_token=%github_token% clean package site

pom.xml

@@ -689,7 +689,7 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
 					<argLine>
-						-Xmx1024m
+						${argLine} -Xmx1024m
 						--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
 						--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
 						--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED

src/main/resources/de/funfried/netbeans/plugins/external/formatter/Bundle.properties

@@ -20,7 +20,8 @@ OpenIDE-Module-Long-Description=\
 	<li>Support for revelc.net XML formatter (since 1.14)</li>\n\
 	<li>Support for Jsoup XML formatter (since 1.14)</li>\n\
 	<li>Support for Jackson Json formatter (since 1.14)</li>\n\
-	<li>Support for manticore JSQLFormatter (Special thanks to <a href="https://github.com/manticore-projects">Andreas Reichel</a> for the contribution) (since 1.14)</li>\n\
+	<li>Support for manticore JSQLFormatter (Special thanks to <a href="https://github.com/manticore-projects">Andreas Reichel</a> for the contribution) (since 1.14.1)</li>\n\
+    <li>Support for remote configurations for Eclipse formatters (since 1.14.1)</li>\n\
 	</ul>\n\n\
 	<p><img src="https://raw.githubusercontent.com/funfried/externalcodeformatter_for_netbeans/release/1.14.x/src/site/resources/imgs/global.png"></p>\n\n\
 	<p><img src="https://raw.githubusercontent.com/funfried/externalcodeformatter_for_netbeans/release/1.14.x/src/site/resources/imgs/project.png"></p>\n\n\

src/site/xdoc/index.xml

@@ -97,6 +97,8 @@
 				<li>Support for Eclipse Javascript formatter (since 1.14)</li>
 				<li>Support for revelc.net XML formatter (since 1.14)</li>
 				<li>Support for Jackson Json formatter (since 1.14)</li>
+				<li>Support for manticore JSQLFormatter (Special thanks to <a href="https://github.com/manticore-projects">Andreas Reichel</a> for the contribution) (since 1.14.1)</li>
+				<li>Support for remote configurations for Eclipse formatters (since 1.14.1)</li>
 			</ul>
 		</section>
 		<section name="History of this plugin">