Merge branch 'develop'

.circleci/config.yml

@@ -1,51 +1,7 @@
-version: 2
-jobs:
-  build:
-    docker:
-      - image: circleci/openjdk:8-jdk
-    working_directory: ~/repo
-    environment:
-      MAVEN_OPTS: -Xmx3200m
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "pom.xml" }}
-            - v1-dependencies-
-      - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes
-      - run: mvn -s .circleci/maven.settings.xml clean verify
-      - save_cache:
-          paths:
-            - ~/.m2
-          key: v1-dependencies-{{ checksum "pom.xml" }}
-
-  deploy:
-    docker:
-      - image: circleci/openjdk:8-jdk
-    working_directory: ~/repo
-    environment:
-      MAVEN_OPTS: -Xmx3200m
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "pom.xml" }}
-            - v1-dependencies-
-      - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes
-      - run: mvn -s .circleci/maven.settings.xml clean deploy -DskipTests
-      - save_cache:
-          paths:
-            - ~/.m2
-          key: v1-dependencies-{{ checksum "pom.xml" }}
-
+version: 2.1
+orbs:
+  gradle: circleci/[email protected]
 workflows:
-  version: 2
-  build_deploy:
+  checkout-build-test:
     jobs:
-      - build
-      - deploy:
-          filters:
-            branches:
-              only: master
-          requires:
-            - build
+      - gradle/test

.github/dependabot.yml

@@ -2,12 +2,7 @@
 
 version: 2
 updates:
-  # Maintain dependencies for maven
-  - package-ecosystem: "maven"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-  # Maintain dependencies for maven
+  # Maintain dependencies for gradle
   - package-ecosystem: "gradle"
     directory: "/"
     schedule:

build-11.gradle

@@ -0,0 +1,42 @@
+plugins {
+	id 'org.springframework.boot' version '2.7.6'
+	id 'java'
+}
+
+apply plugin: 'io.spring.dependency-management'
+apply plugin: 'java'
+
+repositories {
+	mavenLocal()
+	mavenCentral()
+}
+
+dependencies {
+	implementation 'org.springframework.boot:spring-boot-starter'
+	implementation 'com.github.checkmarx-ltd:cx-spring-boot-sdk:0.5.29'
+	implementation 'info.picocli:picocli-spring-boot-starter:4.7.0'
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+
+        implementation 'com.sun.xml.bind:jaxb-impl:2.4.0-b180830.0438'
+        implementation 'com.sun.xml.bind:jaxb-core:2.3.0.1'
+}
+
+configurations {
+	libsDirName = 'libs/java11'
+}
+
+jar {
+    enabled = false
+}
+
+// Signing
+apply plugin: 'signing'
+signing {
+	sign configurations.archives
+}
+
+// Configure group ID, artifact ID, and version
+group = 'com.checkmarx-ts.util'
+archivesBaseName = "cx-java-util"
+version = file('version.txt').text.trim()
+sourceCompatibility = '1.8'

build.gradle

@@ -1,46 +1,37 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.1'
+	id 'org.springframework.boot' version '2.7.6'
 	id 'java'
 }
 
 apply plugin: 'io.spring.dependency-management'
 apply plugin: 'java'
 
 repositories {
+	mavenLocal()
 	mavenCentral()
 }
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter'
-	implementation 'com.github.checkmarx-ltd:cx-spring-boot-sdk:0.4.99'
-	implementation 'info.picocli:picocli-spring-boot-starter:4.6.1'
+	implementation 'com.github.checkmarx-ltd:cx-spring-boot-sdk:0.5.29'
+	implementation 'info.picocli:picocli-spring-boot-starter:4.7.0'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }
 
+jar {
+    enabled = false
+}
 
 // Signing
 apply plugin: 'signing'
 signing {
 	sign configurations.archives
 }
 
-// Add Javadoc JAR and sources JAR to artifact
-task javadocJar(type: Jar) {
-	classifier = 'javadoc'
-	from javadoc
-}
-task sourcesJar(type: Jar) {
-	classifier = 'sources'
-	from sourceSets.main.allSource
-}
-artifacts {
-	archives javadocJar, sourcesJar
-}
-
 // Configure group ID, artifact ID, and version
 group = 'com.checkmarx-ts.util'
 archivesBaseName = "cx-java-util"
-version = '0.3.4'
+version = file('version.txt').text.trim()
 sourceCompatibility = '1.8'
 
 // Temporary fix for CVE-2021-44832