Skip to content

Commit 8569e30

Browse files
committed
GraalPy Maven archetype takes version from ${revision}
1 parent 0348589 commit 8569e30

File tree

3 files changed

+36
-10
lines changed

3 files changed

+36
-10
lines changed

DEVELOPMENT.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,4 @@ verbosity level.
9090

9191
## Changing version
9292

93-
- property `revision` in top level `pom.xml`
94-
- property `graalpy.version` in `graalpy-archetype-polyglot-app/src/main/resources/archetype-resources/pom.xml` (TODO: propagate from revision)
93+
- just update property `revision` in top level `pom.xml`, everything else should be derived from it

graalpy-archetype-polyglot-app/pom.xml

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,42 @@ SOFTWARE.
5858
<extension>
5959
<groupId>org.apache.maven.archetype</groupId>
6060
<artifactId>archetype-packaging</artifactId>
61-
<version>3.2.1</version>
61+
<version>3.4.0</version>
6262
</extension>
6363
</extensions>
6464

65+
<resources>
66+
<resource>
67+
<directory>src/main/resources</directory>
68+
<filtering>true</filtering>
69+
<includes>
70+
<include>archetype-resources/pom.xml</include>
71+
</includes>
72+
</resource>
73+
<resource>
74+
<directory>src/main/resources</directory>
75+
<filtering>false</filtering>
76+
<excludes>
77+
<exclude>archetype-resources/pom.xml</exclude>
78+
</excludes>
79+
</resource>
80+
</resources>
81+
82+
<plugins>
83+
<plugin>
84+
<groupId>org.apache.maven.plugins</groupId>
85+
<artifactId>maven-resources-plugin</artifactId>
86+
<configuration>
87+
<escapeString>\</escapeString>
88+
</configuration>
89+
</plugin>
90+
</plugins>
91+
6592
<pluginManagement>
6693
<plugins>
6794
<plugin>
6895
<artifactId>maven-archetype-plugin</artifactId>
69-
<version>3.2.1</version>
96+
<version>3.4.0</version>
7097
</plugin>
7198
</plugins>
7299
</pluginManagement>

graalpy-archetype-polyglot-app/src/main/resources/archetype-resources/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55

6-
<groupId>${groupId}</groupId>
7-
<artifactId>${artifactId}</artifactId>
8-
<version>${version}</version>
6+
<groupId>\${groupId}</groupId>
7+
<artifactId>\${artifactId}</artifactId>
8+
<version>\${version}</version>
99
<packaging>jar</packaging>
10-
<name>${artifactId}</name>
10+
<name>\${artifactId}</name>
1111

12-
#set( $symbol_dollar = '$' )
1312
<properties>
14-
<graalpy.version>26.0.0-SNAPSHOT</graalpy.version>
13+
<graalpy.version>${revision}</graalpy.version>
1514
<graalpy.edition>python-community</graalpy.edition>
1615
<native-maven-plugin.version>0.10.4</native-maven-plugin.version>
1716
<maven.compiler.target>17</maven.compiler.target>
1817
<maven.compiler.source>17</maven.compiler.source>
1918
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2019
</properties>
2120

21+
#set( $symbol_dollar = '$' )
2222
<dependencies>
2323
<dependency>
2424
<groupId>junit</groupId>

0 commit comments

Comments
 (0)