Merge pull request #49 from xdev-software/develop

1.1.2

Author: AB-xdev

.github/workflows/checkBuild.yml

@@ -28,7 +28,7 @@ jobs:
     - 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'

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.1.2
+* Removed unused dependency ``com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider``
+
 # 1.1.1
 * Update dependencies
 

sessionize-java-client/pom.xml

@@ -48,6 +48,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
+		<generatedDirRelative>src/generated/java</generatedDirRelative>
+
 		<!-- Ignore generated code -->
 		<sonar.exclusions>
 			src/generated/**
@@ -106,7 +108,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 +124,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 +186,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.6.2</version>
+				<version>3.6.3</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -221,7 +219,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>
@@ -230,7 +228,7 @@
 						</goals>
 						<configuration>
 							<sources>
-								<source>src/generated/java</source>
+								<source>${generatedDirRelative}</source>
 							</sources>
 						</configuration>
 					</execution>
@@ -285,9 +283,9 @@
 		<profile>
 			<id>openapi-generator</id>
 			<properties>
-				<basePackage>software.xdev.sessionize</basePackage>
+				<componentName>sessionize</componentName>
 
-				<generatedDir>${project.basedir}/src/generated/java</generatedDir>
+				<generatedDir>${project.basedir}/${generatedDirRelative}</generatedDir>
 				<openApiRelativeGeneratorDir>src/gen</openApiRelativeGeneratorDir>
 				<openApiGeneratorDir>
 					${project.basedir}/target/generated-sources/openapi/${openApiRelativeGeneratorDir}
@@ -339,9 +337,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 -->
@@ -382,6 +380,30 @@
 							</execution>
 						</executions>
 					</plugin>
+					<plugin>
+						<groupId>io.github.floverfelt</groupId>
+						<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>
+						</executions>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>

sessionize-java-client/src/generated/java/software/xdev/sessionize/client/ApiClient.java

@@ -16,7 +16,7 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import java.time.OffsetDateTime;
-import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
+// import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JavaType;