Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'zulu'
java-version: '21'
distribution: 'temurin'

- name: Cache Maven packages
uses: actions/cache@v3
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
- name: Set up Java
uses: actions/setup-java@v4
with:
java-version: '8'
distribution: 'zulu'
java-version: '21'
distribution: 'temurin'

# Needed if the cache is out of whack and needs to be totally refreshed
# - name: Clear Maven cache
Expand All @@ -25,6 +25,7 @@ jobs:
rm -rf ~/.m2/repository/com/github/*
rm -rf ~/.m2/repository/io/github/*
rm -rf ~/.m2/repository/org/bonej/*
rm -rf ~/.m2/repository/ch/beancounter/*

- name: Cache Maven packages
uses: actions/cache@v3
Expand All @@ -37,7 +38,7 @@ jobs:
- name: Set up Maven settings
uses: s4u/maven-settings-action@v2
with:
servers: '[{"id": "github", "username": "${{ github.actor }}", "password": "${{ secrets.BONEJ_PLUS_REPO }}"}]'
servers: '[{"id": "github-bonej-plus", "username": "${{ github.actor }}", "password": "${{ secrets.BONEJ_PLUS_REPO }}"},{"id": "github-beancounter", "username": "${{ github.actor }}", "password": "${{ secrets.BONEJ_PLUS_REPO }}"}]'
githubServer: false

- name: Set up CI environment
Expand Down
2 changes: 2 additions & 0 deletions Legacy/util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<!-- TODO remove this version override once scijava catches up -->
<version>5.20.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 2 additions & 0 deletions Modern/utilities/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<!-- TODO remove this version override once scijava catches up -->
<version>5.20.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
9 changes: 3 additions & 6 deletions Modern/wrapperPlugins/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,7 @@
<groupId>org.bonej</groupId>
<artifactId>bonej-ops</artifactId>
</dependency>
<dependency>
<groupId>org.bonej</groupId>
<artifactId>bonej-plus</artifactId>
<version>0.0.11</version>
</dependency>


<!-- ImageJ dependencies -->
<dependency>
<groupId>net.imagej</groupId>
Expand Down Expand Up @@ -245,6 +240,8 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<!-- TODO remove this version override once scijava catches up -->
<version>5.20.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand Down

This file was deleted.

26 changes: 25 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,24 @@
<license.copyrightOwners>Michael Doube, BoneJ developers</license.copyrightOwners>
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
<tagNameFormat>bonej-@{project.version}</tagNameFormat>
<maven.compiler.release>8</maven.compiler.release>
</properties>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<configuration>
<release>${maven.compiler.release}</release>
</configuration>
</plugin>

</plugins>
</pluginManagement>
</build>

<repositories>
<repository>
Expand All @@ -129,10 +146,17 @@
<snapshots><enabled>false</enabled></snapshots>
</repository>
<repository>
<id>github</id>
<id>github-bonej-plus</id>
<url>https://maven.pkg.github.com/bonej-org/bonej-plus</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>
<repository>
<id>github-beancounter</id>
<url>https://maven.pkg.github.com/bonej-org/beancounter</url>
<releases><enabled>false</enabled></releases>
<snapshots><enabled>true</enabled></snapshots>
</repository>

</repositories>
</project>
Loading