Refactor pom and update version

.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/

.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

.gitignore

@@ -7,3 +7,4 @@
 build
 dist
 target
+dependency-reduced-pom.xml

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.cellprofiler</groupId>
     <artifactId>prokaryote</artifactId>
-    <version>2.4.4</version>
+    <version>2.4.5</version>
     <dependencies>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -503,45 +503,9 @@
     </contributors>
     <repositories>
         <repository>
-            <id>sonatype-nexus-releases</id>
-            <name>Sonatype Nexus Releases</name>
-            <url>https://oss.sonatype.org/content/repositories/releases</url>
-        </repository>
-        <repository>
-            <id>imagej.public</id>
-            <url>http://maven.imagej.net/content/groups/public</url>
-        </repository>
-        <repository>
-            <id>ome.releases</id>
-            <url>http://artifacts.openmicroscopy.org/artifactory/ome.releases</url>
-        </repository>
-        <repository>
-            <id>ome.snapshots</id>
-            <url>http://artifacts.openmicroscopy.org/artifactory/ome.snapshots</url>
-        </repository>
-        <repository>
-            <id>ome-web-prod.lifesci.dundee.ac.uk</id>
-            <url>http://artifacts.openmicroscopy.org/artifactory/springsource-release</url>
-        </repository>
-        <repository>
-            <id>com.springsource.repository.bundles.release</id>
-            <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
-            <url>http://repository.springsource.com/maven/bundles/release</url>
-        </repository>
-        <repository>
-            <id>com.springsource.repository.bundles.external</id>
-            <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
-            <url>http://repository.springsource.com/maven/bundles/external</url>
-        </repository>
-        <repository>
-            <id>com.springsource.repository.libraries.release</id>
-            <name>SpringSource Enterprise Bundle Repository - SpringSource Library Releases</name>
-            <url>http://repository.springsource.com/maven/libraries/release</url>
-        </repository>
-        <repository>
-            <id>com.springsource.repository.libraries.external</id>
-            <name>SpringSource Enterprise Bundle Repository - External Library Releases</name>
-            <url>http://repository.springsource.com/maven/libraries/external</url>
+            <id>scijava-public</id>
+            <name>SciJava</name>
+            <url>https://maven.scijava.org/content/groups/public</url>
         </repository>
     </repositories>
     <issueManagement>

prokaryote/__init__.py

@@ -1 +1 @@
-__version__ = "2.4.4"
+__version__ = "2.4.5"