diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 10f4f06..9c73abc 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -5,37 +5,34 @@ name: Java CI with Maven
on:
push:
- branches: [ master ]
+ branches: [master]
pull_request:
- branches: [ master ]
+ branches: [master]
jobs:
build:
-
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-python@v2
- with:
- architecture: x64
- python-version: 3.8
- - name: Setup Java JDK
- uses: actions/setup-java@v2.1.0
- with:
- java-version: 8
- distribution: adopt
- - name: Build with Maven
- run: |
- mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -e --settings .mvn/custom-settings.xml
- mvn test -B --settings .mvn/custom-settings.xml
- - name: Build Python package
- run: python setup.py sdist
- - name: Upload a Build Artifact
- uses: actions/upload-artifact@v2.2.4
- with:
- # Artifact name
- name: prokaryote-2.4.4.tar.gz
- path: dist/
-
-
+ - uses: actions/checkout@v2
+ - uses: actions/setup-python@v2
+ with:
+ architecture: x64
+ python-version: 3.8
+ - name: Setup Java JDK
+ uses: actions/setup-java@v2.1.0
+ with:
+ java-version: 8
+ distribution: adopt
+ - name: Build with Maven
+ run: |
+ mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -e
+ mvn test -B
+ - name: Build Python package
+ run: python setup.py sdist
+ - name: Upload a Build Artifact
+ uses: actions/upload-artifact@v2.2.4
+ with:
+ # Artifact name
+ name: prokaryote-2.4.4.tar.gz
+ path: dist/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9e0b0b8..eea54cd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,36 +10,35 @@ on:
jobs:
build:
-
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-python@v2
- with:
- architecture: x64
- python-version: 3.8
- - name: Setup Java JDK
- uses: actions/setup-java@v2.1.0
- with:
- java-version: 8
- distribution: adopt
- - name: Build with Maven
- run: |
- mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -e --settings .mvn/custom-settings.xml
- mvn test -B --settings .mvn/custom-settings.xml
- - name: Build Python package
- run: python setup.py sdist
- - id: get_version
- uses: battila7/get-version-action@v2
- - name: Upload a Build Artifact
- uses: actions/upload-artifact@v2.2.4
- with:
- # Artifact name
- name: prokaryote-${{ steps.get_version.outputs.version-without-v }}.tar.gz
- path: dist/
- - name: pypi-publish
- uses: pypa/gh-action-pypi-publish@v1.4.2
- with:
- password: ${{ secrets.PYPITOKEN }}
- skip_existing: True
+ - uses: actions/checkout@v2
+ - uses: actions/setup-python@v2
+ with:
+ architecture: x64
+ python-version: 3.8
+ - name: Setup Java JDK
+ uses: actions/setup-java@v2.1.0
+ with:
+ java-version: 8
+ distribution: adopt
+ - name: Build with Maven
+ run: |
+ mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -e
+ mvn test -B
+ - name: Build Python package
+ run: python setup.py sdist
+ - id: get_version
+ uses: battila7/get-version-action@v2
+ - name: Upload a Build Artifact
+ uses: actions/upload-artifact@v2.2.4
+ with:
+ # Artifact name
+ name: prokaryote-${{ steps.get_version.outputs.version-without-v }}.tar.gz
+ path: dist/
+ - name: pypi-publish
+ uses: pypa/gh-action-pypi-publish@v1.4.2
+ with:
+ password: ${{ secrets.PYPITOKEN }}
+ skip_existing: True
diff --git a/.gitignore b/.gitignore
index 1558811..5eb139e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
build
dist
target
+dependency-reduced-pom.xml
\ No newline at end of file
diff --git a/.mvn/custom-settings.xml b/.mvn/custom-settings.xml
deleted file mode 100644
index e0362ee..0000000
--- a/.mvn/custom-settings.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
- imagej-public-unblocker
- imagej.public
- imagej.public
- http://maven.imagej.net/content/groups/public
- false
-
-
- ome-releases-unblocker
- ome.releases
- ome.releases
- http://artifacts.openmicroscopy.org/artifactory/ome.releases
- false
-
-
- ome-snapshots-unblocker
- ome.snapshots
- ome.snapshots
- http://artifacts.openmicroscopy.org/artifactory/ome.snapshots
- false
-
-
- ome-web-prod-lifesci-unblocker
- ome-web-prod.lifesci.dundee.ac.uk
- ome-web-prod.lifesci.dundee.ac.uk
- http://artifacts.openmicroscopy.org/artifactory/springsource-release
- false
-
-
- springsource-repository-bundles-release-unblocker
- com.springsource.repository.bundles.release
- com.springsource.repository.bundles.release
- http://repository.springsource.com/maven/bundles/release
- false
-
-
- springsource-repository-bundles-external-unblocker
- com.springsource.repository.bundles.external
- com.springsource.repository.bundles.external
- http://repository.springsource.com/maven/bundles/external
- false
-
-
- springsource-repository-libraries-release-unblocker
- com.springsource.repository.libraries.release
- com.springsource.repository.libraries.release
- http://repository.springsource.com/maven/libraries/release
- false
-
-
- springsource-repository-libraries-external-unblocker
- com.springsource.repository.libraries.external
- com.springsource.repository.libraries.external
- http://repository.springsource.com/maven/libraries/external
- false
-
-
-
diff --git a/pom.xml b/pom.xml
index 9525540..30699e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
org.cellprofiler
prokaryote
- 2.4.4
+ 2.4.5
org.apache.commons
@@ -503,45 +503,9 @@
- sonatype-nexus-releases
- Sonatype Nexus Releases
- https://oss.sonatype.org/content/repositories/releases
-
-
- imagej.public
- http://maven.imagej.net/content/groups/public
-
-
- ome.releases
- http://artifacts.openmicroscopy.org/artifactory/ome.releases
-
-
- ome.snapshots
- http://artifacts.openmicroscopy.org/artifactory/ome.snapshots
-
-
- ome-web-prod.lifesci.dundee.ac.uk
- http://artifacts.openmicroscopy.org/artifactory/springsource-release
-
-
- com.springsource.repository.bundles.release
- SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases
- http://repository.springsource.com/maven/bundles/release
-
-
- com.springsource.repository.bundles.external
- SpringSource Enterprise Bundle Repository - External Bundle Releases
- http://repository.springsource.com/maven/bundles/external
-
-
- com.springsource.repository.libraries.release
- SpringSource Enterprise Bundle Repository - SpringSource Library Releases
- http://repository.springsource.com/maven/libraries/release
-
-
- com.springsource.repository.libraries.external
- SpringSource Enterprise Bundle Repository - External Library Releases
- http://repository.springsource.com/maven/libraries/external
+ scijava-public
+ SciJava
+ https://maven.scijava.org/content/groups/public
diff --git a/prokaryote/__init__.py b/prokaryote/__init__.py
index afe4dee..71c852b 100644
--- a/prokaryote/__init__.py
+++ b/prokaryote/__init__.py
@@ -1 +1 @@
-__version__ = "2.4.4"
+__version__ = "2.4.5"