Skip to content

Commit 885985b

Browse files
committed
build: minor changes to build/ci files
1 parent afe2ebb commit 885985b

File tree

4 files changed

+17
-22
lines changed

4 files changed

+17
-22
lines changed

.github/copilot-instructions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ ls -la
108108
- Uses PicoCLI for command parsing, Maven Resolver for dependency resolution
109109

110110
## CI and Release Information
111-
- CI runs on Ubuntu with Java 11 (Temurin distribution)
111+
- CI runs on Ubuntu with Java 21 (Temurin distribution)
112112
- Build command: `mvn -B verify jreleaser:assemble -Prelease`
113113
- Spotless formatting check is enforced - builds fail if formatting is incorrect
114114
- Release uses JReleaser for GitHub releases and Maven Central deployment

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ${{ matrix.os }}
2222
strategy:
2323
matrix:
24-
os: [ubuntu-latest, windows-latest]
24+
os: [ubuntu-latest, windows-latest, macos-latest]
2525

2626
steps:
2727
- uses: actions/checkout@v5

jreleaser.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ assemble:
4545
jpm-native:
4646
active: NEVER
4747
java:
48-
version: '22'
48+
version: '25'
4949
imageName: '{{distributionName}}-{{projectEffectiveVersion}}'
5050
executable: jpm
5151
mainJar:
52-
path: 'target/jpm-{{projectVersion}}-cli.jar'
52+
path: 'target/{{distributionName}}-{{projectVersion}}-cli.jar'
5353
graalJdks:
54-
- path: 'C:\Users\tako\.jbang\cache\jdks\22'
54+
- path: 'C:\Users\tako\.jbang\cache\jdks\25'
5555
platform: 'windows-x86_64'
5656
upx:
5757
active: NEVER

pom.xml

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<mainClass>org.codejive.jpm.Main</mainClass>
3535
<version.mima>2.4.35</version.mima>
3636
<version.search-backend>7.1.6</version.search-backend>
37+
<version.jline>3.30.6</version.jline>
3738
<version.picocli>4.7.7</version.picocli>
3839
<version.snakeyaml>2.5</version.snakeyaml>
39-
<version.jline>3.30.6</version.jline>
4040
<version.slf4j>2.0.17</version.slf4j>
4141
<version.spotless>3.0.0</version.spotless>
4242
<version.google-java-format>1.22.0</version.google-java-format>
@@ -61,16 +61,6 @@
6161
<artifactId>search-backend-smo</artifactId>
6262
<version>${version.search-backend}</version>
6363
</dependency>
64-
<dependency>
65-
<groupId>info.picocli</groupId>
66-
<artifactId>picocli</artifactId>
67-
<version>${version.picocli}</version>
68-
</dependency>
69-
<dependency>
70-
<groupId>org.yaml</groupId>
71-
<artifactId>snakeyaml</artifactId>
72-
<version>${version.snakeyaml}</version>
73-
</dependency>
7464
<dependency>
7565
<groupId>org.jline</groupId>
7666
<artifactId>jline-console-ui</artifactId>
@@ -81,6 +71,16 @@
8171
<artifactId>jline-terminal-jni</artifactId>
8272
<version>${version.jline}</version>
8373
</dependency>
74+
<dependency>
75+
<groupId>info.picocli</groupId>
76+
<artifactId>picocli</artifactId>
77+
<version>${version.picocli}</version>
78+
</dependency>
79+
<dependency>
80+
<groupId>org.yaml</groupId>
81+
<artifactId>snakeyaml</artifactId>
82+
<version>${version.snakeyaml}</version>
83+
</dependency>
8484
<dependency>
8585
<groupId>org.slf4j</groupId>
8686
<artifactId>slf4j-api</artifactId>
@@ -137,11 +137,6 @@
137137
<artifactId>build-helper-maven-plugin</artifactId>
138138
<version>3.6.1</version>
139139
</plugin>
140-
<plugin>
141-
<groupId>org.apache.maven.plugins</groupId>
142-
<artifactId>maven-surefire-plugin</artifactId>
143-
<version>3.5.4</version>
144-
</plugin>
145140
<plugin>
146141
<groupId>org.apache.maven.plugins</groupId>
147142
<artifactId>maven-failsafe-plugin</artifactId>
@@ -439,4 +434,4 @@
439434
<developerConnection>scm:git:git@github.com:codejive/java-jpm.git</developerConnection>
440435
<url>http://github.com/codejive/java-jpm</url>
441436
</scm>
442-
</project>
437+
</project>

0 commit comments

Comments
 (0)