Skip to content

Commit e4b85e1

Browse files
funfriedfunfried
authored
Merge pull request #276 from funfried/release/1.15.x
Updated to latest dependency and plugin versions...
2 parents 260116d + bc3f0cb commit e4b85e1

17 files changed

Lines changed: 78 additions & 61 deletions

File tree

‎pom.xml‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@
120120
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
121121
<keystore.file>${project.build.directory}/keystore</keystore.file>
122122
<google-java-format.version>1.35.0</google-java-format.version>
123-
<palantir-java-format.version>2.89.0</palantir-java-format.version>
123+
<palantir-java-format.version>2.90.0</palantir-java-format.version>
124124
<xml-formatter.version>0.4.0</xml-formatter.version>
125125
<commons-lang.version>3.20.0</commons-lang.version>
126126
<netbeans.version>RELEASE170</netbeans.version>
127127
<jsoup.version>1.22.1</jsoup.version>
128-
<pmd.version>7.17.0</pmd.version>
128+
<pmd.version>7.22.0</pmd.version>
129129
<sshd.version>2.17.1</sshd.version>
130130
<scm.version>2.2.1</scm.version>
131131
<argLine></argLine>
@@ -162,13 +162,20 @@
162162
<dependency>
163163
<groupId>org.eclipse.jgit</groupId>
164164
<artifactId>org.eclipse.jgit</artifactId>
165-
<version>7.5.0.202512021534-r</version>
165+
<version>7.6.0.202603022253-r</version>
166166
</dependency>
167167

168168
<dependency>
169169
<groupId>org.eclipse.jgit</groupId>
170170
<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
171-
<version>7.5.0.202512021534-r</version>
171+
<version>7.6.0.202603022253-r</version>
172+
</dependency>
173+
174+
<!-- Plexus -->
175+
<dependency>
176+
<groupId>org.codehaus.plexus</groupId>
177+
<artifactId>plexus-utils</artifactId>
178+
<version>4.0.3</version>
172179
</dependency>
173180
</dependencies>
174181
</dependencyManagement>
@@ -178,7 +185,7 @@
178185
<dependency>
179186
<groupId>org.eclipse.platform</groupId>
180187
<artifactId>org.eclipse.text</artifactId>
181-
<version>3.14.500</version>
188+
<version>3.14.600</version>
182189
<exclusions>
183190
<exclusion>
184191
<groupId>org.eclipse.platform</groupId>
@@ -195,7 +202,7 @@
195202
<dependency>
196203
<groupId>org.eclipse.jdt</groupId>
197204
<artifactId>org.eclipse.jdt.core</artifactId>
198-
<version>3.44.0</version>
205+
<version>3.45.0</version>
199206
<exclusions>
200207
<exclusion>
201208
<groupId>org.eclipse.platform</groupId>
@@ -298,7 +305,7 @@
298305
<dependency>
299306
<groupId>com.diffplug.spotless</groupId>
300307
<artifactId>spotless-lib</artifactId>
301-
<version>4.4.0</version>
308+
<version>4.5.0</version>
302309
</dependency>
303310

304311
<!-- XML Formatter -->
@@ -318,13 +325,13 @@
318325
<dependency>
319326
<groupId>com.fasterxml.jackson.core</groupId>
320327
<artifactId>jackson-core</artifactId>
321-
<version>2.21.1</version>
328+
<version>2.21.3</version>
322329
</dependency>
323330

324331
<dependency>
325332
<groupId>com.fasterxml.jackson.core</groupId>
326333
<artifactId>jackson-databind</artifactId>
327-
<version>2.21.1</version>
334+
<version>2.21.3</version>
328335
</dependency>
329336

330337
<!-- CSS Parser -->
@@ -545,7 +552,7 @@
545552
<dependency>
546553
<groupId>commons-io</groupId>
547554
<artifactId>commons-io</artifactId>
548-
<version>2.21.0</version>
555+
<version>2.22.0</version>
549556
</dependency>
550557

551558
<dependency>
@@ -589,7 +596,7 @@
589596
<dependency>
590597
<groupId>com.google.guava</groupId>
591598
<artifactId>guava</artifactId>
592-
<version>33.5.0-jre</version>
599+
<version>33.6.0-jre</version>
593600
</dependency>
594601

595602
<!-- Test -->
@@ -846,12 +853,12 @@
846853
<plugin>
847854
<groupId>com.github.spotbugs</groupId>
848855
<artifactId>spotbugs-maven-plugin</artifactId>
849-
<version>4.9.8.2</version>
856+
<version>4.9.8.3</version>
850857
</plugin>
851858
<plugin>
852859
<groupId>org.owasp</groupId>
853860
<artifactId>dependency-check-maven</artifactId>
854-
<version>12.2.0</version>
861+
<version>12.2.1</version>
855862
<configuration>
856863
<nvdApiServerId>nvd-api-key</nvdApiServerId>
857864
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>

‎src/changes/changes.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@
99
</properties>
1010

1111
<body>
12-
<release version="1.15.7-SNAPSHOT" date="N/A" description="N/A">
12+
<release version="1.15.7-SNAPSHOT" date="N/A" description="Maintenance release">
13+
<action dev="bahlef" type="change">
14+
Updated to latest dependency and plugin versions
15+
</action>
16+
<action dev="bahlef" type="fix">
17+
Fixed status and notification messages
18+
</action>
1319
</release>
1420

1521
<release version="1.15.6" date="2025-10-28" description="Maintenance release">

‎src/main/java/de/funfried/netbeans/plugins/external/formatter/css/cssparser/CssParserFormatJob.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ public void format() throws BadLocationException {
6565
if (setFormattedCode(code, formattedContent)) {
6666
SwingUtilities.invokeLater(() -> {
6767
if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) {
68-
NotificationDisplayer.getDefault().notify("Format using CssParser", Icons.ICON_EXTERNAL, "", null);
68+
NotificationDisplayer.getDefault().notify("Format using CssParser", Icons.ICON_EXTERNAL, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO);
6969
}
7070

71-
StatusDisplayer.getDefault().setStatusText("Format using CssParser");
71+
StatusDisplayer.getDefault().setStatusText("Format using CssParser", 100);
7272
});
7373
}
7474
} catch (FormattingFailedException ex) {
7575
SwingUtilities.invokeLater(() -> {
76-
StatusDisplayer.getDefault().setStatusText("Failed to format using CssParser: " + ex.getMessage());
76+
StatusDisplayer.getDefault().setStatusText("Failed to format using CssParser: " + ex.getMessage(), 100);
7777
});
7878

7979
throw ex;

‎src/main/java/de/funfried/netbeans/plugins/external/formatter/eclipse/AbstractEclipseFormatJob.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,10 @@ public final void format() throws BadLocationException {
133133

134134
SwingUtilities.invokeLater(() -> {
135135
if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) {
136-
NotificationDisplayer.getDefault().notify("Format using Eclipse formatter", Icons.ICON_ECLIPSE, msg, null);
136+
NotificationDisplayer.getDefault().notify("Format using Eclipse formatter", Icons.ICON_ECLIPSE, msg, null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO);
137137
}
138138

139-
StatusDisplayer.getDefault().setStatusText("Format using Eclipse formatter: " + msg);
139+
StatusDisplayer.getDefault().setStatusText("Format using Eclipse formatter: " + msg, 100);
140140
});
141141
}
142142
} catch (ProfileNotFoundException ex) {
@@ -147,7 +147,7 @@ public final void format() throws BadLocationException {
147147
NotifyDescriptor.ERROR_MESSAGE);
148148
DialogDisplayer.getDefault().notify(notify);
149149

150-
StatusDisplayer.getDefault().setStatusText(String.format("Profile '%s' not found in %s", formatterProfile, formatterFile));
150+
StatusDisplayer.getDefault().setStatusText(String.format("Profile '%s' not found in %s", formatterProfile, formatterFile), 100);
151151
});
152152

153153
throw ex;
@@ -157,13 +157,13 @@ public final void format() throws BadLocationException {
157157
NotifyDescriptor.ERROR_MESSAGE);
158158
DialogDisplayer.getDefault().notify(notify);
159159

160-
StatusDisplayer.getDefault().setStatusText(String.format("Could not find configuration file %s. Make sure the file exists and it can be read.", formatterFile));
160+
StatusDisplayer.getDefault().setStatusText(String.format("Could not find configuration file %s. Make sure the file exists and it can be read.", formatterFile), 100);
161161
});
162162

163163
throw ex;
164164
} catch (FormattingFailedException ex) {
165165
SwingUtilities.invokeLater(() -> {
166-
StatusDisplayer.getDefault().setStatusText("Failed to format using Eclipse formatter: " + ex.getMessage());
166+
StatusDisplayer.getDefault().setStatusText("Failed to format using Eclipse formatter: " + ex.getMessage(), 100);
167167
});
168168

169169
throw ex;

‎src/main/java/de/funfried/netbeans/plugins/external/formatter/html/jsoup/JsoupHtmlFormatJob.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ public void format() throws BadLocationException {
8888
if (setFormattedCode(code, formattedContent)) {
8989
SwingUtilities.invokeLater(() -> {
9090
if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) {
91-
NotificationDisplayer.getDefault().notify("Format using Jsoup HTML formatter", Icons.ICON_JSOUP, "", null);
91+
NotificationDisplayer.getDefault().notify("Format using Jsoup HTML formatter", Icons.ICON_JSOUP, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO);
9292
}
9393

94-
StatusDisplayer.getDefault().setStatusText("Format using Jsoup HTML formatter");
94+
StatusDisplayer.getDefault().setStatusText("Format using Jsoup HTML formatter", 100);
9595
});
9696
}
9797
}

‎src/main/java/de/funfried/netbeans/plugins/external/formatter/java/base/actions/JavaOrganizeImportsAction.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,11 @@ public void actionPerformed(ActionEvent evt, JTextComponent target) {
5757

5858
SwingUtilities.invokeLater(() -> {
5959
if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) {
60-
NotificationDisplayer.getDefault().notify("Organized imports using NetBeans internal logic", Icons.ICON_NETBEANS, "", null);
60+
NotificationDisplayer.getDefault().notify("Organized imports using NetBeans internal logic", Icons.ICON_NETBEANS, "", null, NotificationDisplayer.Priority.NORMAL,
61+
NotificationDisplayer.Category.INFO);
6162
}
6263

63-
StatusDisplayer.getDefault().setStatusText("Organized imports using NetBeans internal logic");
64+
StatusDisplayer.getDefault().setStatusText("Organized imports using NetBeans internal logic", 100);
6465
});
6566
}
6667
}

‎src/main/java/de/funfried/netbeans/plugins/external/formatter/java/google/GoogleFormatJob.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ public void format() throws BadLocationException {
7070
if (setFormattedCode(code, formattedContent)) {
7171
SwingUtilities.invokeLater(() -> {
7272
if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) {
73-
NotificationDisplayer.getDefault().notify("Format using Google formatter", Icons.ICON_GOOGLE, "", null);
73+
NotificationDisplayer.getDefault().notify("Format using Google formatter", Icons.ICON_GOOGLE, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO);
7474
}
7575

76-
StatusDisplayer.getDefault().setStatusText("Format using Google formatter");
76+
StatusDisplayer.getDefault().setStatusText("Format using Google formatter", 100);
7777
});
7878
}
7979
} catch (FormattingFailedException ex) {
8080
SwingUtilities.invokeLater(() -> {
81-
StatusDisplayer.getDefault().setStatusText("Failed to format using Google formatter: " + ex.getMessage());
81+
StatusDisplayer.getDefault().setStatusText("Failed to format using Google formatter: " + ex.getMessage(), 100);
8282
});
8383

8484
throw ex;
@@ -99,15 +99,16 @@ public void organizeImports() throws BadLocationException {
9999
if (setFormattedCode(code, formattedContent)) {
100100
SwingUtilities.invokeLater(() -> {
101101
if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) {
102-
NotificationDisplayer.getDefault().notify("Organizing imports using Google formatter", Icons.ICON_GOOGLE, "", null);
102+
NotificationDisplayer.getDefault().notify("Organizing imports using Google formatter", Icons.ICON_GOOGLE, "", null, NotificationDisplayer.Priority.NORMAL,
103+
NotificationDisplayer.Category.INFO);
103104
}
104105

105-
StatusDisplayer.getDefault().setStatusText("Organizing imports using Google formatter");
106+
StatusDisplayer.getDefault().setStatusText("Organizing imports using Google formatter", 100);
106107
});
107108
}
108109
} catch (FormattingFailedException ex) {
109110
SwingUtilities.invokeLater(() -> {
110-
StatusDisplayer.getDefault().setStatusText("Failed to organize imports using Google formatter: " + ex.getMessage());
111+
StatusDisplayer.getDefault().setStatusText("Failed to organize imports using Google formatter: " + ex.getMessage(), 100);
111112
});
112113

113114
throw ex;

‎src/main/java/de/funfried/netbeans/plugins/external/formatter/java/palantir/PalantirFormatJob.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ public void format() throws BadLocationException {
6464
if (setFormattedCode(code, formattedContent)) {
6565
SwingUtilities.invokeLater(() -> {
6666
if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) {
67-
NotificationDisplayer.getDefault().notify("Format using Palantir formatter", Icons.ICON_EXTERNAL, "", null);
67+
NotificationDisplayer.getDefault().notify("Format using Palantir formatter", Icons.ICON_EXTERNAL, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO);
6868
}
6969

70-
StatusDisplayer.getDefault().setStatusText("Format using Palantir formatter");
70+
StatusDisplayer.getDefault().setStatusText("Format using Palantir formatter", 100);
7171
});
7272
}
7373
} catch (FormattingFailedException ex) {
7474
SwingUtilities.invokeLater(() -> {
75-
StatusDisplayer.getDefault().setStatusText("Failed to format using Palantir formatter: " + ex.getMessage());
75+
StatusDisplayer.getDefault().setStatusText("Failed to format using Palantir formatter: " + ex.getMessage(), 100);
7676
});
7777

7878
throw ex;
@@ -90,15 +90,16 @@ public void organizeImports() throws BadLocationException {
9090
if (setFormattedCode(code, formattedContent)) {
9191
SwingUtilities.invokeLater(() -> {
9292
if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) {
93-
NotificationDisplayer.getDefault().notify("Organizing imports using Palantir formatter", Icons.ICON_EXTERNAL, "", null);
93+
NotificationDisplayer.getDefault().notify("Organizing imports using Palantir formatter", Icons.ICON_EXTERNAL, "", null, NotificationDisplayer.Priority.NORMAL,
94+
NotificationDisplayer.Category.INFO);
9495
}
9596

96-
StatusDisplayer.getDefault().setStatusText("Organizing imports using Palantir formatter");
97+
StatusDisplayer.getDefault().setStatusText("Organizing imports using Palantir formatter", 100);
9798
});
9899
}
99100
} catch (FormattingFailedException ex) {
100101
SwingUtilities.invokeLater(() -> {
101-
StatusDisplayer.getDefault().setStatusText("Failed to organize imports using Palantir formatter: " + ex.getMessage());
102+
StatusDisplayer.getDefault().setStatusText("Failed to organize imports using Palantir formatter: " + ex.getMessage(), 100);
102103
});
103104

104105
throw ex;

‎src/main/java/de/funfried/netbeans/plugins/external/formatter/java/spring/SpringFormatJob.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ public void format() throws BadLocationException {
7474
if (setFormattedCode(code, formattedContent)) {
7575
SwingUtilities.invokeLater(() -> {
7676
if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) {
77-
NotificationDisplayer.getDefault().notify("Format using Spring formatter", Icons.ICON_SPRING, "", null);
77+
NotificationDisplayer.getDefault().notify("Format using Spring formatter", Icons.ICON_SPRING, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO);
7878
}
7979

80-
StatusDisplayer.getDefault().setStatusText("Format using Spring formatter");
80+
StatusDisplayer.getDefault().setStatusText("Format using Spring formatter", 100);
8181
});
8282
}
8383
} catch (FormattingFailedException ex) {
8484
SwingUtilities.invokeLater(() -> {
85-
StatusDisplayer.getDefault().setStatusText("Failed to format using Spring formatter: " + ex.getMessage());
85+
StatusDisplayer.getDefault().setStatusText("Failed to format using Spring formatter: " + ex.getMessage(), 100);
8686
});
8787

8888
throw ex;

‎src/main/java/de/funfried/netbeans/plugins/external/formatter/json/jackson/JacksonFormatJob.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ public void format() throws BadLocationException {
7979
if (setFormattedCode(code, formattedContent)) {
8080
SwingUtilities.invokeLater(() -> {
8181
if (pref.getBoolean(Settings.SHOW_NOTIFICATIONS, false)) {
82-
NotificationDisplayer.getDefault().notify("Format using Jackson Json formatter", Icons.ICON_JACKSON, "", null);
82+
NotificationDisplayer.getDefault().notify("Format using Jackson Json formatter", Icons.ICON_JACKSON, "", null, NotificationDisplayer.Priority.NORMAL, NotificationDisplayer.Category.INFO);
8383
}
8484

85-
StatusDisplayer.getDefault().setStatusText("Format using Jackson Json formatter");
85+
StatusDisplayer.getDefault().setStatusText("Format using Jackson Json formatter", 100);
8686
});
8787
}
8888
} catch (FormattingFailedException ex) {
8989
SwingUtilities.invokeLater(() -> {
90-
StatusDisplayer.getDefault().setStatusText("Failed to format using Jackson Json formatter: " + ex.getMessage());
90+
StatusDisplayer.getDefault().setStatusText("Failed to format using Jackson Json formatter: " + ex.getMessage(), 100);
9191
});
9292

9393
throw ex;

0 commit comments

Comments
 (0)