Skip to content

Commit ad9d6bc

Browse files
authored
use bonej-plus 0.0.12 (#386)
* Remove the GPU Checker It belongs in bonej-plus and created problems being included here. * Remove explicit beancounter dependency * remove dependency on bonej-plus This created a circular dependency which breaks the Maven dependency model.
1 parent 47911f2 commit ad9d6bc

File tree

4 files changed

+11
-150
lines changed

4 files changed

+11
-150
lines changed

.github/workflows/build-pr.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
rm -rf ~/.m2/repository/com/github/*
2626
rm -rf ~/.m2/repository/io/github/*
2727
rm -rf ~/.m2/repository/org/bonej/*
28+
rm -rf ~/.m2/repository/ch/beancounter/*
2829
2930
- name: Cache Maven packages
3031
uses: actions/cache@v3
@@ -37,7 +38,7 @@ jobs:
3738
- name: Set up Maven settings
3839
uses: s4u/maven-settings-action@v2
3940
with:
40-
servers: '[{"id": "github", "username": "${{ github.actor }}", "password": "${{ secrets.BONEJ_PLUS_REPO }}"}]'
41+
servers: '[{"id": "github-bonej-plus", "username": "${{ github.actor }}", "password": "${{ secrets.BONEJ_PLUS_REPO }}"},{"id": "github-beancounter", "username": "${{ github.actor }}", "password": "${{ secrets.BONEJ_PLUS_REPO }}"}]'
4142
githubServer: false
4243

4344
- name: Set up CI environment

Modern/wrapperPlugins/pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,7 @@
124124
<groupId>org.bonej</groupId>
125125
<artifactId>bonej-ops</artifactId>
126126
</dependency>
127-
<dependency>
128-
<groupId>org.bonej</groupId>
129-
<artifactId>bonej-plus</artifactId>
130-
<version>0.0.11</version>
131-
</dependency>
132-
127+
133128
<!-- ImageJ dependencies -->
134129
<dependency>
135130
<groupId>net.imagej</groupId>

Modern/wrapperPlugins/src/main/java/org/bonej/wrapperPlugins/GPUCheckerWrapper.java

Lines changed: 0 additions & 142 deletions
This file was deleted.

pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,17 @@
129129
<snapshots><enabled>false</enabled></snapshots>
130130
</repository>
131131
<repository>
132-
<id>github</id>
132+
<id>github-bonej-plus</id>
133133
<url>https://maven.pkg.github.com/bonej-org/bonej-plus</url>
134134
<releases><enabled>false</enabled></releases>
135135
<snapshots><enabled>true</enabled></snapshots>
136136
</repository>
137+
<repository>
138+
<id>github-beancounter</id>
139+
<url>https://maven.pkg.github.com/bonej-org/beancounter</url>
140+
<releases><enabled>false</enabled></releases>
141+
<snapshots><enabled>true</enabled></snapshots>
142+
</repository>
143+
137144
</repositories>
138145
</project>

0 commit comments

Comments
 (0)