From bf0fac3c7cefcfbd751cf2771ee3e5fe954ffed3 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 21 Apr 2023 12:56:00 +0200 Subject: [PATCH 01/31] Fill in placeholder --- .run/Run Demo.run.xml | 2 +- CONTRIBUTING.md | 4 ++-- README.md | 12 ++++++------ SECURITY.md | 2 +- pom.xml | 6 +++--- standard-maven-template-demo/pom.xml | 4 ++-- standard-maven-template/pom.xml | 12 ++++++------ 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.run/Run Demo.run.xml b/.run/Run Demo.run.xml index 764b3b9..8aa97dd 100644 --- a/.run/Run Demo.run.xml +++ b/.run/Run Demo.run.xml @@ -1,7 +1,7 @@ + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + + true + ${mainClass} + + + + diff --git a/sessionize-java-client-demo/src/main/java/software/xdev/Application.java b/sessionize-java-client-demo/src/main/java/software/xdev/Application.java new file mode 100644 index 0000000..52e6a13 --- /dev/null +++ b/sessionize-java-client-demo/src/main/java/software/xdev/Application.java @@ -0,0 +1,42 @@ +package software.xdev; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import software.xdev.sessionize.api.AllApi; +import software.xdev.sessionize.api.SessionsApi; +import software.xdev.sessionize.api.SpeakersApi; +import software.xdev.sessionize.client.ApiClient; + + +public final class Application +{ + public static final Logger LOG = LoggerFactory.getLogger(Application.class); + public static final String TEST_ENDPOINT_ID = "jl4ktls0"; + + @SuppressWarnings("java:S2629") // Just a demo + public static void main(final String[] args) + { + final CustomApiClient apiClient = new CustomApiClient(); + + LOG.info("*** Speakers-Endpoint ***"); + new SpeakersApi(apiClient).getAllSpeakers(TEST_ENDPOINT_ID) + .forEach(x -> LOG.info(x.toString())); + + LOG.info("*** Sessions-Endpoint ***"); + new SessionsApi(apiClient).getAllSessions(TEST_ENDPOINT_ID) + .forEach(x -> LOG.info(x.toString())); + + LOG.info("*** All-Endpoint ***"); + LOG.info(new AllApi(apiClient).getAll(TEST_ENDPOINT_ID).toString()); + } + + public static class CustomApiClient extends ApiClient + { + public CustomApiClient() + { + this.setConnectTimeout(30_000); + this.setUserAgent("Sessionize-Java-Client-Demo"); + } + } +} diff --git a/sessionize-java-client-demo/src/main/resources/log4j2.xml b/sessionize-java-client-demo/src/main/resources/log4j2.xml new file mode 100644 index 0000000..eb5bcc0 --- /dev/null +++ b/sessionize-java-client-demo/src/main/resources/log4j2.xml @@ -0,0 +1,20 @@ + + + + + + %d{HH:mm:ss} %-5p [%t] [%-25.25c] %m %n + + + + + + + + + + + + + + From c40159bac70b804990717f184be15e52e5906dc3 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 27 Apr 2023 08:46:29 +0200 Subject: [PATCH 10/31] Update docs --- CHANGELOG.md | 7 +++++++ README.md | 11 ++++++++++- openapi/INFO.md | 7 +++++++ sessionize-java-client/pom.xml | 5 +++++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 openapi/INFO.md diff --git a/CHANGELOG.md b/CHANGELOG.md index e69de29..220a6bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -0,0 +1,7 @@ +# 1.0.0 + +* Initial release +* Supports Sessionize API ``v2`` and the following endpoints + * ``/view/All`` + * ``/view/Speakers`` + * ``/view/Sessions`` diff --git a/README.md b/README.md index 35bfb04..4198796 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,21 @@ [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/sessionize-java-client/checkBuild.yml?branch=develop)](https://github.com/xdev-software/sessionize-java-client/actions/workflows/checkBuild.yml?query=branch%3Adevelop) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_sessionize-java-client&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_sessionize-java-client) -# [sessionize](https://sessionize.com/)-java-client +# [sessionize](https://sessionize.com/)-java-client A Java client for the [Sessionize API](https://sessionize.com/playbook/api) +This client [is generated](./sessionize-java-client/pom.xml) from an [``openapi.yml``](./openapi/openapi.yml) using [OpenAPI Generator](https://openapi-generator.tech/). + +Currently this client supports Sessionize API ``v2`` and the following endpoints + * ``/view/All`` + * ``/view/Speakers`` + * ``/view/Sessions`` + ## Installation [Installation guide for the latest release](https://github.com/xdev-software/sessionize-java-client/releases/latest#Installation) +## Demo +A minimal demo is also available [here](./sessionize-java-client-demo/src/main/java/software/xdev/Application.java). ## Support If you need support as soon as possible and you can't wait for any pull request, feel free to use [our support](https://xdev.software/en/services/support). diff --git a/openapi/INFO.md b/openapi/INFO.md new file mode 100644 index 0000000..524539f --- /dev/null +++ b/openapi/INFO.md @@ -0,0 +1,7 @@ +This ``openapi.yml`` was written manually as sessionize fails to provide an API schema or something similar. + +The Java API Client can be generated using ``mvn clean compile -P openapi-generator`` inside [``sessionize-java-client``](../sessionize-java-client/). + +Helpful links: +* https://jsonformatter.org/json-to-jsonschema +* https://swagger.io/specification/ diff --git a/sessionize-java-client/pom.xml b/sessionize-java-client/pom.xml index 0532c36..e018c93 100644 --- a/sessionize-java-client/pom.xml +++ b/sessionize-java-client/pom.xml @@ -47,6 +47,11 @@ UTF-8 UTF-8 + + + + src/generated/** + From 5b8a91ea0b97672799edc19c8759fbc5b8878cd1 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 27 Apr 2023 08:54:37 +0200 Subject: [PATCH 11/31] Create working jar on build --- sessionize-java-client-demo/pom.xml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/sessionize-java-client-demo/pom.xml b/sessionize-java-client-demo/pom.xml index b7ffc9e..e75ceca 100644 --- a/sessionize-java-client-demo/pom.xml +++ b/sessionize-java-client-demo/pom.xml @@ -75,16 +75,31 @@ org.apache.maven.plugins - maven-jar-plugin - 3.3.0 + maven-assembly-plugin + 3.5.0 - true ${mainClass} + + true + + + jar-with-dependencies + + false + + + make-assembly + package + + single + + + From 338fd1af8d2cbfade2977ff846ebaf3e1d5348f3 Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Thu, 27 Apr 2023 11:07:04 +0200 Subject: [PATCH 12/31] Naming --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4198796..b34863c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_sessionize-java-client&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_sessionize-java-client) # [sessionize](https://sessionize.com/)-java-client -A Java client for the [Sessionize API](https://sessionize.com/playbook/api) +Java client for the [Sessionize API](https://sessionize.com/playbook/api) This client [is generated](./sessionize-java-client/pom.xml) from an [``openapi.yml``](./openapi/openapi.yml) using [OpenAPI Generator](https://openapi-generator.tech/). From d10a6c9efedf974945adbf2fd3782375b3c585fe Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Fri, 5 May 2023 14:37:08 +0200 Subject: [PATCH 13/31] Update README.md Add logo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4d0890..e288929 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/standard-maven-template)](https://mvnrepository.com/artifact/com.xdev-software/standard-maven-template) +[![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/standard-maven-template?logo=apache%20maven)](https://mvnrepository.com/artifact/com.xdev-software/standard-maven-template) [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/standard-maven-template/checkBuild.yml?branch=develop)](https://github.com/xdev-software/standard-maven-template/actions/workflows/checkBuild.yml?query=branch%3Adevelop) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_standard-maven-template&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_standard-maven-template) From 7205b466e3e8980c140720230cc7bad8dfc24128 Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Fri, 5 May 2023 14:51:57 +0200 Subject: [PATCH 14/31] Update LICENSE Update to current year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 9c4a4b1..2316c75 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2020 XDEV Software + Copyright 2023 XDEV Software Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 0889e16bc8d3c7bceb84fe771c0ac31eda4f977b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 May 2023 01:18:58 +0000 Subject: [PATCH 15/31] Bump maven-gpg-plugin from 3.0.1 to 3.1.0 Bumps [maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.0.1 to 3.1.0. - [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.0.1...maven-gpg-plugin-3.1.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-gpg-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- standard-maven-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 34593b7..6fb0a3b 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -168,7 +168,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.1.0 sign-artifacts From 6273f383d474d8c6902f69d0b181c653f3fa331d Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 8 May 2023 10:45:06 +0200 Subject: [PATCH 16/31] Fix template tracking --- sessionize-java-client/pom.xml | 388 --------------------------------- 1 file changed, 388 deletions(-) delete mode 100644 sessionize-java-client/pom.xml diff --git a/sessionize-java-client/pom.xml b/sessionize-java-client/pom.xml deleted file mode 100644 index e018c93..0000000 --- a/sessionize-java-client/pom.xml +++ /dev/null @@ -1,388 +0,0 @@ - - - 4.0.0 - - com.xdev-software - sessionize-java-client - 1.0.0-SNAPSHOT - jar - - sessionize-java-client - sessionize-java-client - https://github.com/xdev-software/sessionize-java-client - - - https://github.com/xdev-software/sessionize-java-client - https://github.com/xdev-software/sessionize-java-client.git - - - 2023 - - - XDEV Software - https://xdev.software - - - - - XDEV Software - XDEV Software - https://xdev.software - - - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - 17 - ${javaVersion} - - UTF-8 - UTF-8 - - - - src/generated/** - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - pom - import - - - - - - - - org.apache.httpcomponents.client5 - httpclient5 - 5.2.1 - - - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - org.openapitools - jackson-databind-nullable - 0.2.6 - - - - jakarta.annotation - jakarta.annotation-api - 2.1.1 - - - - - - - com.mycila - license-maven-plugin - 4.2 - - - ${project.organization.url} - - - -
com/mycila/maven/plugin/license/templates/APACHE-2.txt
- - src/main/java/** - src/test/java/** - - - - - - - first - - format - - process-sources - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - ${maven.compiler.release} - - -proc:none - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - - - attach-javadocs - verify - - jar - - - - - true - none - - - - org.apache.maven.plugins - maven-source-plugin - 3.2.1 - - - attach-sources - verify - - jar-no-fork - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - - - generate-sources - - add-source - - - - src/generated/java - - - - - - - - - - ossrh - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.0.1 - - - sign-artifacts - verify - - sign - - - - - - --pinentry-mode - loopback - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - true - - ossrh - https://oss.sonatype.org/ - - 30 - true - - - - - - - openapi-generator - - software.xdev.sessionize - - ${project.basedir}/src/generated/java - src/gen - - ${project.basedir}/target/generated-sources/openapi/${openApiRelativeGeneratorDir} - - - - - - org.openapitools - openapi-generator-maven-plugin - 6.5.0 - - - - generate - - - ${project.basedir}/../openapi/openapi.yml - java - - ${openApiRelativeGeneratorDir} - apache-httpclient - ${basePackage}.api - ${basePackage}.model - ${basePackage}.client - - true - - false - - - true - - false - false - false - false - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.3.1 - - - copy-generated-resources - process-resources - - copy-resources - - - ${generatedDir} - - - ${openApiGeneratorDir} - - - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.2.0 - - - pre-generation-clean - initialize - - clean - - - true - - - ${generatedDir} - - - - - - post-generation-clean - process-resources - - clean - - - - - - - - - From f37bab3b063644b9497784f8d6967fca1ea3c506 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 8 May 2023 10:45:31 +0200 Subject: [PATCH 17/31] Fix template tracking --- standard-maven-template/pom.xml | 192 +++++++++++++++++++++++++++++++- 1 file changed, 186 insertions(+), 6 deletions(-) diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 6fb0a3b..0bb09b5 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -5,17 +5,17 @@ 4.0.0 com.xdev-software - standard-maven-template + sessionize-java-client 1.0.0-SNAPSHOT jar - standard-maven-template - standard-maven-template - https://github.com/xdev-software/standard-maven-template + sessionize-java-client + sessionize-java-client + https://github.com/xdev-software/sessionize-java-client - https://github.com/xdev-software/standard-maven-template - https://github.com/xdev-software/standard-maven-template.git + https://github.com/xdev-software/sessionize-java-client + https://github.com/xdev-software/sessionize-java-client.git 2023 @@ -47,6 +47,11 @@ UTF-8 UTF-8 + + + + src/generated/** + @@ -84,6 +89,60 @@ + + + + com.fasterxml.jackson + jackson-bom + 2.15.0 + pom + import + + + + + + + + org.apache.httpcomponents.client5 + httpclient5 + 5.2.1 + + + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + org.openapitools + jackson-databind-nullable + 0.2.6 + + + + jakarta.annotation + jakarta.annotation-api + 2.1.1 + + + @@ -158,6 +217,25 @@ + + + org.codehaus.mojo + build-helper-maven-plugin + 3.3.0 + + + generate-sources + + add-source + + + + src/generated/java + + + + + @@ -204,5 +282,107 @@ + + openapi-generator + + software.xdev.sessionize + + ${project.basedir}/src/generated/java + src/gen + + ${project.basedir}/target/generated-sources/openapi/${openApiRelativeGeneratorDir} + + + + + + org.openapitools + openapi-generator-maven-plugin + 6.5.0 + + + + generate + + + ${project.basedir}/../openapi/openapi.yml + java + + ${openApiRelativeGeneratorDir} + apache-httpclient + ${basePackage}.api + ${basePackage}.model + ${basePackage}.client + + true + + false + + + true + + false + false + false + false + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + + copy-generated-resources + process-resources + + copy-resources + + + ${generatedDir} + + + ${openApiGeneratorDir} + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.2.0 + + + pre-generation-clean + initialize + + clean + + + true + + + ${generatedDir} + + + + + + post-generation-clean + process-resources + + clean + + + + + + + From 2c83f1dceb1058285bc1717af3878faaa7d81af5 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 8 May 2023 10:45:48 +0200 Subject: [PATCH 18/31] Fix template tracking --- {standard-maven-template => sessionize-java-client}/pom.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {standard-maven-template => sessionize-java-client}/pom.xml (100%) diff --git a/standard-maven-template/pom.xml b/sessionize-java-client/pom.xml similarity index 100% rename from standard-maven-template/pom.xml rename to sessionize-java-client/pom.xml From 42733332b469ef26b4494d6b0a5ca56a0ba9c2ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 May 2023 01:12:03 +0000 Subject: [PATCH 19/31] Bump build-helper-maven-plugin from 3.3.0 to 3.4.0 Bumps [build-helper-maven-plugin](https://github.com/mojohaus/build-helper-maven-plugin) from 3.3.0 to 3.4.0. - [Release notes](https://github.com/mojohaus/build-helper-maven-plugin/releases) - [Commits](https://github.com/mojohaus/build-helper-maven-plugin/compare/build-helper-maven-plugin-3.3.0...3.4.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:build-helper-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sessionize-java-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sessionize-java-client/pom.xml b/sessionize-java-client/pom.xml index 0bb09b5..fe406f1 100644 --- a/sessionize-java-client/pom.xml +++ b/sessionize-java-client/pom.xml @@ -221,7 +221,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.4.0 generate-sources From c6d6ff4e0bb36d29d510e2ea5ff5015f7931ebeb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 May 2023 01:12:05 +0000 Subject: [PATCH 20/31] Bump openapi-generator-maven-plugin from 6.5.0 to 6.6.0 Bumps openapi-generator-maven-plugin from 6.5.0 to 6.6.0. --- updated-dependencies: - dependency-name: org.openapitools:openapi-generator-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sessionize-java-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sessionize-java-client/pom.xml b/sessionize-java-client/pom.xml index 0bb09b5..6039d59 100644 --- a/sessionize-java-client/pom.xml +++ b/sessionize-java-client/pom.xml @@ -298,7 +298,7 @@ org.openapitools openapi-generator-maven-plugin - 6.5.0 + 6.6.0 From f4da54701159bdcac1659ee864a0af0f3d5386b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 May 2023 01:45:09 +0000 Subject: [PATCH 21/31] Bump maven-source-plugin from 3.2.1 to 3.3.0 Bumps [maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.2.1 to 3.3.0. - [Commits](https://github.com/apache/maven-source-plugin/compare/maven-source-plugin-3.2.1...maven-source-plugin-3.3.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-source-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- standard-maven-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 6fb0a3b..9f74dbf 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -147,7 +147,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources From 7c10ce2675c8cf17bbd8f01c3624610b02e045f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 May 2023 01:20:03 +0000 Subject: [PATCH 22/31] Bump jackson-bom from 2.15.0 to 2.15.2 Bumps [jackson-bom](https://github.com/FasterXML/jackson-bom) from 2.15.0 to 2.15.2. - [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.15.0...jackson-bom-2.15.2) --- updated-dependencies: - dependency-name: com.fasterxml.jackson:jackson-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- sessionize-java-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sessionize-java-client/pom.xml b/sessionize-java-client/pom.xml index 0bb09b5..8849ff1 100644 --- a/sessionize-java-client/pom.xml +++ b/sessionize-java-client/pom.xml @@ -94,7 +94,7 @@ com.fasterxml.jackson jackson-bom - 2.15.0 + 2.15.2 pom import From 1c37f6da5f2fd2deeced3fdc8f34a5e54f6781f4 Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Tue, 6 Jun 2023 09:37:58 +0200 Subject: [PATCH 23/31] Removed unused property --- standard-maven-template-demo/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/standard-maven-template-demo/pom.xml b/standard-maven-template-demo/pom.xml index 10d5305..a441c85 100644 --- a/standard-maven-template-demo/pom.xml +++ b/standard-maven-template-demo/pom.xml @@ -24,8 +24,6 @@ - apache_v2 - 17 ${javaVersion} From e07b6c1c67fdcbeb62554dd6af1c39b5e34bde6b Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Tue, 6 Jun 2023 09:40:03 +0200 Subject: [PATCH 24/31] Removed license from demo * Demo is never distributed via Maven * Demo license is always the same as the parent license --- standard-maven-template-demo/pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/standard-maven-template-demo/pom.xml b/standard-maven-template-demo/pom.xml index a441c85..f2df5ec 100644 --- a/standard-maven-template-demo/pom.xml +++ b/standard-maven-template-demo/pom.xml @@ -16,13 +16,6 @@ https://xdev.software - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - - - 17 ${javaVersion} From 3fb9d4b33f0c6cfa35071d6d5fadaa008b761416 Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Tue, 6 Jun 2023 14:08:23 +0200 Subject: [PATCH 25/31] Build executable jar in demo --- standard-maven-template-demo/pom.xml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/standard-maven-template-demo/pom.xml b/standard-maven-template-demo/pom.xml index f2df5ec..018a999 100644 --- a/standard-maven-template-demo/pom.xml +++ b/standard-maven-template-demo/pom.xml @@ -49,6 +49,34 @@ + + org.apache.maven.plugins + maven-assembly-plugin + 3.6.0 + + + + ${mainClass} + + + true + + + + jar-with-dependencies + + false + + + + make-assembly + package + + single + + + + From 8eb268515b3f1029d1bb4649c996d07278837ab3 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 9 Jun 2023 14:07:03 +0200 Subject: [PATCH 26/31] Fix tracking --- sessionize-java-client/pom.xml | 388 --------------------------------- 1 file changed, 388 deletions(-) delete mode 100644 sessionize-java-client/pom.xml diff --git a/sessionize-java-client/pom.xml b/sessionize-java-client/pom.xml deleted file mode 100644 index 0bb09b5..0000000 --- a/sessionize-java-client/pom.xml +++ /dev/null @@ -1,388 +0,0 @@ - - - 4.0.0 - - com.xdev-software - sessionize-java-client - 1.0.0-SNAPSHOT - jar - - sessionize-java-client - sessionize-java-client - https://github.com/xdev-software/sessionize-java-client - - - https://github.com/xdev-software/sessionize-java-client - https://github.com/xdev-software/sessionize-java-client.git - - - 2023 - - - XDEV Software - https://xdev.software - - - - - XDEV Software - XDEV Software - https://xdev.software - - - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - 17 - ${javaVersion} - - UTF-8 - UTF-8 - - - - src/generated/** - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - - com.fasterxml.jackson - jackson-bom - 2.15.0 - pom - import - - - - - - - - org.apache.httpcomponents.client5 - httpclient5 - 5.2.1 - - - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - org.openapitools - jackson-databind-nullable - 0.2.6 - - - - jakarta.annotation - jakarta.annotation-api - 2.1.1 - - - - - - - com.mycila - license-maven-plugin - 4.2 - - - ${project.organization.url} - - - -
com/mycila/maven/plugin/license/templates/APACHE-2.txt
- - src/main/java/** - src/test/java/** - - - - - - - first - - format - - process-sources - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - ${maven.compiler.release} - - -proc:none - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - - - attach-javadocs - verify - - jar - - - - - true - none - - - - org.apache.maven.plugins - maven-source-plugin - 3.2.1 - - - attach-sources - verify - - jar-no-fork - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - - - generate-sources - - add-source - - - - src/generated/java - - - - - - - - - - ossrh - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.1.0 - - - sign-artifacts - verify - - sign - - - - - - --pinentry-mode - loopback - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 - true - - ossrh - https://oss.sonatype.org/ - - 30 - true - - - - - - - openapi-generator - - software.xdev.sessionize - - ${project.basedir}/src/generated/java - src/gen - - ${project.basedir}/target/generated-sources/openapi/${openApiRelativeGeneratorDir} - - - - - - org.openapitools - openapi-generator-maven-plugin - 6.5.0 - - - - generate - - - ${project.basedir}/../openapi/openapi.yml - java - - ${openApiRelativeGeneratorDir} - apache-httpclient - ${basePackage}.api - ${basePackage}.model - ${basePackage}.client - - true - - false - - - true - - false - false - false - false - - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.3.1 - - - copy-generated-resources - process-resources - - copy-resources - - - ${generatedDir} - - - ${openApiGeneratorDir} - - - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.2.0 - - - pre-generation-clean - initialize - - clean - - - true - - - ${generatedDir} - - - - - - post-generation-clean - process-resources - - clean - - - - - - - - - From 8ec98cc0ed27b787d1fc45bfd5222002fe697abd Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 9 Jun 2023 14:07:17 +0200 Subject: [PATCH 27/31] Fix tracking II --- {standard-maven-template => sessionize-java-client}/pom.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {standard-maven-template => sessionize-java-client}/pom.xml (100%) diff --git a/standard-maven-template/pom.xml b/sessionize-java-client/pom.xml similarity index 100% rename from standard-maven-template/pom.xml rename to sessionize-java-client/pom.xml From e3b1dc3e21d157386e2f0f8e5d2b8d169e1921d3 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 9 Jun 2023 14:08:00 +0200 Subject: [PATCH 28/31] Fix tracking III --- sessionize-java-client/pom.xml | 192 +++++++++++++++++++++++++++++++-- 1 file changed, 186 insertions(+), 6 deletions(-) diff --git a/sessionize-java-client/pom.xml b/sessionize-java-client/pom.xml index 9f74dbf..1fa8022 100644 --- a/sessionize-java-client/pom.xml +++ b/sessionize-java-client/pom.xml @@ -5,17 +5,17 @@ 4.0.0 com.xdev-software - standard-maven-template + sessionize-java-client 1.0.0-SNAPSHOT jar - standard-maven-template - standard-maven-template - https://github.com/xdev-software/standard-maven-template + sessionize-java-client + sessionize-java-client + https://github.com/xdev-software/sessionize-java-client - https://github.com/xdev-software/standard-maven-template - https://github.com/xdev-software/standard-maven-template.git + https://github.com/xdev-software/sessionize-java-client + https://github.com/xdev-software/sessionize-java-client.git 2023 @@ -47,6 +47,11 @@ UTF-8 UTF-8 + + + + src/generated/** + @@ -84,6 +89,60 @@ + + + + com.fasterxml.jackson + jackson-bom + 2.15.0 + pom + import + + + + + + + + org.apache.httpcomponents.client5 + httpclient5 + 5.2.1 + + + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + org.openapitools + jackson-databind-nullable + 0.2.6 + + + + jakarta.annotation + jakarta.annotation-api + 2.1.1 + + + @@ -158,6 +217,25 @@ + + + org.codehaus.mojo + build-helper-maven-plugin + 3.3.0 + + + generate-sources + + add-source + + + + src/generated/java + + + + + @@ -204,5 +282,107 @@ + + openapi-generator + + software.xdev.sessionize + + ${project.basedir}/src/generated/java + src/gen + + ${project.basedir}/target/generated-sources/openapi/${openApiRelativeGeneratorDir} + + + + + + org.openapitools + openapi-generator-maven-plugin + 6.5.0 + + + + generate + + + ${project.basedir}/../openapi/openapi.yml + java + + ${openApiRelativeGeneratorDir} + apache-httpclient + ${basePackage}.api + ${basePackage}.model + ${basePackage}.client + + true + + false + + + true + + false + false + false + false + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + + copy-generated-resources + process-resources + + copy-resources + + + ${generatedDir} + + + ${openApiGeneratorDir} + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.2.0 + + + pre-generation-clean + initialize + + clean + + + true + + + ${generatedDir} + + + + + + post-generation-clean + process-resources + + clean + + + + + + + From 323242c78b7b0d5ffa4f331a7d40fdf7e744448c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Jun 2023 01:15:25 +0000 Subject: [PATCH 29/31] Bump maven-clean-plugin from 3.2.0 to 3.3.1 Bumps [maven-clean-plugin](https://github.com/apache/maven-clean-plugin) from 3.2.0 to 3.3.1. - [Release notes](https://github.com/apache/maven-clean-plugin/releases) - [Commits](https://github.com/apache/maven-clean-plugin/compare/maven-clean-plugin-3.2.0...maven-clean-plugin-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-clean-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sessionize-java-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sessionize-java-client/pom.xml b/sessionize-java-client/pom.xml index 55b5f36..ef609a6 100644 --- a/sessionize-java-client/pom.xml +++ b/sessionize-java-client/pom.xml @@ -355,7 +355,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.2.0 + 3.3.1 pre-generation-clean From ca645bc46cf16473696805e380eca88de1be9745 Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Mon, 26 Jun 2023 10:01:21 +0200 Subject: [PATCH 30/31] Replace deprecated save actions plugin with XDEV fork --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 79c7cf2..ba0aff1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,7 +26,7 @@ You should have the following things installed: ### Recommended setup * Install ``IntelliJ`` (Community Edition is sufficient) * Install the following plugins: - * [Save Actions](https://plugins.jetbrains.com/plugin/7642-save-actions) - Provides save actions, like running the formatter or adding ``final`` to fields + * [Save Actions](https://plugins.jetbrains.com/plugin/22113) - Provides save actions, like running the formatter or adding ``final`` to fields * [SonarLint](https://plugins.jetbrains.com/plugin/7973-sonarlint) - CodeStyle/CodeAnalysis * [Checkstyle-IDEA](https://plugins.jetbrains.com/plugin/1065-checkstyle-idea) - CodeStyle/CodeAnalysis * Import the project From f8e672881b2a8ef972a2064e412df9e1b8c3e17c Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 7 Jul 2023 12:18:51 +0200 Subject: [PATCH 31/31] Rework Contributing.md --- CONTRIBUTING.md | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ba0aff1..8468781 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,19 +1,18 @@ ## Contributing -We would absolutely love to get the community involved, and we welcome any form of contributions – comments and questions on different communication channels, issues and pull request in the repositories, and anything that you build and share using our components. +We would absolutely love to get the community involved, and we welcome any form of contributions – comments and questions on different communication channels, issues and pull request and anything that you build and share using our components. -### Get in touch with the team +### Communication channels +* Communication is primarily done using issues. +* If you need support as soon as possible and you can't wait for any pull request, feel free to use [our support](https://xdev.software/en/services/support). +* As a last resort measure or on otherwise important matter you may also [contact us directly](https://xdev.software/en/about-us/contact). -Twitter: https://twitter.com/xdevsoftware -
-Mail: opensource@xdev-software.de +### Ways to help +* **Report bugs**
Create an issue or send a pull request +* **Send pull requests**
If you want to contribute code, check out the development instructions below. + * However when contributing new features, please first discuss the change you wish to make via issue with the owners of this repository before making a change. Otherwise your work might be rejected and your effort was pointless. -### Some ways to help: - -- **Report bugs**: File issues on GitHub. -- **Send pull requests**: If you want to contribute code, check out the development instructions below. - -We encourage you to read the [contribution instructions by GitHub](https://guides.github.com/activities/contributing-to-open-source/#contributing) also. +We also encourage you to read the [contribution instructions by GitHub](https://docs.github.com/en/get-started/quickstart/contributing-to-projects). ## Developing