Skip to content

Commit 5bd422c

Browse files
swannodetteswannodette
committed
Merge branch 'master' into adv-source-map-sources
2 parents aa718af + 90a40f6 commit 5bd422c

File tree

14 files changed

+490
-257
lines changed

14 files changed

+490
-257
lines changed

‎.github/workflows/test.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
# Runtime Tests
6363
runtime-windows-test:
6464
name: Runtime Windows Tests
65-
runs-on: windows-2019
65+
runs-on: windows-2022
6666
steps:
6767
- uses: actions/checkout@v2
6868

@@ -215,7 +215,7 @@ jobs:
215215
# Compiler Windows Tests
216216
compiler-windows-test:
217217
name: Compiler Windows Tests
218-
runs-on: windows-2019
218+
runs-on: windows-2022
219219
steps:
220220
- uses: actions/checkout@v2
221221

‎pom.template.xml‎

Lines changed: 92 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -203,20 +203,6 @@
203203
<url>https://github.com/clojure/clojurescript</url>
204204
</scm>
205205

206-
<!--
207-
<parent>
208-
<groupId>org.clojure</groupId>
209-
<artifactId>pom.contrib</artifactId>
210-
<version>0.1.2</version>
211-
</parent>
212-
-->
213-
214-
<parent>
215-
<groupId>org.sonatype.oss</groupId>
216-
<artifactId>oss-parent</artifactId>
217-
<version>7</version>
218-
</parent>
219-
220206
<properties>
221207
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
222208
<clojure.source.dir>src/main/clojure</clojure.source.dir>
@@ -226,13 +212,39 @@
226212
<directlinking>true</directlinking>
227213
</properties>
228214

215+
<distributionManagement>
216+
<repository>
217+
<id>central</id>
218+
<url>https://central.sonatype.com</url>
219+
</repository>
220+
<snapshotRepository>
221+
<id>central-snapshot</id>
222+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
223+
</snapshotRepository>
224+
</distributionManagement>
225+
229226
<build>
230227
<plugins>
228+
<plugin>
229+
<groupId>org.apache.maven.plugins</groupId>
230+
<artifactId>maven-source-plugin</artifactId>
231+
<version>3.3.1</version>
232+
<executions>
233+
<execution>
234+
<id>attach-sources</id>
235+
<phase>package</phase>
236+
<goals>
237+
<goal>jar</goal>
238+
</goals>
239+
</execution>
240+
</executions>
241+
</plugin>
242+
231243
<plugin>
232244
<!-- Add Clojure sources to the project's source directories -->
233245
<groupId>org.codehaus.mojo</groupId>
234246
<artifactId>build-helper-maven-plugin</artifactId>
235-
<version>1.5</version>
247+
<version>3.0.0</version>
236248
<executions>
237249
<execution>
238250
<id>add-clojure-source-dirs</id>
@@ -286,7 +298,7 @@
286298
</plugin>
287299
<plugin>
288300
<artifactId>maven-jar-plugin</artifactId>
289-
<version>2.4</version>
301+
<version>3.4.2</version>
290302
<configuration>
291303
<archive>
292304
<manifest>
@@ -314,11 +326,24 @@
314326
</includes>
315327
</configuration>
316328
</execution>
329+
<execution>
330+
<id>javadoc-jar</id>
331+
<phase>package</phase>
332+
<goals>
333+
<goal>jar</goal>
334+
</goals>
335+
<configuration>
336+
<excludes>
337+
<exclude>**</exclude>
338+
</excludes>
339+
<classifier>javadoc</classifier>
340+
</configuration>
341+
</execution>
317342
</executions>
318343
</plugin>
319344
<plugin>
320345
<artifactId>maven-assembly-plugin</artifactId>
321-
<version>2.4</version>
346+
<version>3.7.1</version>
322347
<executions>
323348
<execution>
324349
<id>aot-jar</id>
@@ -352,62 +377,71 @@
352377
<artifactId>maven-gpg-plugin</artifactId>
353378
<version>3.1.0</version>
354379
<configuration>
355-
<gpgArguments>
356-
<arg>--pinentry-mode</arg>
357-
<arg>loopback</arg>
358-
</gpgArguments>
380+
<gpgArguments>
381+
<arg>--pinentry-mode</arg>
382+
<arg>loopback</arg>
383+
</gpgArguments>
359384
</configuration>
360385
</plugin>
361386
<plugin>
362387
<groupId>org.apache.maven.plugins</groupId>
363388
<artifactId>maven-compiler-plugin</artifactId>
364-
<version>3.1</version>
389+
<version>3.8.1</version>
365390
<configuration>
366391
<source>21</source>
367392
<target>21</target>
368393
</configuration>
369394
</plugin>
395+
396+
<plugin>
397+
<!-- do not push pre-deployment SCM changes to upstream repo
398+
with maven release plugin; if the release/deploy fails,
399+
we're stuck with manually fixing up version numbers, git
400+
history, etc -->
401+
<groupId>org.apache.maven.plugins</groupId>
402+
<artifactId>maven-release-plugin</artifactId>
403+
<version>2.5.3</version>
404+
<configuration>
405+
</configuration>
406+
</plugin>
407+
408+
<!-- deploy artifacts to sonatype -->
409+
<plugin>
410+
<groupId>org.sonatype.central</groupId>
411+
<artifactId>central-publishing-maven-plugin</artifactId>
412+
<version>0.7.0</version>
413+
<extensions>true</extensions>
414+
<configuration>
415+
<publishingServerId>central</publishingServerId>
416+
<autoPublish>true</autoPublish>
417+
</configuration>
418+
</plugin>
419+
370420
</plugins>
371421
</build>
372422

373423
<profiles>
374424
<profile>
375-
<id>sonatype-oss-release</id>
376-
<!-- This profile is enabled automatically by the Sonatype
377-
oss-parent POM when invoking the Maven Release Plugin -->
378-
<build>
379-
<plugins>
380-
<plugin>
381-
<groupId>org.apache.maven.plugins</groupId>
382-
<artifactId>maven-deploy-plugin</artifactId>
383-
<version>2.7</version>
384-
<configuration>
385-
<skip>true</skip>
386-
</configuration>
387-
</plugin>
388-
<plugin>
389-
<groupId>org.sonatype.plugins</groupId>
390-
<artifactId>nexus-staging-maven-plugin</artifactId>
391-
<version>1.7.0</version>
392-
<executions>
393-
<execution>
394-
<id>default-deploy</id>
395-
<phase>deploy</phase>
396-
<!-- By default, this is the phase deploy goal will bind to -->
397-
<goals>
398-
<goal>deploy</goal>
399-
</goals>
400-
</execution>
401-
</executions>
402-
<configuration>
403-
<!-- The Base URL of Nexus instance where we want to stage -->
404-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
405-
<!-- The server "id" element from settings to use authentication from -->
406-
<serverId>sonatype-nexus-staging</serverId>
407-
</configuration>
408-
</plugin>
409-
</plugins>
410-
</build>
425+
<id>sign</id>
426+
<build>
427+
<plugins>
428+
<!-- sign artifacts for deployment -->
429+
<plugin>
430+
<groupId>org.apache.maven.plugins</groupId>
431+
<artifactId>maven-gpg-plugin</artifactId>
432+
<version>1.5</version>
433+
<executions>
434+
<execution>
435+
<id>sign-artifacts</id>
436+
<phase>verify</phase>
437+
<goals>
438+
<goal>sign</goal>
439+
</goals>
440+
</execution>
441+
</executions>
442+
</plugin>
443+
</plugins>
444+
</build>
411445
</profile>
412446
</profiles>
413447
</project>

0 commit comments

Comments
 (0)