Skip to content

Commit e3b4b5e

Browse files
authored
Merge pull request #99 from beehive-lab/refactor/generalize-pom-profiles
Simplify and generalize TornadoVM version across JDK profiles in pom.xml
2 parents 6016f32 + 9df5a90 commit e3b4b5e

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838

3939
<properties>
4040
<!-- CI-friendly version: resolved by flatten-maven-plugin at build time -->
41-
<revision>0.4.0</revision>
42-
<jdk.version.suffix></jdk.version.suffix> <!-- empty=JDK21, -jdk25=JDK25 -->
43-
<!-- TornadoVM version: overridden per JDK profile -->
44-
<tornadovm.version>3.0.0</tornadovm.version> <!-- JDK21 default -->
41+
<revision>0.4.0-dev</revision>
42+
<tornadovm.base.version>3.0.0</tornadovm.base.version> <!-- TornadoVM base version (without jdk suffix) -->
43+
<jdk.version.suffix></jdk.version.suffix> <!-- JDK Suffix: empty=JDK21, -jdk25=JDK25 -->
44+
<tornadovm.version>${tornadovm.base.version}</tornadovm.version> <!-- Default: JDK21 (no suffix) -->
4545
<!-- Compiler defaults (overridden by JDK profiles below) -->
4646
<maven.compiler.source>21</maven.compiler.source>
4747
<maven.compiler.target>21</maven.compiler.target>
@@ -137,7 +137,7 @@
137137
<!-- ─── JDK 21 ───────────────────────────────────────────────────────────
138138
Auto-activates for JDK 21.x builds.
139139
Publishes: gpu-llama3:${revision} (no suffix)
140-
TornadoVM: 3.0.0
140+
TornadoVM: ${tornadovm.base.version}
141141
Adds add-modules jdk.incubator.vector (still incubating in JDK21)
142142
─────────────────────────────────────────────────────────────────────── -->
143143
<profile>
@@ -146,8 +146,8 @@
146146
<properties>
147147
<maven.compiler.source>21</maven.compiler.source>
148148
<maven.compiler.target>21</maven.compiler.target>
149-
<tornadovm.version>3.0.0</tornadovm.version>
150-
<jdk.version.suffix></jdk.version.suffix>
149+
<!-- JDK21 default - no jdk suffix needed -->
150+
<tornadovm.version>${tornadovm.base.version}</tornadovm.version>
151151
</properties>
152152
<build>
153153
<plugins>
@@ -169,7 +169,7 @@
169169
<!-- ─── JDK 25 ───────────────────────────────────────────────────────────
170170
Auto-activates for JDK 25.0.2+ builds (minimum required version).
171171
Publishes: gpu-llama3:${revision}-jdk25
172-
TornadoVM: 3.0.0-jdk25
172+
TornadoVM: ${tornadovm.base.version}-jdk25
173173
Vector API is still incubating in JDK 25 (JEP 508 — 10th Incubator);
174174
add-modules jdk.incubator.vector is required for compilation.
175175
─────────────────────────────────────────────────────────────────────── -->
@@ -179,8 +179,8 @@
179179
<properties>
180180
<maven.compiler.source>25</maven.compiler.source>
181181
<maven.compiler.target>25</maven.compiler.target>
182-
<tornadovm.version>3.0.0-jdk25</tornadovm.version>
183182
<jdk.version.suffix>-jdk25</jdk.version.suffix>
183+
<tornadovm.version>${tornadovm.base.version}${jdk.version.suffix}</tornadovm.version>
184184
</properties>
185185
<build>
186186
<plugins>

0 commit comments

Comments
 (0)