Skip to content

Commit 7807ad4

Browse files
committed
pom.xml edits to fix Github Actions errors on parser-simd
1 parent 5b2dbca commit 7807ad4

3 files changed

Lines changed: 18 additions & 39 deletions

File tree

‎parser-ng-simd/dependency-reduced-pom.xml‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,6 @@
3737
<argLine>--add-modules jdk.incubator.vector</argLine>
3838
</configuration>
3939
</plugin>
40-
<plugin>
41-
<groupId>org.codehaus.mojo</groupId>
42-
<artifactId>exec-maven-plugin</artifactId>
43-
<version>3.2.0</version>
44-
<configuration>
45-
<executable>java</executable>
46-
<arguments>
47-
<argument>--add-modules</argument>
48-
<argument>jdk.incubator.vector</argument>
49-
<argument>-classpath</argument>
50-
<classpath />
51-
<argument>com.github.gbenroscience.simd.turbo.tools.VectorTurboEvaluator</argument>
52-
</arguments>
53-
</configuration>
54-
</plugin>
5540
<plugin>
5641
<artifactId>maven-shade-plugin</artifactId>
5742
<version>3.5.2</version>
@@ -157,4 +142,7 @@
157142
<scope>provided</scope>
158143
</dependency>
159144
</dependencies>
145+
<properties>
146+
<maven.compiler.release>21</maven.compiler.release>
147+
</properties>
160148
</project>

‎parser-ng-simd/pom.xml‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
5+
https://maven.apache.org/xsd/maven-4.0.0.xsd">
66

7+
<modelVersion>4.0.0</modelVersion>
78
<parent>
89
<groupId>com.github.gbenroscience</groupId>
910
<artifactId>parser-ng-parent</artifactId>
@@ -13,23 +14,28 @@
1314

1415
<artifactId>parser-ng-simd</artifactId>
1516
<packaging>jar</packaging>
16-
1717
<name>ParserNG SIMD Extension</name>
1818
<description>Hardware-accelerated SIMD vector calculation pipelines for ParserNG</description>
1919
<url>https://github.com/gbenroscience/ParserNG</url>
2020

21+
<properties>
22+
<!-- This module requires Java 21+ because of Vector API -->
23+
<maven.compiler.release>21</maven.compiler.release>
24+
</properties>
25+
2126
<dependencies>
2227
<dependency>
2328
<groupId>com.github.gbenroscience</groupId>
2429
<artifactId>parser-ng</artifactId>
25-
<version>${project.version}</version>
30+
<version>${project.version}</version>
2631
</dependency>
2732
<dependency>
2833
<groupId>org.codehaus.janino</groupId>
2934
<artifactId>janino</artifactId>
3035
<version>3.1.12</version>
3136
</dependency>
3237

38+
<!-- Test dependencies -->
3339
<dependency>
3440
<groupId>org.junit.jupiter</groupId>
3541
<artifactId>junit-jupiter-api</artifactId>
@@ -48,7 +54,6 @@
4854
<version>5.10.3</version>
4955
<scope>test</scope>
5056
</dependency>
51-
5257
<dependency>
5358
<groupId>org.openjdk.jmh</groupId>
5459
<artifactId>jmh-core</artifactId>
@@ -68,7 +73,7 @@
6873
<plugin>
6974
<groupId>org.apache.maven.plugins</groupId>
7075
<artifactId>maven-compiler-plugin</artifactId>
71-
<version>3.11.0</version>
76+
<version>3.13.0</version> <!-- Updated to newer version -->
7277
<configuration>
7378
<release>21</release>
7479
<annotationProcessorPaths>
@@ -94,22 +99,7 @@
9499
</configuration>
95100
</plugin>
96101

97-
<plugin>
98-
<groupId>org.codehaus.mojo</groupId>
99-
<artifactId>exec-maven-plugin</artifactId>
100-
<version>3.2.0</version>
101-
<configuration>
102-
<executable>java</executable>
103-
<arguments>
104-
<argument>--add-modules</argument>
105-
<argument>jdk.incubator.vector</argument>
106-
<argument>-classpath</argument>
107-
<classpath/>
108-
<argument>com.github.gbenroscience.simd.turbo.tools.VectorTurboEvaluator</argument>
109-
</arguments>
110-
</configuration>
111-
</plugin>
112-
102+
<!-- JMH Benchmark shading -->
113103
<plugin>
114104
<groupId>org.apache.maven.plugins</groupId>
115105
<artifactId>maven-shade-plugin</artifactId>
@@ -144,4 +134,5 @@
144134
</plugin>
145135
</plugins>
146136
</build>
137+
147138
</project>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
</modules>
2020

2121
<properties>
22-
<maven.compiler.source>17</maven.compiler.source>
23-
<maven.compiler.target>17</maven.compiler.target>
22+
<maven.compiler.source>8</maven.compiler.source>
23+
<maven.compiler.target>8</maven.compiler.target>
2424
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2525
</properties>
2626

0 commit comments

Comments
 (0)