Skip to content

Commit 36071c0

Browse files
funfriedfunfried
authored
Merge pull request #257 from funfried/release/1.15.x
2 parents 78f39f1 + fcf8a48 commit 36071c0

File tree

2 files changed

+40
-40
lines changed

2 files changed

+40
-40
lines changed

‎pom.xml‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -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.19.2</google-java-format.version>
122-
<palantir-java-format.version>2.40.0</palantir-java-format.version>
123-
<xml-formatter.version>0.3.0</xml-formatter.version>
121+
<google-java-format.version>1.23.0</google-java-format.version>
122+
<palantir-java-format.version>2.48.0</palantir-java-format.version>
123+
<xml-formatter.version>0.4.0</xml-formatter.version>
124124
<commons-lang.version>3.14.0</commons-lang.version>
125125
<netbeans.version>RELEASE120</netbeans.version>
126-
<jsoup.version>1.17.2</jsoup.version>
127-
<pmd.version>6.55.0</pmd.version>
126+
<jsoup.version>1.18.1</jsoup.version>
127+
<pmd.version>7.3.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.13.100</version>
136+
<version>3.14.100</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.36.0</version>
153+
<version>3.38.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.7</version>
170+
<version>1.0.8</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.41</version>
201+
<version>0.0.42</version>
202202
</dependency>
203203

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

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

285285
<!-- CSS Parser -->
@@ -316,7 +316,7 @@
316316
<dependency>
317317
<groupId>com.github.vertical-blank</groupId>
318318
<artifactId>sql-formatter</artifactId>
319-
<version>2.0.4</version>
319+
<version>2.0.5</version>
320320
</dependency>
321321

322322
<!-- NetBeans -->
@@ -480,26 +480,26 @@
480480
<dependency>
481481
<groupId>org.apache.commons</groupId>
482482
<artifactId>commons-text</artifactId>
483-
<version>1.11.0</version>
483+
<version>1.12.0</version>
484484
</dependency>
485485

486486
<dependency>
487487
<groupId>commons-io</groupId>
488488
<artifactId>commons-io</artifactId>
489-
<version>2.15.1</version>
489+
<version>2.16.1</version>
490490
</dependency>
491491

492492
<dependency>
493493
<groupId>commons-validator</groupId>
494494
<artifactId>commons-validator</artifactId>
495-
<version>1.8.0</version>
495+
<version>1.9.0</version>
496496
</dependency>
497497

498498
<!-- Google -->
499499
<dependency>
500500
<groupId>com.google.guava</groupId>
501501
<artifactId>guava</artifactId>
502-
<version>33.0.0-jre</version>
502+
<version>33.2.1-jre</version>
503503
</dependency>
504504

505505
<!-- Test -->
@@ -524,22 +524,22 @@
524524
<plugin>
525525
<groupId>org.apache.netbeans.utilities</groupId>
526526
<artifactId>nbm-maven-plugin</artifactId>
527-
<version>14.0</version>
527+
<version>14.1</version>
528528
</plugin>
529529
<plugin>
530530
<groupId>org.apache.maven.plugins</groupId>
531531
<artifactId>maven-compiler-plugin</artifactId>
532-
<version>3.12.1</version>
532+
<version>3.13.0</version>
533533
</plugin>
534534
<plugin>
535535
<groupId>org.apache.maven.plugins</groupId>
536536
<artifactId>maven-jar-plugin</artifactId>
537-
<version>3.3.0</version>
537+
<version>3.4.2</version>
538538
</plugin>
539539
<plugin>
540540
<groupId>org.apache.maven.plugins</groupId>
541541
<artifactId>maven-install-plugin</artifactId>
542-
<version>3.1.1</version>
542+
<version>3.1.2</version>
543543
</plugin>
544544
<plugin>
545545
<groupId>org.apache.maven.plugins</groupId>
@@ -549,17 +549,17 @@
549549
<plugin>
550550
<groupId>org.apache.maven.plugins</groupId>
551551
<artifactId>maven-clean-plugin</artifactId>
552-
<version>3.3.2</version>
552+
<version>3.4.0</version>
553553
</plugin>
554554
<plugin>
555555
<groupId>org.apache.maven.plugins</groupId>
556556
<artifactId>maven-assembly-plugin</artifactId>
557-
<version>3.6.0</version>
557+
<version>3.7.1</version>
558558
</plugin>
559559
<plugin>
560560
<groupId>org.apache.maven.plugins</groupId>
561561
<artifactId>maven-deploy-plugin</artifactId>
562-
<version>3.1.1</version>
562+
<version>3.1.2</version>
563563
</plugin>
564564
<plugin>
565565
<groupId>org.apache.maven.plugins</groupId>
@@ -569,7 +569,7 @@
569569
<plugin>
570570
<groupId>org.sonatype.plugins</groupId>
571571
<artifactId>nexus-staging-maven-plugin</artifactId>
572-
<version>1.6.13</version>
572+
<version>1.7.0</version>
573573
<configuration>
574574
<serverId>sonatype-nexus-staging</serverId>
575575
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
@@ -594,12 +594,12 @@
594594
<plugin>
595595
<groupId>org.apache.maven.plugins</groupId>
596596
<artifactId>maven-gpg-plugin</artifactId>
597-
<version>3.1.0</version>
597+
<version>3.2.4</version>
598598
</plugin>
599599
<plugin>
600600
<groupId>net.revelc.code.formatter</groupId>
601601
<artifactId>formatter-maven-plugin</artifactId>
602-
<version>2.23.0</version>
602+
<version>2.24.1</version>
603603
</plugin>
604604
<plugin>
605605
<groupId>org.apache.maven.plugins</groupId>
@@ -624,17 +624,17 @@
624624
<plugin>
625625
<groupId>org.apache.maven.plugins</groupId>
626626
<artifactId>maven-scm-publish-plugin</artifactId>
627-
<version>3.2.1</version>
627+
<version>3.3.0</version>
628628
</plugin>
629629
<plugin>
630630
<groupId>org.apache.maven.plugins</groupId>
631631
<artifactId>maven-project-info-reports-plugin</artifactId>
632-
<version>3.5.0</version>
632+
<version>3.6.1</version>
633633
</plugin>
634634
<plugin>
635635
<groupId>org.apache.maven.plugins</groupId>
636636
<artifactId>maven-javadoc-plugin</artifactId>
637-
<version>3.6.3</version>
637+
<version>3.7.0</version>
638638
<configuration>
639639
<quiet>true</quiet>
640640
<doclint>all,-missing</doclint>
@@ -655,12 +655,12 @@
655655
<plugin>
656656
<groupId>org.apache.maven.plugins</groupId>
657657
<artifactId>maven-source-plugin</artifactId>
658-
<version>3.3.0</version>
658+
<version>3.3.1</version>
659659
</plugin>
660660
<plugin>
661661
<groupId>org.codehaus.mojo</groupId>
662662
<artifactId>versions-maven-plugin</artifactId>
663-
<version>2.16.2</version>
663+
<version>2.17.0</version>
664664
</plugin>
665665
<plugin>
666666
<groupId>org.codehaus.mojo</groupId>
@@ -688,17 +688,17 @@
688688
<plugin>
689689
<groupId>org.apache.maven.plugins</groupId>
690690
<artifactId>maven-surefire-plugin</artifactId>
691-
<version>3.2.5</version>
691+
<version>3.3.1</version>
692692
</plugin>
693693
<plugin>
694694
<groupId>org.apache.maven.plugins</groupId>
695695
<artifactId>maven-dependency-plugin</artifactId>
696-
<version>3.6.1</version>
696+
<version>3.7.1</version>
697697
</plugin>
698698
<plugin>
699699
<groupId>org.jacoco</groupId>
700700
<artifactId>jacoco-maven-plugin</artifactId>
701-
<version>0.8.11</version>
701+
<version>0.8.12</version>
702702
<configuration>
703703
<includes>
704704
<include>de/funfried/netbeans/plugins/external/formatter/**/*</include>
@@ -717,12 +717,12 @@
717717
<plugin>
718718
<groupId>org.apache.maven.plugins</groupId>
719719
<artifactId>maven-jxr-plugin</artifactId>
720-
<version>3.3.2</version>
720+
<version>3.4.0</version>
721721
</plugin>
722722
<plugin>
723723
<groupId>org.apache.maven.plugins</groupId>
724724
<artifactId>maven-pmd-plugin</artifactId>
725-
<version>3.21.2</version>
725+
<version>3.23.0</version>
726726
<dependencies>
727727
<dependency>
728728
<groupId>net.sourceforge.pmd</groupId>
@@ -749,12 +749,12 @@
749749
<plugin>
750750
<groupId>com.github.spotbugs</groupId>
751751
<artifactId>spotbugs-maven-plugin</artifactId>
752-
<version>4.8.3.0</version>
752+
<version>4.8.6.2</version>
753753
</plugin>
754754
<plugin>
755755
<groupId>org.owasp</groupId>
756756
<artifactId>dependency-check-maven</artifactId>
757-
<version>9.0.9</version>
757+
<version>10.0.2</version>
758758
<configuration>
759759
<nvdApiServerId>nvd-api-key</nvdApiServerId>
760760
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
@@ -1057,7 +1057,7 @@
10571057
<plugin>
10581058
<groupId>com.h3xstream.findsecbugs</groupId>
10591059
<artifactId>findsecbugs-plugin</artifactId>
1060-
<version>1.12.0</version>
1060+
<version>1.13.0</version>
10611061
</plugin>
10621062
</plugins>
10631063
</configuration>

‎src/test/java/de/funfried/netbeans/plugins/external/formatter/java/google/GoogleJavaFormatterWrapperTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ public void testIllegalChangedElementsCode() {
317317
try {
318318
instance.format(text, JavaFormatterOptions.Style.GOOGLE, regions);
319319
} catch (RuntimeException ex) {
320-
Assert.assertTrue(ex.getMessage(), ex.getMessage().contains("invalid length"));
320+
Assert.assertTrue(ex.getMessage(), ex.getMessage().contains("invalid offset"));
321321
}
322322
}
323323
}

0 commit comments

Comments
 (0)