Skip to content

Commit 42162b5

Browse files
funfriedfunfried
authored
Merge pull request #236 from funfried/release/1.15.x
Added signing of nbm via keystore as requested by the NetBeans team t…
2 parents 7e0d218 + 2c0b80e commit 42162b5

2 files changed

Lines changed: 70 additions & 14 deletions

File tree

‎.ci.settings.xml‎

Lines changed: 21 additions & 0 deletions
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,6 +108,7 @@
88108
<id>ci</id>
89109
<properties>
90110
<repoToken>${env.repoToken}</repoToken>
111+
<keystore.pass>${env.signing_keypass}</keystore.pass>
91112
<gpg.passphrase>${env.signing_keypass}</gpg.passphrase>
92113
<skipRemoteStaging>${env.skipRemoteStaging}</skipRemoteStaging>
93114
</properties>

‎pom.xml‎

Lines changed: 49 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,14 @@
113113
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
114114
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
115115
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
116+
<keystore.file>${project.build.directory}/keystore</keystore.file>
116117
<google-java-format.version>1.15.0</google-java-format.version>
117-
<palantir-java-format.version>2.27.0</palantir-java-format.version>
118+
<palantir-java-format.version>2.28.0</palantir-java-format.version>
118119
<xml-formatter.version>0.2.2</xml-formatter.version>
119120
<commons-lang.version>3.12.0</commons-lang.version>
120121
<netbeans.version>RELEASE120</netbeans.version>
121122
<jsoup.version>1.15.3</jsoup.version>
122-
<pmd.version>6.49.0</pmd.version>
123+
<pmd.version>6.53.0</pmd.version>
123124
<argLine></argLine>
124125
</properties>
125126

@@ -128,7 +129,7 @@
128129
<dependency>
129130
<groupId>org.eclipse.platform</groupId>
130131
<artifactId>org.eclipse.text</artifactId>
131-
<version>3.12.200</version>
132+
<version>3.12.300</version>
132133
<exclusions>
133134
<exclusion>
134135
<groupId>org.eclipse.platform</groupId>
@@ -145,7 +146,7 @@
145146
<dependency>
146147
<groupId>org.eclipse.jdt</groupId>
147148
<artifactId>org.eclipse.jdt.core</artifactId>
148-
<version>3.31.0</version>
149+
<version>3.32.0</version>
149150
<exclusions>
150151
<exclusion>
151152
<groupId>org.eclipse.platform</groupId>
@@ -248,7 +249,7 @@
248249
<dependency>
249250
<groupId>com.diffplug.spotless</groupId>
250251
<artifactId>spotless-lib</artifactId>
251-
<version>2.30.0</version>
252+
<version>2.31.1</version>
252253
</dependency>
253254

254255
<!-- XML Formatter -->
@@ -268,20 +269,20 @@
268269
<dependency>
269270
<groupId>com.fasterxml.jackson.core</groupId>
270271
<artifactId>jackson-core</artifactId>
271-
<version>2.14.0-rc1</version>
272+
<version>2.14.1</version>
272273
</dependency>
273274

274275
<dependency>
275276
<groupId>com.fasterxml.jackson.core</groupId>
276277
<artifactId>jackson-databind</artifactId>
277-
<version>2.14.0-rc1</version>
278+
<version>2.14.1</version>
278279
</dependency>
279280

280281
<!-- CSS Parser -->
281282
<dependency>
282283
<groupId>net.sourceforge.cssparser</groupId>
283284
<artifactId>cssparser</artifactId>
284-
<version>0.9.29</version>
285+
<version>0.9.30</version>
285286
</dependency>
286287

287288
<dependency>
@@ -524,7 +525,7 @@
524525
<plugin>
525526
<groupId>org.apache.maven.plugins</groupId>
526527
<artifactId>maven-install-plugin</artifactId>
527-
<version>3.0.1</version>
528+
<version>3.1.0</version>
528529
</plugin>
529530
<plugin>
530531
<groupId>org.apache.maven.plugins</groupId>
@@ -571,6 +572,11 @@
571572
<doUpdate>false</doUpdate>
572573
</configuration>
573574
</plugin>
575+
<plugin>
576+
<groupId>org.codehaus.mojo</groupId>
577+
<artifactId>keytool-maven-plugin</artifactId>
578+
<version>1.6</version>
579+
</plugin>
574580
<plugin>
575581
<groupId>org.apache.maven.plugins</groupId>
576582
<artifactId>maven-gpg-plugin</artifactId>
@@ -579,7 +585,7 @@
579585
<plugin>
580586
<groupId>net.revelc.code.formatter</groupId>
581587
<artifactId>formatter-maven-plugin</artifactId>
582-
<version>2.20.0</version>
588+
<version>2.21.0</version>
583589
</plugin>
584590
<plugin>
585591
<groupId>org.apache.maven.plugins</groupId>
@@ -641,7 +647,7 @@
641647
<plugin>
642648
<groupId>org.codehaus.mojo</groupId>
643649
<artifactId>versions-maven-plugin</artifactId>
644-
<version>2.12.0</version>
650+
<version>2.14.2</version>
645651
</plugin>
646652
<plugin>
647653
<groupId>org.codehaus.mojo</groupId>
@@ -674,13 +680,16 @@
674680
<plugin>
675681
<groupId>org.apache.maven.plugins</groupId>
676682
<artifactId>maven-dependency-plugin</artifactId>
677-
<version>3.3.0</version>
683+
<version>3.4.0</version>
678684
</plugin>
679685
<plugin>
680686
<groupId>org.jacoco</groupId>
681687
<artifactId>jacoco-maven-plugin</artifactId>
682688
<version>0.8.8</version>
683689
<configuration>
690+
<includes>
691+
<include>de/funfried/netbeans/plugins/external/formatter/**/*</include>
692+
</includes>
684693
<excludes>
685694
<exclude>de/funfried/netbeans/plugins/external/formatter/**/Bundle.class</exclude>
686695
<exclude>de/funfried/netbeans/plugins/external/formatter/**/ui/**/*</exclude>
@@ -727,12 +736,12 @@
727736
<plugin>
728737
<groupId>com.github.spotbugs</groupId>
729738
<artifactId>spotbugs-maven-plugin</artifactId>
730-
<version>4.7.2.0</version>
739+
<version>4.7.3.0</version>
731740
</plugin>
732741
<plugin>
733742
<groupId>org.owasp</groupId>
734743
<artifactId>dependency-check-maven</artifactId>
735-
<version>7.2.0</version>
744+
<version>7.4.4</version>
736745
<configuration>
737746
<failBuildOnCVSS>8</failBuildOnCVSS>
738747
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
@@ -760,6 +769,9 @@
760769
<distributionUrl>https://github.com/funfried/eclipsecodeformatter_for_netbeans/</distributionUrl>
761770
<author>Fabian Bahle (info@funfried.de) and others / original authors: benno.markiewicz@googlemail.com, geertjan.wielenga@oracle.com and williescholtz@gmail.com</author>
762771
<verifyRuntime>warn</verifyRuntime>
772+
<keystore>${keystore.file}</keystore>
773+
<keystorealias>${project.artifactId}</keystorealias>
774+
<keystorepassword>${keystore.pass}</keystorepassword>
763775
</configuration>
764776
</plugin>
765777
<plugin>
@@ -1086,6 +1098,29 @@
10861098
<id>release-commons</id>
10871099
<build>
10881100
<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>
10891124
<plugin>
10901125
<groupId>org.apache.maven.plugins</groupId>
10911126
<artifactId>maven-gpg-plugin</artifactId>

0 commit comments

Comments
 (0)