diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
index 38197d4b..74b123ff 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -47,7 +47,7 @@ jobs:
if: ${{ needs.check-java-version.outputs.changed == 'true' }}
- name: Deploy PycroManagerJava.jar to Sonatype OSS
+ name: Deploy PycroManagerJava.jar to Maven central
runs-on: ubuntu-latest
steps:
@@ -65,18 +65,17 @@ jobs:
with: # running setup-java again overwrites the settings.xml
java-version: 8
distribution: 'zulu'
-
- server-id: ossrh
- server-username: OSSRH_USERNAME
- server-password: OSSRH_PASSWORD
+ server-id: central
+ server-username: MAVEN_USERNAME
+ server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE
- name: Publish to Apache Maven Central
run: mvn deploy --file java/pom.xml -Dgpg.passphrase=${{ secrets.MAVEN_GPG_PASSPHRASE }}
env:
- OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
- OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+ OSSRH_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+ OSSRH_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
diff --git a/java/pom.xml b/java/pom.xml
index ae5abb19..7c1ad3aa 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -23,7 +23,7 @@
nicost
Nico Stuurman
- UCSF/HHMI
+ UCSF
@@ -55,7 +55,7 @@
org.micro-manager.acqengj
AcqEngJ
- 0.39.0
+ 0.39.2
org.micro-manager.ndviewer
@@ -111,11 +111,11 @@
sign
-
-
- --pinentry-mode
- loopback
-
+
+
+ --pinentry-mode
+ loopback
+
@@ -123,17 +123,15 @@
- org.sonatype.plugins
- nexus-staging-maven-plugin
- 1.6.13
- true
-
- ossrh
- https://s01.oss.sonatype.org/
- true
- 20
-
-
+ org.sonatype.central
+ central-publishing-maven-plugin
+ 0.8.0
+ true
+
+ central
+ true
+ published
+
@@ -148,4 +146,4 @@
-
\ No newline at end of file
+
diff --git a/pycromanager/test/conftest.py b/pycromanager/test/conftest.py
index 1c5992fc..66a19938 100644
--- a/pycromanager/test/conftest.py
+++ b/pycromanager/test/conftest.py
@@ -55,13 +55,17 @@ def install_mm():
if is_port_in_use(4827):
print('Using Micro-manager running on port 4827 for testing')
yield
- elif find_existing_mm_install():
+ try:
+ path = find_existing_mm_install()
print('Micro-Manager is already installed, skipping installation')
- yield find_existing_mm_install()
- else:
+ yield path
+ except FileNotFoundError:
+ print("No Micro-Manager installation found, installing now")
# Download an install latest nightly build
mm_install_dir = download_and_install_mm(destination='auto')
+ print('Micro-Manager installed in ' + mm_install_dir)
+
#### Replace with newer versions of Java libraries ####
# find pycro-manager/java path
if os.path.isdir('java'):