Update to 5.0.2-SNAPSHOT

.github/workflows/release.yml

@@ -29,9 +29,7 @@ jobs:
   delete_old_snapshots:
 
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
+    permissions: write-all
 
     steps:
 
@@ -40,6 +38,7 @@ jobs:
         with:
           organization: assimbly
           type: maven
+          token: ${{ secrets.MAVEN_TOKEN }}
           keep: 0
           semver-pattern: "${{inputs.milestone}}"
           names: |
@@ -53,7 +52,6 @@ jobs:
             org.assimbly.camel-components
             org.assimbly.utils
             org.assimbly.extra
-            org.assimbly.extra
 
   release-jars:
     needs: delete_old_snapshots
@@ -67,7 +65,7 @@ jobs:
       - name: Checkout the code
         uses: actions/checkout@v4
         with:
-          repository: ${{ github.repository }}
+          repository: "assimbly/base"
           ref: ${{ inputs.branch }}
           fetch-depth: 0
           token: ${{ secrets.RELEASE_TOKEN }}

.github/workflows/update-version.yml

@@ -3,13 +3,21 @@ name: Update Version Number
 on:
   workflow_dispatch:
     inputs:
+      branch:
+        description: 'Branch to use'
+        type: string
+        default: 'develop'    
       milestone:
         description: 'Milestone to use as version'
         type: string
         required: true
 
   workflow_call:
     inputs:
+      branch:
+        description: 'Branch to use'
+        type: string
+        default: 'develop'    
       milestone:
         description: 'Milestone to use as version'
         type: string
@@ -29,8 +37,8 @@ jobs:
       - name: Checkout the code
         uses: actions/checkout@v4
         with:
-          repository: ${{ github.repository }}
-          ref: ${{ github.ref_name }}
+          repository: assimbly/base
+          ref: ${{ inputs.branch }}
           fetch-depth: 0
           token: ${{ secrets.RELEASE_TOKEN }}
 
@@ -47,12 +55,12 @@ jobs:
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "skin27"
-          git commit -a -m "Update version to ${{inputs.milestone}}"
+          git diff-index --quiet HEAD || git commit -a -m "Update version to ${{inputs.milestone}}"
 
       - name: Push changes
         uses: ad-m/github-push-action@master
         with:
           github_token: ${{ secrets.RELEASE_TOKEN }}
-          repository: ${{ github.repository }}
-          ref: ${{ github.ref_name }}
+          repository: assimbly/base
+          ref: ${{ inputs.branch }}
           force_with_lease: true

activemqBase/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>base</artifactId>
         <groupId>org.assimbly</groupId>
-        <version>5.0.0</version>
+        <version>5.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>activemq-base</artifactId>

camelBase/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>base</artifactId>
         <groupId>org.assimbly</groupId>
-        <version>5.0.0</version>
+        <version>5.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-base</artifactId>
@@ -106,10 +106,14 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-groovy</artifactId>
         </dependency>
-       <!-- <dependency>
+        <!-- <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-javascript</artifactId>
+            <artifactId>camel-jmx</artifactId>
         </dependency>-->
+        <!-- <dependency>
+             <groupId>org.apache.camel</groupId>
+             <artifactId>camel-javascript</artifactId>
+         </dependency>-->
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-joor</artifactId>
@@ -142,6 +146,10 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-metrics</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-micrometer</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-quartz</artifactId>

camelComponents/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>base</artifactId>
         <groupId>org.assimbly</groupId>
-        <version>5.0.0</version>
+        <version>5.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-components</artifactId>

commonBase/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>base</artifactId>
         <groupId>org.assimbly</groupId>
-        <version>5.0.0</version>
+        <version>5.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>common-base</artifactId>

databaseDrivers/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>base</artifactId>
         <groupId>org.assimbly</groupId>
-        <version>5.0.0</version>
+        <version>5.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>database-drivers</artifactId>

extra/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>base</artifactId>
         <groupId>org.assimbly</groupId>
-        <version>5.0.0</version>
+        <version>5.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>extra</artifactId>

pom.xml

@@ -7,7 +7,7 @@
 	<packaging>pom</packaging>
 	<name>org.assimbly.camelconnector</name>
 	<url>http://maven.apache.org</url>
-	<version>5.0.0</version>
+	<version>5.0.2-SNAPSHOT</version>
 
 	<modules>
 		<module>activemqBase</module>
@@ -41,12 +41,12 @@
 		<!-- Manage the versions of all dependencies here -->
 		<aopalliance.version>1.0</aopalliance.version>
 		<axiom.version>1.4.0</axiom.version>
-		<assimbly.version>5.0.0</assimbly.version>
+		<assimbly.version>5.0.2-SNAPSHOT</assimbly.version>
 		<activemq-classic.version>6.1.3</activemq-classic.version>
-		<activemq-artemis.version>2.37.0</activemq-artemis.version>
+		<activemq-artemis.version>2.38.0</activemq-artemis.version>
 		<activemq-artemis-native.version>2.0.0</activemq-artemis-native.version>
 		<bouncycastle.version>1.70</bouncycastle.version>
-		<camel.version>4.8.0</camel.version>
+		<camel.version>4.8.1</camel.version>
 		<commons-beanutils.version>1.9.4</commons-beanutils.version>
 		<commons-cli.version>1.9.0</commons-cli.version>
 		<commons-codec.version>1.17.1</commons-codec.version>
@@ -62,14 +62,14 @@
 		<commons-text.version>1.12.0</commons-text.version>
 		<db2-jdbc.version>db2jcc4</db2-jdbc.version>
 		<docconverter.version>1.11.0</docconverter.version>
-		<dropwizard-metrics.version>4.2.27</dropwizard-metrics.version>
-		<elasticsearch-rest-client.version>8.15.2</elasticsearch-rest-client.version>
+		<dropwizard-metrics.version>4.2.28</dropwizard-metrics.version>
+		<elasticsearch-rest-client.version>8.15.3</elasticsearch-rest-client.version>
 		<gson.version>2.11.0</gson.version>
 		<groovy-script.version>4.0.23</groovy-script.version>
 		<guava.version>33.3.1-jre</guava.version>
-		<ibmmq-client.version>9.4.0.5</ibmmq-client.version>
+		<ibmmq-client.version>9.4.1.0</ibmmq-client.version>
 		<informix-jdbc.version>4.50.11</informix-jdbc.version>
-		<jackson.version>2.18.0</jackson.version>
+		<jackson.version>2.18.1</jackson.version>
 		<jakarta-activation-api.version>2.1.3</jakarta-activation-api.version>
 		<jakarta-annotation-api.version>3.0.0</jakarta-annotation-api.version>
 		<jakarta-json-api.version>2.1.3</jakarta-json-api.version>
@@ -81,30 +81,29 @@
 		<json.version>20240303</json.version>
 		<jsonassert.version>1.5.3</jsonassert.version>
 		<json-path.version>2.9.0</json-path.version>
-		<junit.version>5.11.1</junit.version>
+		<junit.version>5.11.3</junit.version>
 		<jwt.version>0.12.6</jwt.version>
 		<jolokia.version>2.1.1</jolokia.version>
 		<httpclient.version>4.5.14</httpclient.version>
 		<kamelet.version>4.8.0</kamelet.version>
-		<logback-classic.version>1.5.8</logback-classic.version>
-		<messaginghub.version>3.1.6</messaginghub.version>
-		<messaginghub.version>3.1.6</messaginghub.version>
+		<logback-classic.version>1.5.12</logback-classic.version>
+		<messaginghub.version>3.1.7</messaginghub.version>
 		<mssql-jdbc.version>12.8.1.jre11</mssql-jdbc.version> <!-- use jre21 when it comes out -->
-		<mockito.version>5.13.0</mockito.version>
+		<mockito.version>5.14.2</mockito.version>
 		<mockserver.version>5.15.0</mockserver.version>
 		<mongo.version>3.12.11</mongo.version>
-		<mysql-connector-java.version>9.0.0</mysql-connector-java.version>
-		<netty.version>4.1.113.Final</netty.version>
+		<mysql-connector-java.version>9.1.0</mysql-connector-java.version>
+		<netty.version>4.1.114.Final</netty.version>
 		<oracle12.version>23.5.0.24.07</oracle12.version>
 		<postgresql.version>42.7.4</postgresql.version>
 		<powermock.version>2.0.9</powermock.version>
 		<qpid-proton-j.version>0.34.1</qpid-proton-j.version>
 		<slf4j.version>2.0.16</slf4j.version>
 		<sonic.version>12.0.2</sonic.version>
-		<spring.version>6.1.13</spring.version>
-		<spring-data.version>3.3.4</spring-data.version>
+		<spring.version>6.1.14</spring.version>
+		<spring-data.version>3.3.5</spring-data.version>
 		<springdoc.version>2.6.0</springdoc.version>
-		<sqlite-jdbc.version>3.46.1.3</sqlite-jdbc.version>
+		<sqlite-jdbc.version>3.47.0.0</sqlite-jdbc.version>
 		<tika.version>1.28.5</tika.version>
 		<xalan.version>2.7.3</xalan.version>
 		<xerces.version>2.12.2</xerces.version>
@@ -125,7 +124,7 @@
 			<dependency>
 				<groupId>org.apache.maven.plugin-tools</groupId>
 				<artifactId>maven-plugin-annotations</artifactId>
-				<version>3.15.0</version>
+				<version>3.15.1</version>
 				<scope>provided</scope> <!-- annotations are not used at runtime because @Retention(value=CLASS), they are needed only to build the plugin -->
 			</dependency>
 		</dependencies>

springBase/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>base</artifactId>
         <groupId>org.assimbly</groupId>
-        <version>5.0.0</version>
+        <version>5.0.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>spring-base</artifactId>

testBase/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>base</artifactId>
         <groupId>org.assimbly</groupId>
-        <version>5.0.0</version>
+        <version>5.0.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -86,12 +86,12 @@
             <version>${mockito.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>org.mock-server</groupId>
             <artifactId>mockserver-netty</artifactId>
             <version>${mockserver.version}</version>
             <scope>compile</scope>
-        </dependency>
+        </dependency>-->
 
         <!-- is this need as powermock isn't available for junit5? -->
         <dependency>

utils/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>base</artifactId>
     <groupId>org.assimbly</groupId>
-    <version>5.0.0</version>
+    <version>5.0.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>utils</artifactId>