Skip to content

Commit 2c0b80e

Browse files
funfriedfunfried
committed
- Dependencies and plugins updated to latest versions
- Disabled keytool execution for non release builds as it doesn't work on Windows platforms
1 parent d5d08f0 commit 2c0b80e

2 files changed

Lines changed: 61 additions & 38 deletions

File tree

‎.ci.settings.xml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,26 @@
2626
<username>${env.sonatype_username}</username>
2727
<password>${env.sonatype_password}</password>
2828
</server>
29+
<server>
30+
<id>sonatype-nexus-staging-http-blocker</id>
31+
<username>${env.sonatype_username}</username>
32+
<password>${env.sonatype_password}</password>
33+
</server>
34+
<server>
35+
<id>sonatype-nexus-snapshots-http-blocker</id>
36+
<username>${env.sonatype_username}</username>
37+
<password>${env.sonatype_password}</password>
38+
</server>
39+
<server>
40+
<id>sonatype-nexus-s01-staging-http-blocker</id>
41+
<username>${env.sonatype_username}</username>
42+
<password>${env.sonatype_password}</password>
43+
</server>
44+
<server>
45+
<id>sonatype-nexus-s01-snapshots-http-blocker</id>
46+
<username>${env.sonatype_username}</username>
47+
<password>${env.sonatype_password}</password>
48+
</server>
2949
</servers>
3050

3151
<mirrors>
@@ -88,7 +108,7 @@
88108
<id>ci</id>
89109
<properties>
90110
<repoToken>${env.repoToken}</repoToken>
91-
<keystore.pass>${env.gh_token}</keystore.pass>
111+
<keystore.pass>${env.signing_keypass}</keystore.pass>
92112
<gpg.passphrase>${env.signing_keypass}</gpg.passphrase>
93113
<skipRemoteStaging>${env.skipRemoteStaging}</skipRemoteStaging>
94114
</properties>

‎pom.xml‎

Lines changed: 40 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@
115115
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
116116
<keystore.file>${project.build.directory}/keystore</keystore.file>
117117
<google-java-format.version>1.15.0</google-java-format.version>
118-
<palantir-java-format.version>2.27.0</palantir-java-format.version>
118+
<palantir-java-format.version>2.28.0</palantir-java-format.version>
119119
<xml-formatter.version>0.2.2</xml-formatter.version>
120120
<commons-lang.version>3.12.0</commons-lang.version>
121121
<netbeans.version>RELEASE120</netbeans.version>
122122
<jsoup.version>1.15.3</jsoup.version>
123-
<pmd.version>6.49.0</pmd.version>
123+
<pmd.version>6.53.0</pmd.version>
124124
<argLine></argLine>
125125
</properties>
126126

@@ -129,7 +129,7 @@
129129
<dependency>
130130
<groupId>org.eclipse.platform</groupId>
131131
<artifactId>org.eclipse.text</artifactId>
132-
<version>3.12.200</version>
132+
<version>3.12.300</version>
133133
<exclusions>
134134
<exclusion>
135135
<groupId>org.eclipse.platform</groupId>
@@ -146,7 +146,7 @@
146146
<dependency>
147147
<groupId>org.eclipse.jdt</groupId>
148148
<artifactId>org.eclipse.jdt.core</artifactId>
149-
<version>3.31.0</version>
149+
<version>3.32.0</version>
150150
<exclusions>
151151
<exclusion>
152152
<groupId>org.eclipse.platform</groupId>
@@ -249,7 +249,7 @@
249249
<dependency>
250250
<groupId>com.diffplug.spotless</groupId>
251251
<artifactId>spotless-lib</artifactId>
252-
<version>2.30.0</version>
252+
<version>2.31.1</version>
253253
</dependency>
254254

255255
<!-- XML Formatter -->
@@ -269,20 +269,20 @@
269269
<dependency>
270270
<groupId>com.fasterxml.jackson.core</groupId>
271271
<artifactId>jackson-core</artifactId>
272-
<version>2.14.0-rc1</version>
272+
<version>2.14.1</version>
273273
</dependency>
274274

275275
<dependency>
276276
<groupId>com.fasterxml.jackson.core</groupId>
277277
<artifactId>jackson-databind</artifactId>
278-
<version>2.14.0-rc1</version>
278+
<version>2.14.1</version>
279279
</dependency>
280280

281281
<!-- CSS Parser -->
282282
<dependency>
283283
<groupId>net.sourceforge.cssparser</groupId>
284284
<artifactId>cssparser</artifactId>
285-
<version>0.9.29</version>
285+
<version>0.9.30</version>
286286
</dependency>
287287

288288
<dependency>
@@ -525,7 +525,7 @@
525525
<plugin>
526526
<groupId>org.apache.maven.plugins</groupId>
527527
<artifactId>maven-install-plugin</artifactId>
528-
<version>3.0.1</version>
528+
<version>3.1.0</version>
529529
</plugin>
530530
<plugin>
531531
<groupId>org.apache.maven.plugins</groupId>
@@ -585,7 +585,7 @@
585585
<plugin>
586586
<groupId>net.revelc.code.formatter</groupId>
587587
<artifactId>formatter-maven-plugin</artifactId>
588-
<version>2.20.0</version>
588+
<version>2.21.0</version>
589589
</plugin>
590590
<plugin>
591591
<groupId>org.apache.maven.plugins</groupId>
@@ -647,7 +647,7 @@
647647
<plugin>
648648
<groupId>org.codehaus.mojo</groupId>
649649
<artifactId>versions-maven-plugin</artifactId>
650-
<version>2.12.0</version>
650+
<version>2.14.2</version>
651651
</plugin>
652652
<plugin>
653653
<groupId>org.codehaus.mojo</groupId>
@@ -680,13 +680,16 @@
680680
<plugin>
681681
<groupId>org.apache.maven.plugins</groupId>
682682
<artifactId>maven-dependency-plugin</artifactId>
683-
<version>3.3.0</version>
683+
<version>3.4.0</version>
684684
</plugin>
685685
<plugin>
686686
<groupId>org.jacoco</groupId>
687687
<artifactId>jacoco-maven-plugin</artifactId>
688688
<version>0.8.8</version>
689689
<configuration>
690+
<includes>
691+
<include>de/funfried/netbeans/plugins/external/formatter/**/*</include>
692+
</includes>
690693
<excludes>
691694
<exclude>de/funfried/netbeans/plugins/external/formatter/**/Bundle.class</exclude>
692695
<exclude>de/funfried/netbeans/plugins/external/formatter/**/ui/**/*</exclude>
@@ -733,12 +736,12 @@
733736
<plugin>
734737
<groupId>com.github.spotbugs</groupId>
735738
<artifactId>spotbugs-maven-plugin</artifactId>
736-
<version>4.7.2.0</version>
739+
<version>4.7.3.0</version>
737740
</plugin>
738741
<plugin>
739742
<groupId>org.owasp</groupId>
740743
<artifactId>dependency-check-maven</artifactId>
741-
<version>7.2.0</version>
744+
<version>7.4.4</version>
742745
<configuration>
743746
<failBuildOnCVSS>8</failBuildOnCVSS>
744747
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
@@ -756,29 +759,6 @@
756759
</pluginManagement>
757760

758761
<plugins>
759-
<plugin>
760-
<groupId>org.codehaus.mojo</groupId>
761-
<artifactId>keytool-maven-plugin</artifactId>
762-
<executions>
763-
<execution>
764-
<goals>
765-
<goal>generateKeyPair</goal>
766-
</goals>
767-
<phase>initialize</phase>
768-
</execution>
769-
</executions>
770-
<configuration>
771-
<keystore>${keystore.file}</keystore>
772-
<storepass>${keystore.pass}</storepass>
773-
<keypass>${keystore.pass}</keypass>
774-
<alias>${project.artifactId}</alias>
775-
<dname>CN=funfried.de, OU=${project.artifactId}, O=funfried.de, L=Schwaebisch Hall, ST=Baden-Wuerttemberg, C=DE</dname>
776-
<validity>730</validity>
777-
<keysize>2048</keysize>
778-
<sigalg>SHA512withRSA</sigalg>
779-
<keyalg>RSA</keyalg>
780-
</configuration>
781-
</plugin>
782762
<plugin>
783763
<groupId>org.apache.netbeans.utilities</groupId>
784764
<artifactId>nbm-maven-plugin</artifactId>
@@ -1118,6 +1098,29 @@
11181098
<id>release-commons</id>
11191099
<build>
11201100
<plugins>
1101+
<plugin>
1102+
<groupId>org.codehaus.mojo</groupId>
1103+
<artifactId>keytool-maven-plugin</artifactId>
1104+
<executions>
1105+
<execution>
1106+
<goals>
1107+
<goal>generateKeyPair</goal>
1108+
</goals>
1109+
<phase>initialize</phase>
1110+
</execution>
1111+
</executions>
1112+
<configuration>
1113+
<keystore>${keystore.file}</keystore>
1114+
<storepass>${keystore.pass}</storepass>
1115+
<keypass>${keystore.pass}</keypass>
1116+
<alias>${project.artifactId}</alias>
1117+
<dname>CN=funfried.de, OU=${project.artifactId}, O=funfried.de, L=Schwaebisch Hall, ST=Baden-Wuerttemberg, C=DE</dname>
1118+
<validity>730</validity>
1119+
<keysize>2048</keysize>
1120+
<sigalg>SHA512withRSA</sigalg>
1121+
<keyalg>RSA</keyalg>
1122+
</configuration>
1123+
</plugin>
11211124
<plugin>
11221125
<groupId>org.apache.maven.plugins</groupId>
11231126
<artifactId>maven-gpg-plugin</artifactId>

0 commit comments

Comments
 (0)