updates to publish artifacts

locationtech · Sep 28, 2021 · 72716ee · 72716ee
1 parent 215458e
commit 72716ee
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 48 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -45,35 +45,35 @@ jobs:
     - name: Publish Artifacts
       run: ./.utility/publish-artifacts.sh
 
-    - name: Generate Changelog
-      uses: heinrichreimer/[email protected]
-      with:
-        issues: true
-        issuesWoLabels: true
-        pullRequests: true
-        prWoLabels: true
-        author: true
-        unreleased: true
-        stripGeneratorNotice: true
-        verbose: true
-        compareLink: true
-        httpCache: true
-        filterByMilestone: true
+#    - name: Generate Changelog
+#      uses: heinrichreimer/[email protected]
+#      with:
+#        issues: true
+#        issuesWoLabels: true
+#        pullRequests: true
+#        prWoLabels: true
+#        author: true
+#        unreleased: true
+#        stripGeneratorNotice: true
+#        verbose: true
+#        compareLink: true
+#        httpCache: true
+#        filterByMilestone: true
 
-    - name: Convert Changelog to HTML
-      uses: docker://pandoc/core:2.9
-      with:
-        args: "-f markdown -t html -s -c stylesheets/changelog.css -o changelog.html CHANGELOG.md"
+    #- name: Convert Changelog to HTML
+     # uses: docker://pandoc/core:2.9
+     # with:
+     #   args: "-f markdown -t html -s -c stylesheets/changelog.css -o changelog.html CHANGELOG.md"
 
-    - name: Build HTML Docs
-      run: mvn -P html -pl docs install -DskipTests -Dspotbugs.skip      
+    #- name: Build HTML Docs
+    #  run: mvn -P html -pl docs install -DskipTests -Dspotbugs.skip      
 
-    - name: Build Aggregate Javadocs
-      run: mvn javadoc:aggregate -B -DskipTests -Dspotbugs.skip
+    #- name: Build Aggregate Javadocs
+    #  run: mvn javadoc:aggregate -B -DskipTests -Dspotbugs.skip
 
-    - name: Build Python Docs
-      run: ./.utility/build-python-docs.sh
+    #- name: Build Python Docs
+    #  run: ./.utility/build-python-docs.sh
 
-    - name: Publish Docs to GH-Pages
-      run: ./.utility/publish-docs.sh
+    #- name: Publish Docs to GH-Pages
+    #  run: ./.utility/publish-docs.sh
 
diff --git a/.utility/publish-artifacts.sh b/.utility/publish-artifacts.sh
@@ -16,26 +16,26 @@ if ! curl --head --silent --fail  https://oss.sonatype.org/service/local/reposit
     popd
 fi
 echo -e "Deploying geowave artifacts..."
-# mvn deploy --settings .utility/.maven.xml -DskipTests -Dspotbugs.skip -B -U -Prelease
+mvn deploy --settings .utility/.maven.xml -DskipTests -Dspotbugs.skip -B -U -Prelease
 
 # Get the version from the build.properties file
 filePath=deploy/target/classes/build.properties
 GEOWAVE_VERSION=$(grep project.version $filePath|  awk -F= '{print $2}')
 
 # Don't publish snapshots to PyPi
-if [[ ! "$GEOWAVE_VERSION" =~ "SNAPSHOT" ]] ; then
-  if [[ -z "${PYPI_CREDENTIALS}" ]]; then
-    echo -e "No PyPi credentials, skipping PyPi distribution..."
-  else
-    echo -e "Deploying pygw to PyPi..."
-    pushd python/src/main/python
-    python3 -m venv publish-venv
-    source ./publish-venv/bin/activate
-    python3 -m pip install --upgrade pip
-    pip3 install --upgrade pip wheel setuptools twine
-    python3 setup.py bdist_wheel --python-tag=py3 sdist
-    twine upload --skip-existing -u __token__ -p $PYPI_CREDENTIALS dist/*
-    deactivate
-    popd
-  fi
-fi 
+#if [[ ! "$GEOWAVE_VERSION" =~ "SNAPSHOT" ]] ; then
+#  if [[ -z "${PYPI_CREDENTIALS}" ]]; then
+#    echo -e "No PyPi credentials, skipping PyPi distribution..."
+#  else
+#    echo -e "Deploying pygw to PyPi..."
+#    pushd python/src/main/python
+#    python3 -m venv publish-venv
+#    source ./publish-venv/bin/activate
+#    python3 -m pip install --upgrade pip
+#    pip3 install --upgrade pip wheel setuptools twine
+#    python3 setup.py bdist_wheel --python-tag=py3 sdist
+#    twine upload --skip-existing -u __token__ -p $PYPI_CREDENTIALS dist/*
+#    deactivate
+#    popd
+#  fi
+#fi 
diff --git a/pom.xml b/pom.xml
@@ -185,11 +185,6 @@
 				<artifactId>jetty-http</artifactId>
 				<version>${jetty.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jetty</groupId>
-				<artifactId>jetty-util</artifactId>
-				<version>${jetty.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.eclipse.jetty</groupId>
 				<artifactId>jetty-webapp</artifactId>
@@ -1487,6 +1482,7 @@
 						<configuration>
 							<serverId>ossrh</serverId>
 							<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+							<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
 							<autoReleaseAfterClose>true</autoReleaseAfterClose>
 						</configuration>
 					</plugin>