Skip to content

Commit dd87415

Browse files
funfriedfunfried
committed
Updated to latest versions and adapted tests to those versions
1 parent e3d214a commit dd87415

File tree

11 files changed

+122
-90
lines changed

11 files changed

+122
-90
lines changed

‎pom.xml‎

Lines changed: 68 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<groupId>de.funfried.netbeans.plugins</groupId>
1919
<artifactId>externalcodeformatter</artifactId>
20-
<version>1.15.5</version>
20+
<version>1.15.6-SNAPSHOT</version>
2121
<packaging>nbm</packaging>
2222

2323
<developers>
@@ -118,13 +118,13 @@
118118
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
119119
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
120120
<keystore.file>${project.build.directory}/keystore</keystore.file>
121-
<google-java-format.version>1.23.0</google-java-format.version>
122-
<palantir-java-format.version>2.50.0</palantir-java-format.version>
121+
<google-java-format.version>1.30.0</google-java-format.version>
122+
<palantir-java-format.version>2.81.0</palantir-java-format.version>
123123
<xml-formatter.version>0.4.0</xml-formatter.version>
124-
<commons-lang.version>3.17.0</commons-lang.version>
124+
<commons-lang.version>3.19.0</commons-lang.version>
125125
<netbeans.version>RELEASE120</netbeans.version>
126-
<jsoup.version>1.18.1</jsoup.version>
127-
<pmd.version>7.3.0</pmd.version>
126+
<jsoup.version>1.21.2</jsoup.version>
127+
<pmd.version>7.17.0</pmd.version>
128128
<argLine></argLine>
129129
</properties>
130130

@@ -133,7 +133,7 @@
133133
<dependency>
134134
<groupId>org.eclipse.platform</groupId>
135135
<artifactId>org.eclipse.text</artifactId>
136-
<version>3.14.100</version>
136+
<version>3.14.400</version>
137137
<exclusions>
138138
<exclusion>
139139
<groupId>org.eclipse.platform</groupId>
@@ -150,7 +150,7 @@
150150
<dependency>
151151
<groupId>org.eclipse.jdt</groupId>
152152
<artifactId>org.eclipse.jdt.core</artifactId>
153-
<version>3.39.0</version>
153+
<version>3.43.0</version>
154154
<exclusions>
155155
<exclusion>
156156
<groupId>org.eclipse.platform</groupId>
@@ -167,7 +167,7 @@
167167
<dependency>
168168
<groupId>de.funfried.libraries</groupId>
169169
<artifactId>jsdt-core</artifactId>
170-
<version>1.0.10</version>
170+
<version>1.0.11</version>
171171
<exclusions>
172172
<exclusion>
173173
<groupId>com.google.guava</groupId>
@@ -198,7 +198,7 @@
198198
<dependency>
199199
<groupId>io.spring.javaformat</groupId>
200200
<artifactId>spring-javaformat-formatter</artifactId>
201-
<version>0.0.43</version>
201+
<version>0.0.47</version>
202202
</dependency>
203203

204204
<!-- Google Formatter -->
@@ -253,7 +253,7 @@
253253
<dependency>
254254
<groupId>com.diffplug.spotless</groupId>
255255
<artifactId>spotless-lib</artifactId>
256-
<version>2.44.0</version>
256+
<version>4.0.0</version>
257257
</dependency>
258258

259259
<!-- XML Formatter -->
@@ -273,13 +273,13 @@
273273
<dependency>
274274
<groupId>com.fasterxml.jackson.core</groupId>
275275
<artifactId>jackson-core</artifactId>
276-
<version>2.17.2</version>
276+
<version>2.20.0</version>
277277
</dependency>
278278

279279
<dependency>
280280
<groupId>com.fasterxml.jackson.core</groupId>
281281
<artifactId>jackson-databind</artifactId>
282-
<version>2.17.2</version>
282+
<version>2.20.0</version>
283283
</dependency>
284284

285285
<!-- CSS Parser -->
@@ -299,7 +299,7 @@
299299
<dependency>
300300
<groupId>com.manticore-projects.jsqlformatter</groupId>
301301
<artifactId>jsqlformatter</artifactId>
302-
<version>1.0.0</version>
302+
<version>5.3</version>
303303
<exclusions>
304304
<exclusion>
305305
<groupId>org.apache.commons</groupId>
@@ -309,9 +309,23 @@
309309
<groupId>org.graalvm.sdk</groupId>
310310
<artifactId>graal-sdk</artifactId>
311311
</exclusion>
312+
<exclusion>
313+
<groupId>org.glassfish</groupId>
314+
<artifactId>javax.json</artifactId>
315+
</exclusion>
316+
<exclusion>
317+
<groupId>com.github.jsqlparser</groupId>
318+
<artifactId>jsqlparser</artifactId>
319+
</exclusion>
312320
</exclusions>
313321
</dependency>
314322

323+
<dependency>
324+
<groupId>com.github.jsqlparser</groupId>
325+
<artifactId>jsqlparser</artifactId>
326+
<version>5.3</version>
327+
</dependency>
328+
315329
<!-- Vertical Blank SQL Formatter -->
316330
<dependency>
317331
<groupId>com.github.vertical-blank</groupId>
@@ -474,32 +488,32 @@
474488
<dependency>
475489
<groupId>org.apache.commons</groupId>
476490
<artifactId>commons-collections4</artifactId>
477-
<version>4.4</version>
491+
<version>4.5.0</version>
478492
</dependency>
479493

480494
<dependency>
481495
<groupId>org.apache.commons</groupId>
482496
<artifactId>commons-text</artifactId>
483-
<version>1.12.0</version>
497+
<version>1.14.0</version>
484498
</dependency>
485499

486500
<dependency>
487501
<groupId>commons-io</groupId>
488502
<artifactId>commons-io</artifactId>
489-
<version>2.17.0</version>
503+
<version>2.20.0</version>
490504
</dependency>
491505

492506
<dependency>
493507
<groupId>commons-validator</groupId>
494508
<artifactId>commons-validator</artifactId>
495-
<version>1.9.0</version>
509+
<version>1.10.0</version>
496510
</dependency>
497511

498512
<!-- Google -->
499513
<dependency>
500514
<groupId>com.google.guava</groupId>
501515
<artifactId>guava</artifactId>
502-
<version>33.3.1-jre</version>
516+
<version>33.5.0-jre</version>
503517
</dependency>
504518

505519
<!-- Test -->
@@ -524,12 +538,12 @@
524538
<plugin>
525539
<groupId>org.apache.netbeans.utilities</groupId>
526540
<artifactId>nbm-maven-plugin</artifactId>
527-
<version>14.2</version>
541+
<version>14.4</version>
528542
</plugin>
529543
<plugin>
530544
<groupId>org.apache.maven.plugins</groupId>
531545
<artifactId>maven-compiler-plugin</artifactId>
532-
<version>3.13.0</version>
546+
<version>3.14.1</version>
533547
</plugin>
534548
<plugin>
535549
<groupId>org.apache.maven.plugins</groupId>
@@ -539,7 +553,7 @@
539553
<plugin>
540554
<groupId>org.apache.maven.plugins</groupId>
541555
<artifactId>maven-install-plugin</artifactId>
542-
<version>3.1.3</version>
556+
<version>3.1.4</version>
543557
</plugin>
544558
<plugin>
545559
<groupId>org.apache.maven.plugins</groupId>
@@ -549,7 +563,7 @@
549563
<plugin>
550564
<groupId>org.apache.maven.plugins</groupId>
551565
<artifactId>maven-clean-plugin</artifactId>
552-
<version>3.4.0</version>
566+
<version>3.5.0</version>
553567
</plugin>
554568
<plugin>
555569
<groupId>org.apache.maven.plugins</groupId>
@@ -559,7 +573,7 @@
559573
<plugin>
560574
<groupId>org.apache.maven.plugins</groupId>
561575
<artifactId>maven-deploy-plugin</artifactId>
562-
<version>3.1.3</version>
576+
<version>3.1.4</version>
563577
</plugin>
564578
<plugin>
565579
<groupId>org.apache.maven.plugins</groupId>
@@ -594,30 +608,30 @@
594608
<plugin>
595609
<groupId>org.apache.maven.plugins</groupId>
596610
<artifactId>maven-gpg-plugin</artifactId>
597-
<version>3.2.6</version>
611+
<version>3.2.8</version>
598612
</plugin>
599613
<plugin>
600614
<groupId>net.revelc.code.formatter</groupId>
601615
<artifactId>formatter-maven-plugin</artifactId>
602-
<version>2.24.1</version>
616+
<version>2.29.0</version>
603617
</plugin>
604618
<plugin>
605619
<groupId>org.apache.maven.plugins</groupId>
606620
<artifactId>maven-site-plugin</artifactId>
607-
<version>3.20.0</version>
621+
<version>3.21.0</version>
608622
<configuration>
609623
<skipDeploy>true</skipDeploy>
610624
</configuration>
611625
<dependencies>
612626
<dependency>
613627
<groupId>org.apache.maven.skins</groupId>
614628
<artifactId>maven-fluido-skin</artifactId>
615-
<version>2.0.0-M10</version>
629+
<version>2.0.1</version>
616630
</dependency>
617631
<dependency>
618632
<groupId>org.apache.maven.doxia</groupId>
619633
<artifactId>doxia-module-xdoc</artifactId>
620-
<version>2.0.0-M12</version>
634+
<version>2.0.0</version>
621635
</dependency>
622636
</dependencies>
623637
</plugin>
@@ -629,12 +643,12 @@
629643
<plugin>
630644
<groupId>org.apache.maven.plugins</groupId>
631645
<artifactId>maven-project-info-reports-plugin</artifactId>
632-
<version>3.7.0</version>
646+
<version>3.9.0</version>
633647
</plugin>
634648
<plugin>
635649
<groupId>org.apache.maven.plugins</groupId>
636650
<artifactId>maven-javadoc-plugin</artifactId>
637-
<version>3.10.0</version>
651+
<version>3.12.0</version>
638652
<configuration>
639653
<quiet>true</quiet>
640654
<doclint>all,-missing</doclint>
@@ -660,7 +674,7 @@
660674
<plugin>
661675
<groupId>org.codehaus.mojo</groupId>
662676
<artifactId>versions-maven-plugin</artifactId>
663-
<version>2.17.1</version>
677+
<version>2.19.1</version>
664678
</plugin>
665679
<plugin>
666680
<groupId>org.codehaus.mojo</groupId>
@@ -679,26 +693,38 @@
679693
<groupId>org.apache.maven.plugins</groupId>
680694
<artifactId>maven-changelog-plugin</artifactId>
681695
<version>2.3</version>
696+
<configuration>
697+
<providerImplementations>
698+
<git>jgit</git>
699+
</providerImplementations>
700+
</configuration>
701+
<dependencies>
702+
<dependency>
703+
<groupId>org.apache.maven.scm</groupId>
704+
<artifactId>maven-scm-provider-jgit</artifactId>
705+
<version>2.2.1</version>
706+
</dependency>
707+
</dependencies>
682708
</plugin>
683709
<plugin>
684710
<groupId>org.codehaus.mojo</groupId>
685711
<artifactId>license-maven-plugin</artifactId>
686-
<version>2.4.0</version>
712+
<version>2.7.0</version>
687713
</plugin>
688714
<plugin>
689715
<groupId>org.apache.maven.plugins</groupId>
690716
<artifactId>maven-surefire-plugin</artifactId>
691-
<version>3.5.0</version>
717+
<version>3.5.4</version>
692718
</plugin>
693719
<plugin>
694720
<groupId>org.apache.maven.plugins</groupId>
695721
<artifactId>maven-dependency-plugin</artifactId>
696-
<version>3.8.0</version>
722+
<version>3.9.0</version>
697723
</plugin>
698724
<plugin>
699725
<groupId>org.jacoco</groupId>
700726
<artifactId>jacoco-maven-plugin</artifactId>
701-
<version>0.8.12</version>
727+
<version>0.8.14</version>
702728
<configuration>
703729
<includes>
704730
<include>de/funfried/netbeans/plugins/external/formatter/**/*</include>
@@ -717,12 +743,12 @@
717743
<plugin>
718744
<groupId>org.apache.maven.plugins</groupId>
719745
<artifactId>maven-jxr-plugin</artifactId>
720-
<version>3.5.0</version>
746+
<version>3.6.0</version>
721747
</plugin>
722748
<plugin>
723749
<groupId>org.apache.maven.plugins</groupId>
724750
<artifactId>maven-pmd-plugin</artifactId>
725-
<version>3.24.0</version>
751+
<version>3.28.0</version>
726752
<dependencies>
727753
<dependency>
728754
<groupId>net.sourceforge.pmd</groupId>
@@ -749,12 +775,12 @@
749775
<plugin>
750776
<groupId>com.github.spotbugs</groupId>
751777
<artifactId>spotbugs-maven-plugin</artifactId>
752-
<version>4.8.6.4</version>
778+
<version>4.9.7.0</version>
753779
</plugin>
754780
<plugin>
755781
<groupId>org.owasp</groupId>
756782
<artifactId>dependency-check-maven</artifactId>
757-
<version>10.0.4</version>
783+
<version>12.1.6</version>
758784
<configuration>
759785
<nvdApiServerId>nvd-api-key</nvdApiServerId>
760786
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
@@ -818,6 +844,7 @@
818844
<release>${java.version}</release>
819845
<forceJavacCompilerUse>true</forceJavacCompilerUse>
820846
<fork>true</fork>
847+
<proc>full</proc>
821848
<compilerArgs>
822849
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
823850
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
@@ -965,6 +992,7 @@
965992
<ignoredUnusedDeclaredDependency>org.apache.commons:commons-text</ignoredUnusedDeclaredDependency>
966993
<ignoredUnusedDeclaredDependency>org.osgi:org.osgi.service.prefs</ignoredUnusedDeclaredDependency>
967994
<ignoredUnusedDeclaredDependency>org.functionaljava:functionaljava</ignoredUnusedDeclaredDependency>
995+
<ignoredUnusedDeclaredDependency>com.github.jsqlparser:jsqlparser</ignoredUnusedDeclaredDependency>
968996
</ignoredUnusedDeclaredDependencies>
969997
</configuration>
970998
</execution>

‎src/main/java/de/funfried/netbeans/plugins/external/formatter/sql/jsqlformatter/JSQLFormatterJob.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,16 @@ public void format() throws BadLocationException {
8585
private String[] getOptions(Preferences pref) {
8686
int i = 0;
8787
String[] options = new String[FormattingOption.values().length];
88-
options[i++] = toOption(pref, FormattingOption.OUTPUT_FORMAT, JSQLFormatter.getOutputFormat());
89-
options[i++] = toOption(pref, FormattingOption.KEYWORD_SPELLING, JSQLFormatter.getKeywordSpelling());
88+
options[i++] = toOption(pref, FormattingOption.BACKSLASH_QUOTING, JSQLFormatter.getBackSlashQuoting());
9089
options[i++] = toOption(pref, FormattingOption.FUNCTION_SPELLING, JSQLFormatter.getFunctionSpelling());
91-
options[i++] = toOption(pref, FormattingOption.OBJECT_SPELLING, JSQLFormatter.getObjectSpelling());
9290
options[i++] = toOption(pref, FormattingOption.INDENT_WIDTH, JSQLFormatter.getIndentWidth());
91+
options[i++] = toOption(pref, FormattingOption.KEYWORD_SPELLING, JSQLFormatter.getKeywordSpelling());
92+
options[i++] = toOption(pref, FormattingOption.OBJECT_SPELLING, JSQLFormatter.getObjectSpelling());
93+
options[i++] = toOption(pref, FormattingOption.OUTPUT_FORMAT, JSQLFormatter.getOutputFormat());
9394
options[i++] = toOption(pref, FormattingOption.SEPARATION, JSQLFormatter.getSeparation());
95+
options[i++] = toOption(pref, FormattingOption.SHOW_LINE_NUMBERS, JSQLFormatter.ShowLineNumbers.NO);
9496
options[i++] = toOption(pref, FormattingOption.SQUARE_BRACKET_QUOTATION, JSQLFormatter.getSquaredBracketQuotation());
97+
options[i++] = toOption(pref, FormattingOption.STATEMENT_TERMINATOR, JSQLFormatter.getStatementTerminator());
9598

9699
return options;
97100
}

‎src/main/java/de/funfried/netbeans/plugins/external/formatter/ui/customizer/ExternalFormatterCustomizerTab.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ public class ExternalFormatterCustomizerTab implements ProjectCustomizer.Composi
5959
*/
6060
@Override
6161
public Category createCategory(Lookup lkp) {
62-
return ProjectCustomizer.Category.create("external-format", Bundle.LBL_Config(), ImageUtilities.loadImage(Icons.EXTERNAL_FORMATTER_ICON_PATH, false));
62+
return ProjectCustomizer.Category.create("external-format", NbBundle.getMessage(ExternalFormatterCustomizerTab.class, "LBL_Config"),
63+
ImageUtilities.loadImage(Icons.EXTERNAL_FORMATTER_ICON_PATH, false));
6364
}
6465

6566
/**
@@ -105,7 +106,7 @@ private static class ValidationListener implements ChangeListener {
105106
/**
106107
* Creates a new instance of the {@link ValidationListener}.
107108
*
108-
* @param category the {@link Category} where to update the validation
109+
* @param category the {@link Category} where to update the validation
109110
* @param projectSpecificPanel the {@link ProjectSpecificSettingsPanel} where to check the validation
110111
*/
111112
private ValidationListener(Category category, ProjectSpecificSettingsPanel projectSpecificPanel) {

‎src/site/site.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<skin>
1717
<groupId>org.apache.maven.skins</groupId>
1818
<artifactId>maven-fluido-skin</artifactId>
19-
<version>1.11.1</version>
19+
<version>2.0.1</version>
2020
</skin>
2121

2222
<custom>

0 commit comments

Comments
 (0)