Standalone workflows, upgraded dependencies, updated link to Maven Ce…

…ntral
robertvazan · Nov 12, 2023 · 6f193f2 · 6f193f2
1 parent 8c26f27
commit 6f193f2
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 52 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,7 +8,20 @@ on:
   workflow_dispatch:
 jobs:
   build:
-    uses: robertvazan/rvscaffold/.github/workflows/java-build.yml@master
-    with:
-      java-version: 17
-      test-coverage: true
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 17
+          cache: maven
+      - name: Maven
+        run: |
+          # GPG must be skipped, because CI server does not have release GPG key.
+          # Failure on javadoc warnings is enabled only in CI builds,
+          # so that warnings specific to one JDK version do not break independent builds.
+          # Printing maven version (-V) helps diagnose CI-specific build behavior.
+          # JaCoCo phase is needed to create code coverage report that will be later uploaded to Codecov.
+          mvn install jacoco:report -Dgpg.skip=true -Dmaven.javadoc.failOnWarnings=true -B -V
+      - uses: codecov/codecov-action@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,10 +3,23 @@ name: release
 on: workflow_dispatch
 jobs:
   release:
-    uses: robertvazan/rvscaffold/.github/workflows/java-release.yml@master
-    with:
-      java-version: 17
-    secrets:
-      server-password: ${{ secrets.MAVEN_SERVER_PASSWORD }}
-      signing-key: ${{ secrets.MAVEN_SIGNING_KEY }}
-      signing-password: ${{ secrets.MAVEN_SIGNING_PASSWORD }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 17
+          server-id: ossrh
+          server-username: MAVEN_SERVER_USERNAME
+          server-password: MAVEN_SERVER_PASSWORD
+          gpg-private-key: ${{ secrets.MAVEN_SIGNING_KEY }}
+          gpg-passphrase: MAVEN_SIGNING_PASSWORD
+          cache: maven
+      - name: Maven
+        # Printing maven version (-V) helps diagnose GitHub-specific build behavior.
+        run: mvn -B -V deploy
+        env:
+          MAVEN_SERVER_USERNAME: robertvazan
+          MAVEN_SERVER_PASSWORD: ${{ secrets.MAVEN_SERVER_PASSWORD }}
+          MAVEN_SIGNING_PASSWORD: ${{ secrets.MAVEN_SIGNING_PASSWORD }}
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 
 # Hookless
 
-[![Maven Central](https://img.shields.io/maven-central/v/com.machinezoo.hookless/hookless)](https://search.maven.org/artifact/com.machinezoo.hookless/hookless)
+[![Maven Central](https://img.shields.io/maven-central/v/com.machinezoo.hookless/hookless)](https://central.sonatype.com/artifact/com.machinezoo.hookless/hookless)
 [![Build status](https://github.com/robertvazan/hookless/workflows/build/badge.svg)](https://github.com/robertvazan/hookless/actions/workflows/build.yml)
 [![Test coverage](https://codecov.io/gh/robertvazan/hookless/branch/master/graph/badge.svg)](https://codecov.io/gh/robertvazan/hookless)
 

diff --git a/pom.xml b/pom.xml
@@ -52,27 +52,27 @@
 		<dependency>
 			<groupId>com.machinezoo.noexception</groupId>
 			<artifactId>noexception</artifactId>
-			<version>1.9.0</version>
+			<version>1.9.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.machinezoo.noexception</groupId>
 			<artifactId>noexception-slf4j</artifactId>
-			<version>1.0.1</version>
+			<version>1.0.2</version>
 		</dependency>
 		<dependency>
 			<groupId>it.unimi.dsi</groupId>
 			<artifactId>fastutil</artifactId>
-			<version>8.5.6</version>
+			<version>8.5.12</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>31.0.1-jre</version>
+			<version>32.1.3-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-core</artifactId>
-			<version>1.6.4</version>
+			<version>1.11.5</version>
 		</dependency>
 		<dependency>
 			<groupId>io.opentracing</groupId>
@@ -82,7 +82,7 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.8.2</version>
+			<version>5.10.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -94,18 +94,18 @@
 		<dependency>
 			<groupId>org.awaitility</groupId>
 			<artifactId>awaitility</artifactId>
-			<version>4.0.3</version>
+			<version>4.2.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit-pioneer</groupId>
 			<artifactId>junit-pioneer</artifactId>
-			<version>0.9.0</version>
+			<version>2.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.valfirst</groupId>
 			<artifactId>slf4j-test</artifactId>
-			<version>2.3.0</version>
+			<version>3.0.1</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -114,16 +114,16 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
+				<version>3.11.0</version>
 			</plugin>
 			<plugin>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M5</version>
+				<version>3.2.2</version>
 			</plugin>
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.7</version>
+				<version>0.8.11</version>
 				<executions>
 					<execution>
 						<id>prepare-agent</id>
@@ -143,7 +143,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.3.1</version>
+				<version>3.6.2</version>
 				<configuration>
 					<notimestamp>true</notimestamp>
 					<doclint>all,-missing</doclint>
@@ -166,7 +166,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>3.0.1</version>
+				<version>3.3.0</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -197,7 +197,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-gpg-plugin</artifactId>
-				<version>1.6</version>
+				<version>3.1.0</version>
 				<configuration>
 					<gpgArguments>
 						<arg>--pinentry-mode</arg>

diff --git a/scripts/configure.py b/scripts/configure.py
@@ -20,12 +20,12 @@ def dependencies(self):
         yield self.use_noexception_slf4j()
         yield self.use_fastutil()
         yield self.use_guava()
-        yield self.use('io.micrometer:micrometer-core:1.6.4')
+        yield self.use('io.micrometer:micrometer-core:1.11.5')
         yield self.use('io.opentracing:opentracing-util:0.33.0')
         yield self.use_junit()
         yield self.use_hamcrest()
-        yield self.use('org.awaitility:awaitility:4.0.3', 'test')
-        yield self.use('org.junit-pioneer:junit-pioneer:0.9.0')
+        yield self.use('org.awaitility:awaitility:4.2.0', 'test')
+        yield self.use('org.junit-pioneer:junit-pioneer:2.1.0')
         yield self.use_slf4j_test()
 
     def javadoc_links(self):

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -5,29 +5,32 @@
  * <p>
  * The main package {@link com.machinezoo.hookless} contains reactive primitives and other core reactive classes.
  * Other packages provide reactive wrappers and reactive alternatives to various JRE classes.
- * 
+ *
  * @see <a href="https://hookless.machinezoo.com/">Hookless website</a>
  */
 module com.machinezoo.hookless {
-	exports com.machinezoo.hookless;
-	exports com.machinezoo.hookless.util;
-	/*
-	 * Preferences should be moved to separate library along with this dependency.
-	 */
-	requires transitive java.prefs;
-	requires com.machinezoo.stagean;
-	/*
-	 * This dependency should be downgraded to non-transitive once exception handlers are moved to separate library.
-	 */
-	requires transitive com.machinezoo.noexception;
-	requires com.machinezoo.noexception.slf4j;
-	/*
-	 * SLF4J is pulled in transitively via noexception, but the transitive dependency will be removed in future versions of noexception.
-	 */
-	requires org.slf4j;
-	requires com.google.common;
-	requires io.opentracing.api;
-	requires io.opentracing.util;
-	requires it.unimi.dsi.fastutil;
-	requires micrometer.core;
+    exports com.machinezoo.hookless;
+    exports com.machinezoo.hookless.util;
+    /*
+     * Preferences should be moved to separate library along with this dependency.
+     */
+    requires transitive java.prefs;
+    requires com.machinezoo.stagean;
+    /*
+     * This dependency should be downgraded to non-transitive once exception handlers are moved to separate library.
+     */
+    requires transitive com.machinezoo.noexception;
+    requires com.machinezoo.noexception.slf4j;
+    /*
+     * SLF4J is pulled in transitively via noexception, but the transitive dependency will be removed in future versions of noexception.
+     */
+    requires org.slf4j;
+    requires com.google.common;
+    /*
+     * Transitive, because OwnerTrace exposes Span.
+     */
+    requires transitive io.opentracing.api;
+    requires io.opentracing.util;
+    requires it.unimi.dsi.fastutil;
+    requires micrometer.core;
 }