Merge pull request #38 from xdev-software/develop

1.1.1

Author: AB-xdev

.github/workflows/checkBuild.yml

@@ -21,14 +21,14 @@ jobs:
 
     strategy:
       matrix:
-        java: [17]
+        java: [17, 21]
         distribution: [temurin]
 
     steps:
     - uses: actions/checkout@v4
 
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: ${{ matrix.distribution }}
         java-version: ${{ matrix.java }}

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'
@@ -120,7 +120,7 @@ jobs:
         git pull
     
     - name: Set up JDK Apache Maven Central
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with: # running setup-java again overwrites the settings.xml
         java-version: '17'
         distribution: 'temurin'
@@ -152,7 +152,7 @@ jobs:
         git pull
 
     - name: Setup - Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'

.github/workflows/sonar.yml

@@ -31,7 +31,7 @@ jobs:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17

.github/workflows/test-deploy.yml

@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up JDK OSSRH
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with: # running setup-java again overwrites the settings.xml
         distribution: 'temurin'
         java-version: '17'

.github/workflows/update-from-template.yml

@@ -86,9 +86,8 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           gh_pr_up() { 
-            gh pr create "$@" || gh pr edit "$@" 
+            gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || (git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@")
           }
           gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \
-            -H "${{ env.UPDATE_BRANCH }}" \
             --title "Update from template" \
             --body "An automated PR to sync changes from the template into this repo"

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.1.1
+* Removed unused dependency ``com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider``
+
 # 1.1.0
 * Add undocumented ``video_stream`` field for sessions.<br/>Affected endpoints are:
   * ``/session/add``

CONTRIBUTING.md

@@ -19,7 +19,7 @@ We also encourage you to read the [contribution instructions by GitHub](https://
 ### Software Requirements
 You should have the following things installed:
 * Git
-* Java 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
+* Java 21 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/))
 * Maven
 
 ### Recommended setup

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.xdev-software</groupId>
 	<artifactId>sched-java-client-root</artifactId>
-	<version>1.1.0</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>

sched-java-client-demo/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.xdev-software</groupId>
 	<artifactId>sched-java-client-demo</artifactId>
-	<version>1.1.0</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<inceptionYear>2022</inceptionYear>
@@ -25,7 +25,7 @@
 
 		<mainClass>software.xdev.Application</mainClass>
 
-		<log4j2-version>2.21.0</log4j2-version>
+		<log4j2-version>2.22.0</log4j2-version>
 	</properties>
 
 	<dependencies>

sched-java-client/pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>com.xdev-software</groupId>
 	<artifactId>sched-java-client</artifactId>
-	<version>1.1.0</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>sched-java-client</name>
@@ -94,7 +94,7 @@
 			<dependency>
 				<groupId>com.fasterxml.jackson</groupId>
 				<artifactId>jackson-bom</artifactId>
-				<version>2.15.3</version>
+				<version>2.16.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -106,7 +106,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
-			<version>5.2.1</version>
+			<version>5.2.3</version>
 		</dependency>
 
 		<!-- JSON processing: jackson -->
@@ -122,10 +122,6 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-jsr310</artifactId>
@@ -188,7 +184,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.6.0</version>
+				<version>3.6.3</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -221,7 +217,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
-				<version>3.4.0</version>
+				<version>3.5.0</version>
 				<executions>
 					<execution>
 						<phase>generate-sources</phase>
@@ -285,7 +281,7 @@
 		<profile>
 			<id>openapi-generator</id>
 			<properties>
-				<basePackage>software.xdev.sched</basePackage>
+				<componentName>sched</componentName>
 
 				<generatedDirRelative>src/generated/java</generatedDirRelative>
 				<generatedDir>${project.basedir}/${generatedDirRelative}</generatedDir>
@@ -299,7 +295,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-clean-plugin</artifactId>
-						<version>3.3.1</version>
+						<version>3.3.2</version>
 						<executions>
 							<execution>
 								<id>pre-generation-clean</id>
@@ -328,7 +324,7 @@
 					<plugin>
 						<groupId>org.openapitools</groupId>
 						<artifactId>openapi-generator-maven-plugin</artifactId>
-						<version>7.0.1</version>
+						<version>7.1.0</version>
 						<executions>
 							<execution>
 								<goals>
@@ -340,9 +336,9 @@
 									<configOptions>
 										<sourceFolder>${openApiRelativeGeneratorDir}</sourceFolder>
 										<library>apache-httpclient</library>
-										<apiPackage>${basePackage}.api</apiPackage>
-										<modelPackage>${basePackage}.model</modelPackage>
-										<invokerPackage>${basePackage}.client</invokerPackage>
+										<apiPackage>software.xdev.${componentName}.api</apiPackage>
+										<modelPackage>software.xdev.${componentName}.model</modelPackage>
+										<invokerPackage>software.xdev.${componentName}.client</invokerPackage>
 										<!-- Otherwise throw and catch everywhere -->
 										<useRuntimeException>true</useRuntimeException>
 										<!-- Some fields of API have been ignored because they are unused -->
@@ -388,6 +384,23 @@
 						<artifactId>find-and-replace-maven-plugin</artifactId>
 						<version>1.1.0</version>
 						<executions>
+							<execution>
+								<id>remove-unused-import-com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider</id>
+								<phase>process-sources</phase>
+								<goals>
+									<goal>find-and-replace</goal>
+								</goals>
+								<configuration>
+									<replacementType>file-contents</replacementType>
+									<baseDir>${generatedDirRelative}/software/xdev/${componentName}/client/</baseDir>
+									<fileMask>ApiClient.java</fileMask>
+									<!-- @formatter:off DO NOT INTRODUCE LINE BREAK -->
+									<findRegex>^(import com\.fasterxml\.jackson\.jaxrs\.json\.JacksonJsonProvider;)$</findRegex>
+									<!-- Can't be removed as the plugin isn't supporting empty values -->
+									<replaceValue>// $1</replaceValue>
+									<!-- @formatter:on -->
+								</configuration>
+							</execution>
 							<execution>
 								<!-- Sched Patch No1: Simple text is returned as text/html despite having no HTML -->
 								<id>handle-html-like-text</id>