Skip to content

Commit 3250684

Browse files
funfriedfunfried
authored
Merge pull request #203 from funfried/release/1.15.x
Release/1.15.x
2 parents c4acc76 + 9523da2 commit 3250684

62 files changed

Lines changed: 3528 additions & 96 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.ci.settings.xml‎

Lines changed: 113 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,24 @@
1616
<username>${env.sonatype_username}</username>
1717
<password>${env.sonatype_password}</password>
1818
</server>
19+
<server>
20+
<id>sonatype-nexus-s01-staging</id>
21+
<username>${env.sonatype_username}</username>
22+
<password>${env.sonatype_password}</password>
23+
</server>
24+
<server>
25+
<id>sonatype-nexus-s01-snapshots</id>
26+
<username>${env.sonatype_username}</username>
27+
<password>${env.sonatype_password}</password>
28+
</server>
1929
</servers>
2030

2131
<mirrors>
2232
<mirror>
2333
<id>bits-netbeans-http-blocker</id>
2434
<mirrorOf>bits-netbeans</mirrorOf>
2535
<name>Bits NetBeans Mirror</name>
26-
<url>http://netbeans.apidesign.org/maven2/</url>
36+
<url>https://netbeans.apidesign.org/maven2/</url>
2737
</mirror>
2838
<!--<mirror>
2939
<id>scijava-http-blocker</id>
@@ -55,6 +65,18 @@
5565
<name>Sonatype Nexus Snapshots Mirror</name>
5666
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
5767
</mirror>
68+
<mirror>
69+
<id>sonatype-nexus-s01-staging-http-blocker</id>
70+
<mirrorOf>sonatype-nexus-s01-staging</mirrorOf>
71+
<name>Sonatype Nexus S01 Staging Mirror</name>
72+
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
73+
</mirror>
74+
<mirror>
75+
<id>sonatype-nexus-s01-snapshots-http-blocker</id>
76+
<mirrorOf>sonatype-nexus-s01-snapshots</mirrorOf>
77+
<name>Sonatype Nexus S01 Snapshots Mirror</name>
78+
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
79+
</mirror>
5880
</mirrors>
5981

6082
<activeProfiles>
@@ -73,7 +95,7 @@
7395
<repository>
7496
<id>bits-netbeans</id>
7597
<name>bits-netbeans</name>
76-
<url>http://netbeans.apidesign.org/maven2/</url>
98+
<url>https://netbeans.apidesign.org/maven2/</url>
7799
<releases>
78100
<enabled>true</enabled>
79101
</releases>
@@ -114,12 +136,56 @@
114136
<enabled>false</enabled>
115137
</snapshots>
116138
</repository>
139+
<repository>
140+
<id>sonatype-nexus-staging</id>
141+
<name>sonatype-nexus-staging</name>
142+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
143+
<releases>
144+
<enabled>true</enabled>
145+
</releases>
146+
<snapshots>
147+
<enabled>false</enabled>
148+
</snapshots>
149+
</repository>
150+
<repository>
151+
<id>sonatype-nexus-snapshots</id>
152+
<name>sonatype-nexus-snapshots</name>
153+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
154+
<releases>
155+
<enabled>false</enabled>
156+
</releases>
157+
<snapshots>
158+
<enabled>true</enabled>
159+
</snapshots>
160+
</repository>
161+
<repository>
162+
<id>sonatype-nexus-s01-staging</id>
163+
<name>sonatype-nexus-s01-staging</name>
164+
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
165+
<releases>
166+
<enabled>true</enabled>
167+
</releases>
168+
<snapshots>
169+
<enabled>false</enabled>
170+
</snapshots>
171+
</repository>
172+
<repository>
173+
<id>sonatype-nexus-s01-snapshots</id>
174+
<name>sonatype-nexus-s01-snapshots</name>
175+
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
176+
<releases>
177+
<enabled>false</enabled>
178+
</releases>
179+
<snapshots>
180+
<enabled>true</enabled>
181+
</snapshots>
182+
</repository>
117183
</repositories>
118184
<pluginRepositories>
119185
<pluginRepository>
120186
<id>bits-netbeans</id>
121187
<name>bits-netbeans</name>
122-
<url>http://netbeans.apidesign.org/maven2/</url>
188+
<url>https://netbeans.apidesign.org/maven2/</url>
123189
<releases>
124190
<enabled>true</enabled>
125191
</releases>
@@ -160,6 +226,50 @@
160226
<enabled>false</enabled>
161227
</snapshots>
162228
</pluginRepository>
229+
<pluginRepository>
230+
<id>sonatype-nexus-staging</id>
231+
<name>sonatype-nexus-staging</name>
232+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
233+
<releases>
234+
<enabled>true</enabled>
235+
</releases>
236+
<snapshots>
237+
<enabled>false</enabled>
238+
</snapshots>
239+
</pluginRepository>
240+
<pluginRepository>
241+
<id>sonatype-nexus-snapshots</id>
242+
<name>sonatype-nexus-snapshots</name>
243+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
244+
<releases>
245+
<enabled>false</enabled>
246+
</releases>
247+
<snapshots>
248+
<enabled>true</enabled>
249+
</snapshots>
250+
</pluginRepository>
251+
<pluginRepository>
252+
<id>sonatype-nexus-s01-staging</id>
253+
<name>sonatype-nexus-s01-staging</name>
254+
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
255+
<releases>
256+
<enabled>true</enabled>
257+
</releases>
258+
<snapshots>
259+
<enabled>false</enabled>
260+
</snapshots>
261+
</pluginRepository>
262+
<pluginRepository>
263+
<id>sonatype-nexus-s01-snapshots</id>
264+
<name>sonatype-nexus-s01-snapshots</name>
265+
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
266+
<releases>
267+
<enabled>false</enabled>
268+
</releases>
269+
<snapshots>
270+
<enabled>true</enabled>
271+
</snapshots>
272+
</pluginRepository>
163273
</pluginRepositories>
164274
</profile>
165275
</profiles>

‎README.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ the same way as e.g. your co-workers do with their Eclipse IDE.
3131
* [Google Code Formatter](https://github.com/google/google-java-format)
3232
* [Eclipse Java Code Formatter](https://help.eclipse.org/kepler/index.jsp?topic=%2Forg.eclipse.jdt.doc.isv%2Fguide%2Fjdt_api_codeformatter.htm)
3333
* [Spring Java Formatter](https://github.com/spring-io/spring-javaformat)
34+
* [Palantir Java Formatter](https://github.com/palantir/palantir-java-format)
3435

3536
* Javascript
36-
* [Eclipse Javascript Code Formatter](https://help.eclipse.org/2019-12/index.jsp?topic=%2Forg.eclipse.wst.jsdt.doc%2Fstarted%2Foverview.html&cp%3D52_0)
37+
* [Eclipse Javascript Code Formatter](https://help.eclipse.org/2019-12/index.jsp?topic=%2Forg.eclipse.wst.jsdt.doc%2Fstarted%2Foverview.html&cp%3D52_0) (via [modified revelc jsdt-core](https://github.com/funfried/jsdt-core))
3738

3839
* XML
3940
* [revelc.net XML Code Formatter](https://github.com/revelc/xml-formatter)
@@ -44,6 +45,8 @@ the same way as e.g. your co-workers do with their Eclipse IDE.
4445

4546
* SQL
4647
* [manticore JSQLFormatter](https://github.com/manticore-projects/jsqlformatter)
48+
* [Vertical Blank SQL Formatter](https://github.com/vertical-blank/sql-formatter)
49+
* [DBeaver SQL Formatter (via Spotless)](https://github.com/diffplug/spotless)
4750

4851
### Features
4952
* Makes use of the internal NetBeans formatting API, which makes it possible to reuse built-in features like the format on save action or format only selected lines ... (since 1.13)
@@ -66,6 +69,9 @@ the same way as e.g. your co-workers do with their Eclipse IDE.
6669
* Support for Jackson Json formatter (since 1.14)
6770
* Support for manticore JSQLFormatter (Special thanks to [Andreas Reichel](https://github.com/manticore-projects) for the contribution) (since 1.14.1)
6871
* Support for remote configurations for Eclipse formatters (since 1.14.1)
72+
* Support for Palantir Java Formatter (since 1.15.0)
73+
* Support for Vertical Blank SQL Formatter (since 1.15.0)
74+
* Support for DBeaver (via Spotless) (since 1.15.0)
6975

7076
Compatibility
7177
-------------

‎nb-configuration.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,9 @@
4242
<de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlLinefeed/>
4343
<de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonExpandTabsToSpaces>false</de-funfried-netbeans-plugins-externalcodeformatter.jacksonJsonExpandTabsToSpaces>
4444
<de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlWrapLongLines>false</de-funfried-netbeans-plugins-externalcodeformatter.revelcXmlWrapLongLines>
45+
<org-netbeans-modules-javascript2-requirejs.enabled>true</org-netbeans-modules-javascript2-requirejs.enabled>
46+
<de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_XML>netbeans-formatter</de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_XML>
47+
<de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_JAVASCRIPT>netbeans-formatter</de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_JAVASCRIPT>
48+
<de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_SQL>netbeans-formatter</de-funfried-netbeans-plugins-externalcodeformatter.enabledFormatter_2e_SQL>
4549
</properties>
4650
</project-shared-configuration>

0 commit comments

Comments
 (0)