Skip to content

Commit a7e253c

Browse files
committed
POM: update parent to pom-scijava 45.1.0
And keep CI aligned with current practices.
1 parent bda8981 commit a7e253c

6 files changed

Lines changed: 15 additions & 31 deletions

File tree

‎.github/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
2-
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh
2+
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-build.sh
33
sh ci-build.sh

‎.github/setup.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
2-
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-setup-github-actions.sh
2+
curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-setup-github-actions.sh
33
sh ci-setup-github-actions.sh

‎.github/workflows/build-pr.yml‎

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,36 @@ name: build
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
tags:
88
- "*-[0-9]+.*"
9+
pull_request:
10+
branches:
11+
- main
912

1013
jobs:
1114
build:
1215
runs-on: ubuntu-latest
1316

1417
steps:
15-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v6
1619
- name: Set up Java
17-
uses: actions/setup-java@v3
20+
uses: actions/setup-java@v5
1821
with:
1922
java-version: '8'
2023
distribution: 'zulu'
2124
cache: 'maven'
2225
- name: Set up CI environment
2326
run: .github/setup.sh
27+
shell: bash
2428
- name: Execute the build
2529
run: .github/build.sh
30+
shell: bash
2631
env:
2732
GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }}
2833
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
2934
MAVEN_USER: ${{ secrets.MAVEN_USER }}
3035
MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
31-
OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
36+
CENTRAL_USER: ${{ secrets.CENTRAL_USER }}
37+
CENTRAL_PASS: ${{ secrets.CENTRAL_PASS }}
3238
SIGNING_ASC: ${{ secrets.SIGNING_ASC }}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![](https://github.com/scijava/scijava-ui-swing/actions/workflows/build-main.yml/badge.svg)](https://github.com/scijava/scijava-ui-swing/actions/workflows/build-main.yml)
1+
[![Build Status](https://github.com/scijava/scijava-ui-swing/actions/workflows/build.yml/badge.svg)](https://github.com/scijava/scijava-ui-swing/actions/workflows/build.yml)
22

33
SciJava Swing UI components
44
---------------------------

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>43.0.0</version>
8+
<version>45.1.0</version>
99
<relativePath />
1010
</parent>
1111

@@ -102,6 +102,7 @@
102102
</ciManagement>
103103

104104
<properties>
105+
<scijava.jvm.version>8</scijava.jvm.version>
105106
<package-name>org.scijava.ui.swing</package-name>
106107
<license.licenseName>bsd_2</license.licenseName>
107108
<license.copyrightOwners>SciJava developers.</license.copyrightOwners>

0 commit comments

Comments
 (0)