Merge pull request #277 from deftdevs/prepare-1.0

Merge branch for preparing 1.0

Author: pathob

.doc/CODE_CONVENTIONS.adoc

@@ -36,7 +36,6 @@ Example:
 public class EntityModel {
 
     @XmlElement
-    @NotNull
     private String name;
 
     @XmlElement
@@ -142,7 +141,7 @@ public interface EntitiesResource {
     )
     Response addEntity(
             @QueryParam("doSomethingAfterAdding") @DefaultValue("false") final boolean doSomethingAfterAdding,
-            @NotNull final EntityModel entity);
+            final EntityModel entity);
 
 }
 ----
@@ -185,7 +184,7 @@ public class EntitiesResourceImpl implements EntitiesResource {
     @Override
     public Response addEntity(
             final boolean doSomethingAfterAdding,
-            @NotNull final EntityModel entity) {
+            final EntityModel entity) {
 
         final ErrorCollection errorCollection = new ErrorCollection();
         try {

.github/workflows/ci.yaml

@@ -4,9 +4,8 @@ on:
   push:
     branches:
       - 'main'
+      - 'prepare-1.0'
   pull_request:
-    branches:
-      - 'main'
   merge_group:
 
 jobs:

.github/workflows/release.yaml

@@ -3,10 +3,14 @@ name: Release
 on:
   workflow_dispatch:
     inputs:
-      version:
+      releaseVersion:
         description: 'Release version (only if different from current SNAPSHOT version)'
         type: string
         required: false
+      developmentVersion:
+        description: 'Development version after release (only if different from auto-generated version)'
+        type: string
+        required: false
 
 ## Requires workflow permissions to be set to 'read and write permissions'
 ## in Repository -> Settings -> Action -> General (and organisation settings)
@@ -47,4 +51,4 @@ jobs:
         MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
         RELEASE_GPG_PASSPHRASE: ${{ secrets.RELEASE_GPG_PASSPHRASE }}
       run: |
-        mvn -B -P release release:prepare release:perform -DreleaseVersion=${{ inputs.version }} -Darguments="-DskipITs"
+        mvn -B -P release release:prepare release:perform -DreleaseVersion=${{ inputs.releaseVersion }} -DdevelopmentVersion=${{ inputs.developmentVersion }} -Darguments="-DskipITs"

commons/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.deftdevs</groupId>
         <artifactId>bootstrapi-parent</artifactId>
-        <version>0.12.1-SNAPSHOT</version>
+        <version>1.0.0-rc2-SNAPSHOT</version>
     </parent>
 
     <artifactId>bootstrapi-commons</artifactId>
@@ -48,6 +48,7 @@
 
     <properties>
         <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
+        <jackson.version>2.17.3</jackson.version>
     </properties>
 
     <dependencyManagement>
@@ -63,6 +64,7 @@
     </dependencyManagement>
 
     <dependencies>
+
         <!-- behave like a compile dependencies -->
 
         <dependency>
@@ -105,7 +107,7 @@
 
         <dependency>
             <groupId>com.atlassian.plugins.authentication</groupId>
-            <artifactId>atlassian-authentication-plugin</artifactId>
+            <artifactId>atlassian-authentication-plugin-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -136,50 +138,58 @@
         <!-- other provided dependencies -->
 
         <dependency>
-            <groupId>jakarta.ws.rs</groupId>
-            <artifactId>jakarta.ws.rs-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-core-asl</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-jaxrs</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
+            <version>${jackson.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -233,12 +243,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
     <build>

commons/src/main/java/com/deftdevs/bootstrapi/commons/constants/BootstrAPI.java

@@ -28,9 +28,6 @@ public class BootstrAPI {
     public static final String ERROR                        = "error";
     public static final String ERRORS                       = "errors";
     public static final String FAVICON                      = "favicon";
-    public static final String GADGET                       = "gadget";
-    public static final String GADGETS                      = "gadgets";
-    public static final String GADGET_EXTERNAL              = "external";
     public static final String GROUP                        = "group";
     public static final String GROUPS                       = "groups";
     public static final String HTTP                         = "http";

commons/src/main/java/com/deftdevs/bootstrapi/commons/exception/web/mapper/JsonMappingExceptionMapper.java

@@ -1,7 +1,7 @@
 package com.deftdevs.bootstrapi.commons.exception.web.mapper;
 
 import com.deftdevs.bootstrapi.commons.model.ErrorCollection;
-import org.codehaus.jackson.map.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
 
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;

commons/src/main/java/com/deftdevs/bootstrapi/commons/exception/web/mapper/ValidationExceptionMapper.java

@@ -2,10 +2,10 @@
 
 import com.deftdevs.bootstrapi.commons.model.ErrorCollection;
 
-import javax.validation.ValidationException;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
+import javax.xml.bind.ValidationException;
 import java.util.Arrays;
 
 @Provider

commons/src/main/java/com/deftdevs/bootstrapi/commons/http/PATCH.java

@@ -1,11 +1,11 @@
 package com.deftdevs.bootstrapi.commons.model;
 
 import com.deftdevs.bootstrapi.commons.constants.BootstrAPI;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.codehaus.jackson.annotate.JsonSubTypes;
-import org.codehaus.jackson.annotate.JsonTypeInfo;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;

commons/src/main/java/com/deftdevs/bootstrapi/commons/model/AbstractAuthenticationIdpModel.java

@@ -1,11 +1,11 @@
 package com.deftdevs.bootstrapi.commons.model;
 
 import com.deftdevs.bootstrapi.commons.constants.BootstrAPI;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.codehaus.jackson.annotate.JsonSubTypes;
-import org.codehaus.jackson.annotate.JsonTypeInfo;
 
 import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlElement;