Fix Build

smallrye · Oct 16, 2024 · 8493ceb · 8493ceb
1 parent 505e700
commit 8493ceb
Show file tree

Hide file tree

Showing 30 changed files with 128 additions and 244 deletions.
diff --git a/.github/project.yml b/.github/project.yml
@@ -1,6 +1,4 @@
 name: SmallRye Async API
-# This is not ready to release yet, unless the the Release Plugin and GPG Plugin are configured properly.
-# The Parent POM (>18) requires a fix for the Release, or the plugins need to be configured directly.
 release:
  current-version: 1.0.0-SNAPSHOT
  next-version: 1.0.0-SNAPSHOT
diff --git a/.github/release/maven-settings.xml.gpg b/.github/release/maven-settings.xml.gpg
diff --git a/.github/release/smallrye-sign.asc.gpg b/.github/release/smallrye-sign.asc.gpg
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: SmallRye Build
 
 on:
  push:
- branches: 
+ branches:
  - main
  paths-ignore:
  - '.gitignore'
@@ -23,35 +23,77 @@ jobs:
  runs-on: ubuntu-latest
  strategy:
  matrix:
- java: [8, 11, 17]
+ java: [11, 17, 21]
  name: build with jdk ${{matrix.java}}
 
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v4
  name: checkout
 
- - uses: actions/setup-java@v1
+ - uses: actions/setup-java@v4
  name: set up jdk ${{matrix.java}}
  with:
+ distribution: 'temurin'
  java-version: ${{matrix.java}}
+ cache: 'maven'
+ cache-dependency-path: '**/pom.xml'
+
+ - name: build with maven
+ run: mvn -B formatter:validate verify --file pom.xml
+
+ - uses: actions/upload-artifact@v4
+ name: tck-report
+ with:
+ name: tck-report-java-${{matrix.java}}
+ path: tck/target/surefire-reports
+
+ build-windows:
+ runs-on: windows-latest
+ strategy:
+ matrix:
+ java: [11, 17, 21]
+ name: build with jdk ${{matrix.java}} windows
+
+ steps:
+ - uses: actions/checkout@v4
+ name: checkout
+
+ - uses: actions/setup-java@v4
+ name: set up jdk ${{matrix.java}}
+ with:
+ distribution: 'temurin'
+ java-version: ${{matrix.java}}
+ cache: 'maven'
+ cache-dependency-path: '**/pom.xml'
 
  - name: build with maven
  run: mvn -B formatter:validate verify --file pom.xml
 
  quality:
  needs: [build]
- if: github.event_name == 'push' && startsWith('smallrye', github.repository)
+ if: github.event_name == 'push' && github.repository_owner == 'smallrye'
  runs-on: ubuntu-latest
  name: quality
 
  steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-java@v1
+ - uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+
+ - uses: actions/setup-java@v4
+ with:
+ distribution: 'temurin'
+ java-version: 11
+ cache: 'maven'
+ cache-dependency-path: '**/pom.xml'
+
+ - name: build with docs and coverage
+ run: mvn verify -Pcoverage javadoc:javadoc
+
+ - uses: actions/setup-java@v4
  with:
- java-version: 8
+ distribution: 'temurin'
+ java-version: 17
 
  - name: sonar
- env:
- GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
- SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
- run: mvn -B verify --file pom.xml -Pcoverage javadoc:javadoc sonar:sonar -Dsonar.projectKey=smallrye_smallrye-async-api -Dsonar.login=$SONAR_TOKEN
+ run: mvn sonar:sonar -Psonar -Dsonar.token=${{secrets.SONAR_TOKEN}}
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/README.adoc b/README.adoc
@@ -1,8 +1,8 @@
 :ci: https://github.com/smallrye/smallrye-async-api/actions?query=workflow%3A%22SmallRye+Build%22
-:sonar: https://sonarcloud.io/dashboard?id=smallrye_smallrye-async-api
+:sonar: https://sonarcloud.io/dashboard?id=io.smallrye%3Asmallrye-async-api
 
 image:https://github.com/smallrye/smallrye-async-api/workflows/SmallRye%20Build/badge.svg?branch=main[link={ci}]
-image:https://sonarcloud.io/api/project_badges/measure?project=smallrye_smallrye-async-api&metric=alert_status["Quality Gate Status", link={sonar}]
+image:https://sonarcloud.io/api/project_badges/measure?project=io.smallrye%3Asmallrye-async-api&metric=alert_status["Quality Gate Status", link={sonar}]
 image:https://img.shields.io/github/license/smallrye/smallrye-async-api.svg["License", link="http://www.apache.org/licenses/LICENSE-2.0"]
 
 = SmallRye AsyncAPI

diff --git a/implementation/pom.xml b/implementation/pom.xml
@@ -74,30 +74,6 @@
  <artifactId>jakarta.validation-api</artifactId>
  <scope>provided</scope>
  </dependency>
-
- <!-- Test Only Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.skyscreamer</groupId>
- <artifactId>jsonassert</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jakarta.json.bind</groupId>
- <artifactId>jakarta.json.bind-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-depchain</artifactId>
- <scope>test</scope>
- <type>pom</type>
- </dependency>
-
  </dependencies>
 
  <build>
@@ -106,17 +82,8 @@
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-surefire-plugin</artifactId>
  <configuration>
- <environmentVariables>
- <!-- Used by EnvConfigSourceTestCase -->
- <SMALLRYE_MP_CONFIG_PROP>1234</SMALLRYE_MP_CONFIG_PROP>
- </environmentVariables>
  <redirectTestOutputToFile>true</redirectTestOutputToFile>
  <enableAssertions>true</enableAssertions>
- <argLine>-Xmx512m</argLine>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- <forkMode>once</forkMode>
  </configuration>
  </plugin>
  </plugins>

diff --git a/implementation/src/main/java/io/smallrye/asyncapi/api/AsyncApiConfig.java b/implementation/src/main/java/io/smallrye/asyncapi/api/AsyncApiConfig.java
@@ -20,7 +20,7 @@
 
 /**
  * Accessor to AsyncAPI configuration options.
- * 
+ *
  * mp.asyncapi.model.reader : Configuration property to specify the fully qualified name of the AAIModelReader implementation.
  * mp.asyncapi.filter : Configuration property to specify the fully qualified name of the AAIFilter implementation.
  * mp.asyncapi.scan.disable : Configuration property to disable annotation scanning. Default value is false.

diff --git a/implementation/src/main/java/io/smallrye/asyncapi/api/AsyncApiConfigImpl.java b/implementation/src/main/java/io/smallrye/asyncapi/api/AsyncApiConfigImpl.java
@@ -26,7 +26,7 @@
 /**
  * Implementation of the {@link AsyncApiConfig} interface that gets config information from a
  * standard MP Config object.
- * 
+ *
  * @author eric.wittmann@gmail.com
  */
 public class AsyncApiConfigImpl implements AsyncApiConfig {
@@ -48,7 +48,7 @@ public class AsyncApiConfigImpl implements AsyncApiConfig {
 
  /**
  * Constructor.
- * 
+ *
  * @param config MicroProfile Config instance
  */
  public AsyncApiConfigImpl(Config config) {

diff --git a/implementation/src/main/java/io/smallrye/asyncapi/api/util/ArchiveUtil.java b/implementation/src/main/java/io/smallrye/asyncapi/api/util/ArchiveUtil.java
@@ -42,7 +42,7 @@
 
 /**
  * Some useful methods for creating stuff from ShrinkWrap {@link Archive}s.
- * 
+ *
  * @author eric.wittmann@gmail.com
  */
 public class ArchiveUtil {
@@ -56,7 +56,7 @@ private ArchiveUtil() {
 
  /**
  * Creates an {@link AsyncApiConfig} instance from the given ShrinkWrap archive.
- * 
+ *
  * @param archive Shrinkwrap Archive instance
  * @return AsyncApiConfig
  */
@@ -73,7 +73,7 @@ public static AsyncApiConfig archiveToConfig(Archive<?> archive) {
  * it as an {@link AsyncApiStaticFile}. If not found, returns null. The static file
  * (when not null) contains an {@link InputStream} to the contents of the static file.
  * The caller is responsible for closing this stream.
- * 
+ *
  * @param archive Shrinkwrap Archive instance
  * @return AsyncApiStaticFile
  */
@@ -112,7 +112,7 @@ public static AsyncApiStaticFile archiveToStaticFile(Archive<?> archive) {
 
  /**
  * Index the ShrinkWrap archive to produce a jandex index.
- * 
+ *
  * @param config AsyncApiConfig
  * @param archive Shrinkwrap Archive
  * @return indexed classes in Archive
@@ -129,7 +129,7 @@ public static IndexView archiveToIndex(AsyncApiConfig config, Archive<?> archive
 
  /**
  * Indexes the given archive.
- * 
+ *
  * @param config
  * @param indexer
  * @param archive
@@ -165,7 +165,7 @@ && acceptJarForScanning(config, archivePath.get())) {
  /**
  * Returns true if the given JAR archive (dependency) should be cracked open and indexed
  * along with the rest of the deployment's classes.
- * 
+ *
  * @param config
  * @param jarName
  */
@@ -184,7 +184,7 @@ private static boolean acceptJarForScanning(AsyncApiConfig config, String jarNam
  /**
  * Returns true if the class represented by the given archive path should be included in
  * the annotation index.
- * 
+ *
  * @param config
  * @param archivePath
  */

diff --git a/implementation/src/main/java/io/smallrye/asyncapi/api/util/FilterUtil.java b/implementation/src/main/java/io/smallrye/asyncapi/api/util/FilterUtil.java
@@ -32,7 +32,7 @@ private FilterUtil() {
 
  /**
  * Apply the given filter to the given model.
- * 
+ *
  * @param filter
  * @param document
  */

diff --git a/implementation/src/main/java/io/smallrye/asyncapi/api/util/IOUtil.java b/implementation/src/main/java/io/smallrye/asyncapi/api/util/IOUtil.java
@@ -27,7 +27,7 @@ public class IOUtil {
 
  /**
  * Converts the given input stream to a string. Assumes UTF8 as the encoding.
- * 
+ *
  * @param content
  */
  public static String toString(InputStream content) {