Skip to content

Commit f542d23

Browse files
dfa1dfa1
committed
manual maven cleanups
1 parent 56bba49 commit f542d23

7 files changed

Lines changed: 34 additions & 30 deletions

File tree

‎cli/pom.xml‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,16 @@
2020
<groupId>io.github.dfa1.vortex</groupId>
2121
<artifactId>reader</artifactId>
2222
</dependency>
23+
<!-- testing -->
2324
<dependency>
2425
<groupId>org.junit.jupiter</groupId>
2526
<artifactId>junit-jupiter</artifactId>
27+
<scope>test</scope>
2628
</dependency>
2729
<dependency>
2830
<groupId>org.assertj</groupId>
2931
<artifactId>assertj-core</artifactId>
32+
<scope>test</scope>
3033
</dependency>
3134
</dependencies>
3235

@@ -44,27 +47,6 @@
4447
</includes>
4548
</configuration>
4649
</plugin>
47-
<plugin>
48-
<groupId>org.apache.maven.plugins</groupId>
49-
<artifactId>maven-antrun-plugin</artifactId>
50-
<executions>
51-
<execution>
52-
<id>generate-launcher</id>
53-
<phase>package</phase>
54-
<goals>
55-
<goal>run</goal>
56-
</goals>
57-
<configuration>
58-
<target>
59-
<echo file="${project.build.directory}/vortex">#!/bin/sh
60-
exec java --sun-misc-unsafe-memory-access=allow -jar "$(dirname "$0")/vortex.jar" "$@"
61-
</echo>
62-
<chmod file="${project.build.directory}/vortex" perm="755"/>
63-
</target>
64-
</configuration>
65-
</execution>
66-
</executions>
67-
</plugin>
6850
<plugin>
6951
<groupId>org.apache.maven.plugins</groupId>
7052
<artifactId>maven-shade-plugin</artifactId>
@@ -80,9 +62,6 @@ exec java --sun-misc-unsafe-memory-access=allow -jar "$(dirname "$0")/vortex.jar
8062
<transformer
8163
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
8264
<mainClass>io.github.dfa1.vortex.cli.VortexCli</mainClass>
83-
<manifestEntries>
84-
<Enable-Native-Access>ALL-UNNAMED</Enable-Native-Access>
85-
</manifestEntries>
8665
</transformer>
8766
<transformer
8867
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>

‎core/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,21 @@
2020
<groupId>com.google.protobuf</groupId>
2121
<artifactId>protobuf-java</artifactId>
2222
</dependency>
23+
<!-- testing -->
2324
<dependency>
2425
<groupId>org.junit.jupiter</groupId>
2526
<artifactId>junit-jupiter</artifactId>
27+
<scope>test</scope>
2628
</dependency>
2729
<dependency>
2830
<groupId>org.assertj</groupId>
2931
<artifactId>assertj-core</artifactId>
32+
<scope>test</scope>
3033
</dependency>
3134
<dependency>
3235
<groupId>org.mockito</groupId>
3336
<artifactId>mockito-junit-jupiter</artifactId>
37+
<scope>test</scope>
3438
</dependency>
3539
</dependencies>
3640

‎csv/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,21 @@
2424
<groupId>de.siegmar</groupId>
2525
<artifactId>fastcsv</artifactId>
2626
</dependency>
27+
<!-- testing -->
2728
<dependency>
2829
<groupId>org.junit.jupiter</groupId>
2930
<artifactId>junit-jupiter</artifactId>
31+
<scope>test</scope>
3032
</dependency>
3133
<dependency>
3234
<groupId>org.assertj</groupId>
3335
<artifactId>assertj-core</artifactId>
36+
<scope>test</scope>
3437
</dependency>
3538
<dependency>
3639
<groupId>org.mockito</groupId>
3740
<artifactId>mockito-junit-jupiter</artifactId>
41+
<scope>test</scope>
3842
</dependency>
3943
</dependencies>
4044
</project>

‎performance/pom.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,41 @@
1111

1212
<artifactId>performance</artifactId>
1313

14-
<properties>
15-
<!-- override: benchmarks are not unit tests -->
16-
<maven.test.skip>true</maven.test.skip>
17-
</properties>
18-
1914
<dependencies>
2015
<dependency>
2116
<groupId>io.github.dfa1.vortex</groupId>
2217
<artifactId>writer</artifactId>
18+
<scope>compile</scope>
2319
</dependency>
2420
<dependency>
2521
<groupId>io.github.dfa1.vortex</groupId>
2622
<artifactId>reader</artifactId>
23+
<scope>compile</scope>
2724
</dependency>
2825
<dependency>
2926
<groupId>dev.vortex</groupId>
3027
<artifactId>vortex-jni</artifactId>
28+
<scope>compile</scope>
3129
</dependency>
3230
<dependency>
3331
<groupId>org.apache.arrow</groupId>
3432
<artifactId>arrow-vector</artifactId>
33+
<scope>compile</scope>
3534
</dependency>
3635
<dependency>
3736
<groupId>org.apache.arrow</groupId>
3837
<artifactId>arrow-c-data</artifactId>
38+
<scope>compile</scope>
3939
</dependency>
4040
<dependency>
4141
<groupId>org.apache.arrow</groupId>
4242
<artifactId>arrow-memory-unsafe</artifactId>
43+
<scope>compile</scope>
4344
</dependency>
4445
<dependency>
4546
<groupId>org.openjdk.jmh</groupId>
4647
<artifactId>jmh-core</artifactId>
48+
<scope>compile</scope>
4749
</dependency>
4850
<dependency>
4951
<groupId>org.openjdk.jmh</groupId>

‎pom.xml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,15 @@
2222
<properties>
2323
<maven.compiler.release>25</maven.compiler.release>
2424
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
25+
<!-- production -->
2526
<flatbuffers.version>25.2.10</flatbuffers.version>
2627
<protobuf.version>4.35.0</protobuf.version>
28+
<fastcsv.version>3.6.0</fastcsv.version>
29+
<!-- testing -->
2730
<junit.version>5.11.4</junit.version>
2831
<assertj.version>3.27.7</assertj.version>
2932
<mockito.version>5.14.2</mockito.version>
3033
<jqwik.version>1.9.3</jqwik.version>
31-
<fastcsv.version>3.6.0</fastcsv.version>
3234
<vortex-jni.version>0.72.0</vortex-jni.version>
3335
<arrow.version>19.0.0</arrow.version>
3436
<slf4j.version>2.0.18</slf4j.version>
@@ -100,31 +102,37 @@
100102
<groupId>dev.vortex</groupId>
101103
<artifactId>vortex-jni</artifactId>
102104
<version>${vortex-jni.version}</version>
105+
<scope>test</scope>
103106
</dependency>
104107
<dependency>
105108
<groupId>org.apache.arrow</groupId>
106109
<artifactId>arrow-vector</artifactId>
107110
<version>${arrow.version}</version>
111+
<scope>test</scope>
108112
</dependency>
109113
<dependency>
110114
<groupId>org.apache.arrow</groupId>
111115
<artifactId>arrow-c-data</artifactId>
112116
<version>${arrow.version}</version>
117+
<scope>test</scope>
113118
</dependency>
114119
<dependency>
115120
<groupId>org.apache.arrow</groupId>
116121
<artifactId>arrow-memory-unsafe</artifactId>
117122
<version>${arrow.version}</version>
123+
<scope>test</scope>
118124
</dependency>
119125
<dependency>
120126
<groupId>org.slf4j</groupId>
121127
<artifactId>slf4j-nop</artifactId>
122128
<version>${slf4j.version}</version>
129+
<scope>test</scope>
123130
</dependency>
124131
<dependency>
125132
<groupId>org.slf4j</groupId>
126133
<artifactId>slf4j-simple</artifactId>
127134
<version>${slf4j.version}</version>
135+
<scope>test</scope>
128136
</dependency>
129137
<dependency>
130138
<groupId>org.openjdk.jmh</groupId>

‎reader/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,17 @@
2727
<dependency>
2828
<groupId>org.junit.jupiter</groupId>
2929
<artifactId>junit-jupiter</artifactId>
30+
<scope>test</scope>
3031
</dependency>
3132
<dependency>
3233
<groupId>org.assertj</groupId>
3334
<artifactId>assertj-core</artifactId>
35+
<scope>test</scope>
3436
</dependency>
3537
<dependency>
3638
<groupId>org.mockito</groupId>
3739
<artifactId>mockito-junit-jupiter</artifactId>
40+
<scope>test</scope>
3841
</dependency>
3942
</dependencies>
4043
</project>

‎writer/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<groupId>com.google.protobuf</groupId>
2525
<artifactId>protobuf-java</artifactId>
2626
</dependency>
27+
<!-- testing -->
2728
<dependency>
2829
<groupId>io.github.dfa1.vortex</groupId>
2930
<artifactId>reader</artifactId>
@@ -32,14 +33,17 @@
3233
<dependency>
3334
<groupId>org.junit.jupiter</groupId>
3435
<artifactId>junit-jupiter</artifactId>
36+
<scope>test</scope>
3537
</dependency>
3638
<dependency>
3739
<groupId>org.assertj</groupId>
3840
<artifactId>assertj-core</artifactId>
41+
<scope>test</scope>
3942
</dependency>
4043
<dependency>
4144
<groupId>org.mockito</groupId>
4245
<artifactId>mockito-junit-jupiter</artifactId>
46+
<scope>test</scope>
4347
</dependency>
4448
</dependencies>
4549
</project>

0 commit comments

Comments
 (0)