From 2a37d3aed4065222a62ada79dae20839460d0d9e Mon Sep 17 00:00:00 2001 From: Roberto Cortez Date: Wed, 16 Oct 2024 17:11:05 +0100 Subject: [PATCH] Fix Build --- .github/project.yml | 2 - .github/release/maven-settings.xml.gpg | Bin 316 -> 0 bytes .github/release/smallrye-sign.asc.gpg | Bin 6497 -> 0 bytes .github/workflows/build.yml | 66 ++++++++++++++---- .github/workflows/pre-release.yml | 31 -------- .github/workflows/release.yml | 53 -------------- README.adoc | 8 +-- implementation/pom.xml | 33 --------- .../smallrye/asyncapi/api/AsyncApiConfig.java | 2 +- .../asyncapi/api/AsyncApiConfigImpl.java | 4 +- .../asyncapi/api/util/ArchiveUtil.java | 14 ++-- .../asyncapi/api/util/FilterUtil.java | 2 +- .../io/smallrye/asyncapi/api/util/IOUtil.java | 2 +- .../smallrye/asyncapi/api/util/MergeUtil.java | 20 +++--- .../asyncapi/runtime/AsyncApiProcessor.java | 10 +-- .../scanner/AsyncApiAnnotationScanner.java | 6 +- pom.xml | 25 ++++++- spec/api/pom.xml | 8 --- .../io/smallrye/asyncapi/spec/AAIConfig.java | 2 +- .../io/smallrye/asyncapi/spec/AAIFilter.java | 4 +- .../asyncapi/spec/AAIModelReader.java | 4 +- spec/tck/pom.xml | 43 ------------ .../asyncapi/apps/filter/FilterImpl.java | 2 +- .../asyncapi/apps/merge/ModelReaderImpl.java | 2 +- .../apps/modelReader/ModelReaderImpl.java | 2 +- tck/pom.xml | 19 ++--- .../io/smallrye/asyncapi/tck/BaseTckTest.java | 4 +- .../io/smallrye/asyncapi/tck/TckTest.java | 2 +- .../smallrye/asyncapi/tck/TckTestRunner.java | 4 +- .../smallrye/asyncapi/tck/TestNgRunner.java | 2 +- 30 files changed, 130 insertions(+), 246 deletions(-) delete mode 100644 .github/release/maven-settings.xml.gpg delete mode 100644 .github/release/smallrye-sign.asc.gpg delete mode 100644 .github/workflows/pre-release.yml delete mode 100644 .github/workflows/release.yml diff --git a/.github/project.yml b/.github/project.yml index b035ebcd..fe3c5596 100644 --- 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 deleted file mode 100644 index d25987610a91c8967d2c8748cab9b083afbba74a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 316 zcmV-C0mJ@`4Fm}T0`_T`vYNd<9@5glY5_?+)TU&p@xbLZKlf`UH+_n1kn(Eyzm$SM}2 zL%Mz{!8l0$ld6DvB?|fl_loCE%K3~$E^V$6BR^j=7cHP_a`Qb-Aa=>q;!CH!Ec~Im zoWIJ?C>2B?!3C_W;AbBY-aB4QlVuSFn8d@0mIp}JzuhY3eD#9VMOkQQ&2|BO-jhx^ zmCrk)8oEDji=r%;NNl4IGG2nG(&*IujWV>1~DSjBKTtl9JuMo8Lz8 OTLOm%C^$M3Ge#Z<@|NHL diff --git a/.github/release/smallrye-sign.asc.gpg b/.github/release/smallrye-sign.asc.gpg deleted file mode 100644 index ffd7b0f07da56e837c901173bde53f6f4fbc5be1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6497 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 Hu$vxMDsQoM diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3a31f75a..72cebfa4 100644 --- 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 deleted file mode 100644 index 343d47e8..00000000 --- a/.github/workflows/pre-release.yml +++ /dev/null @@ -1,31 +0,0 @@ -name: SmallRye Pre Release - -on: - pull_request: - paths: - - '.github/project.yml' - -jobs: - release: - runs-on: ubuntu-latest - name: pre release - - steps: - - uses: radcortez/project-metadata-action@main - name: retrieve project metadata - id: metadata - with: - github-token: ${{secrets.GITHUB_TOKEN}} - metadata-file-path: '.github/project.yml' - - - name: Validate version - if: contains(steps.metadata.outputs.current-version, 'SNAPSHOT') - run: | - echo '::error::Cannot release a SNAPSHOT version.' - exit 1 - - - uses: radcortez/milestone-review-action@main - name: milestone review - with: - github-token: ${{secrets.GITHUB_TOKEN}} - milestone-title: ${{steps.metadata.outputs.current-version}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index d41830d8..00000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: SmallRye Release - -on: - pull_request: - types: [closed] - paths: - - '.github/project.yml' - -jobs: - release: - runs-on: ubuntu-latest - name: release - if: ${{github.event.pull_request.merged == true}} - env: - GITHUB_TOKEN: ${{secrets.RELEASE_TOKEN}} - - steps: - - uses: radcortez/project-metadata-action@main - name: retrieve project metadata - id: metadata - with: - github-token: ${{secrets.GITHUB_TOKEN}} - metadata-file-path: '.github/project.yml' - - - uses: actions/checkout@v2 - with: - token: ${{secrets.RELEASE_TOKEN}} - - - uses: actions/setup-java@v1 - with: - java-version: 8 - - - name: maven release ${{steps.metadata.outputs.current-version}} - run: | - java -version - gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRET_PASSPHRASE}}" --output smallrye-sign.asc .github/release/smallrye-sign.asc.gpg - gpg --quiet --batch --yes --decrypt --passphrase="${{secrets.SECRET_PASSPHRASE}}" --output maven-settings.xml .github/release/maven-settings.xml.gpg - gpg --fast-import --no-tty --batch --yes smallrye-sign.asc - git config --global user.name "SmallRye CI" - git config --global user.email "smallrye@googlegroups.com" - git checkout -b release - mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}} -s maven-settings.xml - git checkout ${{github.base_ref}} - git rebase release - mvn -B release:perform -Prelease -s maven-settings.xml - git push - git push --tags - - - uses: radcortez/milestone-release-action@main - name: milestone release - with: - github-token: ${{secrets.GITHUB_TOKEN}} - milestone-title: ${{steps.metadata.outputs.current-version}} diff --git a/README.adoc b/README.adoc index 7793039a..37d129e5 100644 --- 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 +:ci: https://github.com/smallrye/smallrye-async-api/actions/workflows/build.yml +: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://github.com/smallrye/smallrye-async-api/actions/workflows/build.yml/badge.svg?branch=main[link={ci}] +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 index fdee05ad..407aa099 100644 --- a/implementation/pom.xml +++ b/implementation/pom.xml @@ -74,30 +74,6 @@ jakarta.validation-api provided - - - - junit - junit - test - - - org.skyscreamer - jsonassert - test - - - jakarta.json.bind - jakarta.json.bind-api - test - - - org.jboss.shrinkwrap.resolver - shrinkwrap-resolver-depchain - test - pom - - @@ -106,17 +82,8 @@ org.apache.maven.plugins maven-surefire-plugin - - - 1234 - true true - -Xmx512m - - **/*TestCase.java - - once diff --git a/implementation/src/main/java/io/smallrye/asyncapi/api/AsyncApiConfig.java b/implementation/src/main/java/io/smallrye/asyncapi/api/AsyncApiConfig.java index 031420ae..fa7fc04e 100644 --- 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 index 23a8c9fd..5f248f00 100644 --- 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 index feaf76f6..f54133f6 100644 --- 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 index b62c8942..c5eb2634 100644 --- 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 index 122edbcf..ba836075 100644 --- 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) { diff --git a/implementation/src/main/java/io/smallrye/asyncapi/api/util/MergeUtil.java b/implementation/src/main/java/io/smallrye/asyncapi/api/util/MergeUtil.java index 7fbd2ee5..e3dd7360 100644 --- a/implementation/src/main/java/io/smallrye/asyncapi/api/util/MergeUtil.java +++ b/implementation/src/main/java/io/smallrye/asyncapi/api/util/MergeUtil.java @@ -60,7 +60,7 @@ private MergeUtil() { /** * Merges two documents and returns the result. - * + * * @param document1 Document instance * @param document2 Document instance * @return Merged Document instance @@ -71,7 +71,7 @@ public static final Document merge(Document document1, Document document2) { /** * Generic merge of two objects of the same type. - * + * * @param object1 First object * @param object2 Second object * @param Type parameter @@ -89,7 +89,7 @@ public static T mergeObjects(T object1, T object2) { return null; } - // It's uncommon, but in some cases the values could be different types. In this case, just take the + // It's uncommon, but in some cases the values could be different types. In this case, just take the // 2nd one (the override). if (!object1.getClass().equals(object2.getClass())) { return object2; @@ -136,7 +136,7 @@ public static T mergeObjects(T object1, T object2) { /** * Merges two Maps. Any values missing from Map1 but present in Map2 will be added. If a value * is present in both maps, it will be overridden or merged. - * + * * @param values1 * @param values2 */ @@ -183,7 +183,7 @@ private static Map mergeMaps(Map values1, Map values2, Node parent) { /** * Merges two Lists. Any values missing from List1 but present in List2 will be added. Depending on * the type of list, further processing and de-duping may be required. - * + * * @param values1 * @param values2 */ @@ -233,7 +233,7 @@ private static List mergeLists(List values1, List values2, Node parent) { /** * Merge a list of strings. In all cases, string lists are really sets. So this is just * combining the two lists and then culling duplicates. - * + * * @param values1 * @param values2 */ @@ -249,7 +249,7 @@ private static List mergeStringLists(List values1, List * have two Tags with the same name. This will append any tags from values2 that don't * exist in values1. It will *merge* any tags found in values2 that already exist in * values1. - * + * * @param values1 * @param values2 */ @@ -274,7 +274,7 @@ private static List mergeTagLists(List values1, List values2) { /** * Merge two lists of Servers. Servers are a special case because they must be unique * by the 'url' property each must have. - * + * * @param values1 * @param values2 */ @@ -300,7 +300,7 @@ private static List mergeServerLists(List values1, List * Merge two lists of Security Requirements. Security Requirement lists are are a * special case because * values1. - * + * * @param values1 * @param values2 */ @@ -318,7 +318,7 @@ private static List mergeSecurityRequirementLists(List io.smallrye smallrye-parent - 35 + 46 smallrye-async-api-parent @@ -38,7 +38,7 @@ 1.1.24 - ${project.basedir}/tck/target/site/jacoco-aggregate/jacoco.xml,${project.basedir}/../tck/target/site/jacoco-aggregate/jacoco.xml + 2.3.1 @@ -174,6 +174,15 @@ smallrye-async-api ${project.version} + + + + io.smallrye.testing + smallrye-testing-bom + ${version.smallrye.testing} + import + pom + @@ -206,5 +215,17 @@ release + + sonar + + SmallRye Async API + io.smallrye:smallrye-async-api + ${project.artifactId} + + + ${maven.multiModuleProjectDirectory}/tck/target/site/jacoco-aggregate/jacoco.xml + + + diff --git a/spec/api/pom.xml b/spec/api/pom.xml index d7fed7b5..6a5e73b4 100644 --- a/spec/api/pom.xml +++ b/spec/api/pom.xml @@ -27,13 +27,5 @@ io.apicurio apicurio-data-models - - - - junit - junit - test - - diff --git a/spec/api/src/main/java/io/smallrye/asyncapi/spec/AAIConfig.java b/spec/api/src/main/java/io/smallrye/asyncapi/spec/AAIConfig.java index 223cca4f..500607a2 100644 --- a/spec/api/src/main/java/io/smallrye/asyncapi/spec/AAIConfig.java +++ b/spec/api/src/main/java/io/smallrye/asyncapi/spec/AAIConfig.java @@ -18,7 +18,7 @@ /** * Configurable properties in MicroProfile AsyncAPI - * + * * @author eric.wittmann@gmail.com */ public final class AAIConfig { diff --git a/spec/api/src/main/java/io/smallrye/asyncapi/spec/AAIFilter.java b/spec/api/src/main/java/io/smallrye/asyncapi/spec/AAIFilter.java index 5014ff76..fe5946d2 100644 --- a/spec/api/src/main/java/io/smallrye/asyncapi/spec/AAIFilter.java +++ b/spec/api/src/main/java/io/smallrye/asyncapi/spec/AAIFilter.java @@ -23,7 +23,7 @@ * after all document generation phases are complete (model reader, static file, annotation scanning) * and is typically used to suppress parts of the document that should not be included. Usually this * is either a result of security concerns or anachronistic annotation scanning. - * + * * @author eric.wittmann@gmail.com */ public interface AAIFilter { @@ -31,7 +31,7 @@ public interface AAIFilter { /** * Allows filtering of the entire document. This will be called after all other phases are complete and * combined (model reader, static file, annotation scanning). - * + * * @param document */ public void filterDocument(Document document); diff --git a/spec/api/src/main/java/io/smallrye/asyncapi/spec/AAIModelReader.java b/spec/api/src/main/java/io/smallrye/asyncapi/spec/AAIModelReader.java index 915ea012..3d52f992 100644 --- a/spec/api/src/main/java/io/smallrye/asyncapi/spec/AAIModelReader.java +++ b/spec/api/src/main/java/io/smallrye/asyncapi/spec/AAIModelReader.java @@ -20,7 +20,7 @@ /** * This interface allows application developers to programmatically contribute an AsyncAPI model tree. - * + * * @author eric.wittmann@gmail.com */ public interface AAIModelReader { @@ -29,7 +29,7 @@ public interface AAIModelReader { * This method is called by the vendor's AsyncAPI processing framework. It can be a fully complete and * valid AsyncAPI model tree, or a partial base model tree that will be augmented by either annotations or * pre-generated AsyncAPI documents. - * + * * @return the AsyncAPI model to be used by the vendor */ Document buildModel(); diff --git a/spec/tck/pom.xml b/spec/tck/pom.xml index 4a99a21f..035c065b 100644 --- a/spec/tck/pom.xml +++ b/spec/tck/pom.xml @@ -90,47 +90,4 @@ jackson-dataformat-yaml - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${maven.compiler.source} - ${maven.compiler.target} - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - 8 - - - - attach-javadocs - - jar - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar - - - - - - - diff --git a/spec/tck/src/main/java/io/smallrye/asyncapi/apps/filter/FilterImpl.java b/spec/tck/src/main/java/io/smallrye/asyncapi/apps/filter/FilterImpl.java index 61684782..934c4e65 100644 --- a/spec/tck/src/main/java/io/smallrye/asyncapi/apps/filter/FilterImpl.java +++ b/spec/tck/src/main/java/io/smallrye/asyncapi/apps/filter/FilterImpl.java @@ -26,7 +26,7 @@ /** * A filter implementation used in the filter app TCK test. - * + * * @author eric.wittmann@gmail.com */ public class FilterImpl extends CombinedVisitorAdapter implements AAIFilter { diff --git a/spec/tck/src/main/java/io/smallrye/asyncapi/apps/merge/ModelReaderImpl.java b/spec/tck/src/main/java/io/smallrye/asyncapi/apps/merge/ModelReaderImpl.java index a9bac23c..5e5c7b97 100644 --- a/spec/tck/src/main/java/io/smallrye/asyncapi/apps/merge/ModelReaderImpl.java +++ b/spec/tck/src/main/java/io/smallrye/asyncapi/apps/merge/ModelReaderImpl.java @@ -24,7 +24,7 @@ /** * A model reader implementation used for TCK testing. - * + * * @author eric.wittmann@gmail.com */ public class ModelReaderImpl implements AAIModelReader { diff --git a/spec/tck/src/main/java/io/smallrye/asyncapi/apps/modelReader/ModelReaderImpl.java b/spec/tck/src/main/java/io/smallrye/asyncapi/apps/modelReader/ModelReaderImpl.java index 6edc5013..4977bbe0 100644 --- a/spec/tck/src/main/java/io/smallrye/asyncapi/apps/modelReader/ModelReaderImpl.java +++ b/spec/tck/src/main/java/io/smallrye/asyncapi/apps/modelReader/ModelReaderImpl.java @@ -24,7 +24,7 @@ /** * A model reader implementation used for TCK testing. - * + * * @author eric.wittmann@gmail.com */ public class ModelReaderImpl implements AAIModelReader { diff --git a/tck/pom.xml b/tck/pom.xml index de5a091e..6cfe0ff6 100644 --- a/tck/pom.xml +++ b/tck/pom.xml @@ -31,29 +31,20 @@ jakarta.annotation jakarta.annotation-api + 1.3.5 - - jakarta.ws.rs - jakarta.ws.rs-api - test - junit junit + 4.13.2 test - org.jboss.shrinkwrap.resolver - shrinkwrap-resolver-depchain - test - pom - - - org.jboss.arquillian.testng - arquillian-testng-container - test + commons-io + commons-io + 2.17.0 io.rest-assured diff --git a/tck/src/test/java/test/io/smallrye/asyncapi/tck/BaseTckTest.java b/tck/src/test/java/test/io/smallrye/asyncapi/tck/BaseTckTest.java index 403a0229..f940e094 100644 --- a/tck/src/test/java/test/io/smallrye/asyncapi/tck/BaseTckTest.java +++ b/tck/src/test/java/test/io/smallrye/asyncapi/tck/BaseTckTest.java @@ -39,7 +39,7 @@ /** * Base class for all Tck tests. - * + * * @author eric.wittmann@gmail.com */ @SuppressWarnings("restriction") @@ -102,7 +102,7 @@ public void handle(HttpExchange t) throws IOException { /** * Calls the endpoint. - * + * * @param format */ protected ValidatableResponse doCallEndpoint(String format) { diff --git a/tck/src/test/java/test/io/smallrye/asyncapi/tck/TckTest.java b/tck/src/test/java/test/io/smallrye/asyncapi/tck/TckTest.java index 9f4d83d5..4d6d16a1 100644 --- a/tck/src/test/java/test/io/smallrye/asyncapi/tck/TckTest.java +++ b/tck/src/test/java/test/io/smallrye/asyncapi/tck/TckTest.java @@ -25,7 +25,7 @@ /** * Use this annotation along with @TckTestRunner to indicate the specific Tck that is * under test. - * + * * @author eric.wittmann@gmail.com */ @Retention(RetentionPolicy.RUNTIME) diff --git a/tck/src/test/java/test/io/smallrye/asyncapi/tck/TckTestRunner.java b/tck/src/test/java/test/io/smallrye/asyncapi/tck/TckTestRunner.java index 2449cec1..ec208037 100644 --- a/tck/src/test/java/test/io/smallrye/asyncapi/tck/TckTestRunner.java +++ b/tck/src/test/java/test/io/smallrye/asyncapi/tck/TckTestRunner.java @@ -68,7 +68,7 @@ public class TckTestRunner extends ParentRunner { /** * Constructor. - * + * * @param testClass * @throws InitializationError */ @@ -134,7 +134,7 @@ private Archive archive() throws InitializationError { /** * Figures out what TCK test is being run. - * + * * @throws InitializationError */ @SuppressWarnings("unchecked") diff --git a/tck/src/test/java/test/io/smallrye/asyncapi/tck/TestNgRunner.java b/tck/src/test/java/test/io/smallrye/asyncapi/tck/TestNgRunner.java index 62a2b14a..e71a2f44 100644 --- a/tck/src/test/java/test/io/smallrye/asyncapi/tck/TestNgRunner.java +++ b/tck/src/test/java/test/io/smallrye/asyncapi/tck/TestNgRunner.java @@ -32,7 +32,7 @@ public class TestNgRunner extends BlockJUnit4ClassRunner { /** * Constructor. - * + * * @param klass * @throws InitializationError */