Skip to content

Commit 51d2e91

Browse files
frenchy64frenchy64
committed
simplify mvn release
1 parent b2d6247 commit 51d2e91

File tree

38 files changed

+279
-170
lines changed

38 files changed

+279
-170
lines changed

‎.github/workflows/clj.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Test and deploy
22

33
on:
4+
#FIXME double builds on self pull requests
45
pull_request:
56
push:
67
schedule:
@@ -118,7 +119,7 @@ jobs:
118119
with:
119120
distribution: 'temurin'
120121
java-version: ${{ env.DEPLOY_JDK }}
121-
- uses: DeLaGuardo/setup-clojure@13.1
122+
- uses: DeLaGuardo/setup-clojure@13.4
122123
with:
123124
cli: ${{ env.CLOJURE_CLI_VERSION }}
124125
bb: ${{env.BABASHKA_VERSION}}

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,6 @@ junit-output.xml
3030
node_modules
3131
package-lock.json
3232
package.json
33+
.flattened-pom.xml
34+
release.properties
35+
*.releaseBackup

‎dev/resources/module-template/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<artifactId>{&module-artifact-id&}</artifactId>
77
<description>FIXME</description>
88
<name>{&module-artifact-id&}</name>
9-
<version>{◊typedclojure-current-mvn-version◊}</version>
109

1110
<licenses>
1211
<license>
@@ -19,7 +18,7 @@
1918
<parent>
2019
<groupId>{◊typedclojure-group-id◊}</groupId>
2120
<artifactId>pom.typed</artifactId>
22-
<version>{◊typedclojure-current-mvn-version◊}</version>
21+
<version>${revision}</version>
2322
<relativePath>../..</relativePath>
2423
</parent>
2524
</project>

‎dev/resources/root-templates/pom.xml

Lines changed: 79 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>{◊typedclojure-group-id◊}</groupId>
66
<artifactId>pom.typed</artifactId>
7-
<version>{◊typedclojure-current-mvn-version◊}</version>
7+
<version>${revision}</version>
88
<name>pom</name>
99
<description>An optional type system for Clojure</description>
1010
<packaging>pom</packaging>
@@ -17,20 +17,17 @@
1717
</license>
1818
</licenses>
1919

20-
<!--
21-
<parent>
22-
<groupId>org.clojure</groupId>
23-
<artifactId>pom.contrib</artifactId>
24-
<version>0.3.0</version>
25-
</parent>
26-
-->
27-
2820
<properties>
2921
<clojure.warnOnReflection>true</clojure.warnOnReflection>
3022
<clojure.version>{◊clojure-mvn-version◊}</clojure.version>
3123
<clojure.source.dir>src</clojure.source.dir>
3224
<clojure.testSource.dir>test</clojure.testSource.dir>
25+
<!-- https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
26+
<!--<project.build.outputTimestamp>${git.commit.time}</project.build.outputTimestamp>-->
27+
<project.build.outputTimestamp>2023-01-01T00:00:00Z</project.build.outputTimestamp>
28+
<dateFormatTimeZone>UTC</dateFormatTimeZone>
3329
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
30+
<revision>{◊typedclojure-current-mvn-version◊}</revision>
3431
</properties>
3532

3633
<distributionManagement>
@@ -47,25 +44,78 @@
4744
</distributionManagement>
4845

4946
<build>
47+
<!--
5048
<sourceDirectory>java-src</sourceDirectory>
5149
<scriptSourceDirectory>scripts-src</scriptSourceDirectory>
5250
<testSourceDirectory>java-test</testSourceDirectory>
51+
-->
5352
<resources>
5453
<resource>
5554
<directory>resources</directory>
5655
</resource>
5756
</resources>
57+
<!--
5858
<testResources>
5959
<testResource>
6060
<directory>resources-test</directory>
6161
</testResource>
6262
</testResources>
63+
-->
6364
<plugins>
65+
<!--
66+
<plugin>
67+
<groupId>io.github.git-commit-id</groupId>
68+
<artifactId>git-commit-id-maven-plugin</artifactId>
69+
<version>9.0.2</version>
70+
<executions>
71+
<execution>
72+
<id>get-the-git-infos</id>
73+
<goals>
74+
<goal>revision</goal>
75+
</goals>
76+
<phase>initialize</phase>
77+
</execution>
78+
</executions>
79+
<configuration>
80+
<generateGitPropertiesFile>true</generateGitPropertiesFile>
81+
<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
82+
<includeOnlyProperties>
83+
<includeOnlyProperty>^git.branch$</includeOnlyProperty>
84+
<includeOnlyProperty>^git.commit.id$</includeOnlyProperty>
85+
</includeOnlyProperties>
86+
</configuration>
87+
</plugin>
88+
-->
89+
<plugin>
90+
<groupId>org.codehaus.mojo</groupId>
91+
<artifactId>flatten-maven-plugin</artifactId>
92+
<version>1.7.0</version>
93+
<configuration>
94+
<updatePomFile>true</updatePomFile>
95+
<flattenMode>oss</flattenMode>
96+
</configuration>
97+
<executions>
98+
<execution>
99+
<id>flatten</id>
100+
<phase>process-resources</phase>
101+
<goals>
102+
<goal>flatten</goal>
103+
</goals>
104+
</execution>
105+
<execution>
106+
<id>flatten.clean</id>
107+
<phase>clean</phase>
108+
<goals>
109+
<goal>clean</goal>
110+
</goals>
111+
</execution>
112+
</executions>
113+
</plugin>
64114
<plugin>
65115
<!-- Add Clojure sources to the project's source directories -->
66116
<groupId>org.codehaus.mojo</groupId>
67117
<artifactId>build-helper-maven-plugin</artifactId>
68-
<version>3.3.0</version>
118+
<version>3.6.0</version>
69119
<executions>
70120
<execution>
71121
<id>add-clojure-source-dirs</id>
@@ -116,6 +166,7 @@
116166
<encoding>${project.build.sourceEncoding}</encoding>
117167
</configuration>
118168
</plugin>
169+
<!--
119170
<plugin>
120171
<groupId>com.theoryinpractise</groupId>
121172
<artifactId>clojure-maven-plugin</artifactId>
@@ -137,10 +188,11 @@
137188
</execution>
138189
</executions>
139190
</plugin>
191+
-->
140192
<plugin>
141193
<groupId>org.apache.maven.plugins</groupId>
142194
<artifactId>maven-release-plugin</artifactId>
143-
<version>2.5.3</version>
195+
<version>3.1.1</version>
144196
<configuration>
145197
<autoVersionSubmodules>true</autoVersionSubmodules>
146198
<tagNameFormat>@{project.version}</tagNameFormat>
@@ -187,68 +239,67 @@
187239
<dependency>
188240
<groupId>org.clojars.typedclojure-clojars</groupId>
189241
<artifactId>alpha.spec</artifactId>
190-
<!-- sha: {◊typedclojure-alpha-spec-git-sha◊} -->
191242
<version>{◊typedclojure-alpha-spec-mvn-version◊}</version>
192243
</dependency>
193244
<dependency>
194245
<groupId>{◊typedclojure-group-id◊}</groupId>
195246
<artifactId>typed.cljc.analyzer</artifactId>
196-
<version>{◊typedclojure-current-mvn-version◊}</version>
247+
<version>${project.version}</version>
197248
</dependency>
198249
<dependency>
199250
<groupId>{◊typedclojure-group-id◊}</groupId>
200251
<artifactId>typed.cljs.analyzer</artifactId>
201-
<version>{◊typedclojure-current-mvn-version◊}</version>
252+
<version>${project.version}</version>
202253
</dependency>
203254
<dependency>
204255
<groupId>{◊typedclojure-group-id◊}</groupId>
205256
<artifactId>typed.clj.analyzer</artifactId>
206-
<version>{◊typedclojure-current-mvn-version◊}</version>
257+
<version>${project.version}</version>
207258
</dependency>
208259
<dependency>
209260
<groupId>{◊typedclojure-group-id◊}</groupId>
210261
<artifactId>typed.cljs.checker</artifactId>
211-
<version>{◊typedclojure-current-mvn-version◊}</version>
262+
<version>${project.version}</version>
212263
</dependency>
213264
<dependency>
214265
<groupId>{◊typedclojure-group-id◊}</groupId>
215266
<artifactId>typed.clj.checker</artifactId>
216-
<version>{◊typedclojure-current-mvn-version◊}</version>
267+
<version>${project.version}</version>
217268
</dependency>
218269
<dependency>
219270
<groupId>{◊typedclojure-group-id◊}</groupId>
220271
<artifactId>typed.clj.runtime</artifactId>
221-
<version>{◊typedclojure-current-mvn-version◊}</version>
272+
<version>${project.version}</version>
222273
</dependency>
223274
<dependency>
224275
<groupId>{◊typedclojure-group-id◊}</groupId>
225276
<artifactId>typed.cljs.runtime</artifactId>
226-
<version>{◊typedclojure-current-mvn-version◊}</version>
277+
<version>${project.version}</version>
227278
</dependency>
228279
<dependency>
229280
<groupId>{◊typedclojure-group-id◊}</groupId>
230281
<artifactId>typed.lib.clojure</artifactId>
231-
<version>{◊typedclojure-current-mvn-version◊}</version>
282+
<version>${project.version}</version>
232283
</dependency>
233284
<dependency>
234285
<groupId>{◊typedclojure-group-id◊}</groupId>
235286
<artifactId>typed.lib.core.async</artifactId>
236-
<version>{◊typedclojure-current-mvn-version◊}</version>
287+
<version>${project.version}</version>
237288
</dependency>
238289
<dependency>
239290
<groupId>{◊typedclojure-group-id◊}</groupId>
240291
<artifactId>typed.lib.spec.alpha</artifactId>
241-
<version>{◊typedclojure-current-mvn-version◊}</version>
292+
<version>${project.version}</version>
242293
</dependency>
243294
<dependency>
244295
<groupId>{◊typedclojure-group-id◊}</groupId>
245296
<artifactId>typed.clj.spec</artifactId>
246-
<version>{◊typedclojure-current-mvn-version◊}</version>
297+
<version>${project.version}</version>
247298
</dependency>
248299
<dependency>
249300
<groupId>{◊typedclojure-group-id◊}</groupId>
250301
<artifactId>typed.malli</artifactId>
251-
<version>{◊typedclojure-current-mvn-version◊}</version>
302+
<version>${project.version}</version>
252303
</dependency>
253304
<dependency>
254305
<groupId>org.clojure</groupId>
@@ -336,19 +387,21 @@
336387
</developers>
337388

338389
<repositories>
390+
<!--
339391
<repository>
340392
<id>sonatype-oss-public</id>
341393
<url>{◊sonatype-oss-public-url◊}</url>
342394
</repository>
395+
-->
343396
<repository>
344397
<id>clojars</id>
345398
<url>{◊clojars-url◊}</url>
346399
</repository>
347400
</repositories>
348401

349402
<scm>
350-
<connection>scm:git:git://github.com/typedclojure/typedclojure.git</connection>
351-
<developerConnection>scm:git:git://github.com/typedclojure/typedclojure.git</developerConnection>
403+
<connection>{◊typedclojure-scm-connection◊}</connection>
404+
<developerConnection>{◊typedclojure-scm-developerConnection◊}</developerConnection>
352405
<url>{◊typedclojure-git-https-url◊}</url>
353406
<tag>HEAD</tag>
354407
</scm>

‎dev/resources/root-templates/typed/clj.analyzer/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<artifactId>typed.clj.analyzer</artifactId>
77
<description>A variant of tools.analyzer.jvm.</description>
88
<name>typed.clj.analyzer</name>
9-
<version>{◊typedclojure-current-mvn-version◊}</version>
109

1110
<licenses>
1211
<license>
@@ -19,7 +18,7 @@
1918
<parent>
2019
<groupId>{◊typedclojure-group-id◊}</groupId>
2120
<artifactId>pom.typed</artifactId>
22-
<version>{◊typedclojure-current-mvn-version◊}</version>
21+
<version>${revision}</version>
2322
<relativePath>../..</relativePath>
2423
</parent>
2524

‎dev/resources/root-templates/typed/clj.checker/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<artifactId>typed.clj.checker</artifactId>
77
<name>typed.clj.checker</name>
88
<description>An optional type system for Clojure — full system for annotating and type-checking.</description>
9-
<version>{◊typedclojure-current-mvn-version◊}</version>
109

1110
<licenses>
1211
<license>
@@ -19,7 +18,7 @@
1918
<parent>
2019
<groupId>{◊typedclojure-group-id◊}</groupId>
2120
<artifactId>pom.typed</artifactId>
22-
<version>{◊typedclojure-current-mvn-version◊}</version>
21+
<version>${revision}</version>
2322
<relativePath>../..</relativePath>
2423
</parent>
2524

‎dev/resources/root-templates/typed/clj.runtime/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<artifactId>typed.clj.runtime</artifactId>
77
<description>An optional type system for Clojure — zero-dependency artifact for annotations only.</description>
88
<name>typed.clj.runtime</name>
9-
<version>{◊typedclojure-current-mvn-version◊}</version>
10-
<packaging>clojure</packaging>
119

1210
<licenses>
1311
<license>
@@ -20,7 +18,7 @@
2018
<parent>
2119
<groupId>{◊typedclojure-group-id◊}</groupId>
2220
<artifactId>pom.typed</artifactId>
23-
<version>{◊typedclojure-current-mvn-version◊}</version>
21+
<version>${revision}</version>
2422
<relativePath>../..</relativePath>
2523
</parent>
2624

@@ -35,6 +33,7 @@
3533
</repository>
3634
</repositories>
3735

36+
<!--
3837
<build>
3938
<plugins>
4039
<plugin>
@@ -52,6 +51,7 @@
5251
</plugin>
5352
</plugins>
5453
</build>
54+
-->
5555

5656
<dependencies>
5757
<dependency>

‎dev/resources/root-templates/typed/clj.spec/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<artifactId>typed.clj.spec</artifactId>
77
<description>Type-like specs.</description>
88
<name>typed.clj.spec</name>
9-
<version>{◊typedclojure-current-mvn-version◊}</version>
109

1110
<licenses>
1211
<license>
@@ -19,7 +18,7 @@
1918
<parent>
2019
<groupId>{◊typedclojure-group-id◊}</groupId>
2120
<artifactId>pom.typed</artifactId>
22-
<version>{◊typedclojure-current-mvn-version◊}</version>
21+
<version>${revision}</version>
2322
<relativePath>../..</relativePath>
2423
</parent>
2524

‎dev/resources/root-templates/typed/cljc.analyzer/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<artifactId>typed.cljc.analyzer</artifactId>
77
<description>A variant of tools.analyzer.</description>
88
<name>typed.cljc.analyzer</name>
9-
<version>{◊typedclojure-current-mvn-version◊}</version>
109

1110
<licenses>
1211
<license>
@@ -19,7 +18,7 @@
1918
<parent>
2019
<groupId>{◊typedclojure-group-id◊}</groupId>
2120
<artifactId>pom.typed</artifactId>
22-
<version>{◊typedclojure-current-mvn-version◊}</version>
21+
<version>${revision}</version>
2322
<relativePath>../..</relativePath>
2423
</parent>
2524

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy