Bean: Use properties instead of property with key and value

kamelets/mariadb-sink.kamelet.yaml

@@ -97,15 +97,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:mariadb://{{serverName}}:{{serverPort}}/{{databaseName}}'
-          - key: driverClassName
-            value: 'org.mariadb.jdbc.Driver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:mariadb://{{serverName}}:{{serverPort}}/{{databaseName}}'
+          driverClassName: 'org.mariadb.jdbc.Driver'
     from:
       uri: "kamelet:source"
       steps:

kamelets/mariadb-source.kamelet.yaml

@@ -99,15 +99,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:mariadb://{{serverName}}:{{serverPort}}/{{databaseName}}'
-          - key: driverClassName
-            value: 'org.mariadb.jdbc.Driver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:mariadb://{{serverName}}:{{serverPort}}/{{databaseName}}'
+          driverClassName: 'org.mariadb.jdbc.Driver'
     from:
       uri: "sql:{{query}}"
       parameters:

kamelets/mysql-sink.kamelet.yaml

@@ -97,15 +97,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:mysql://{{serverName}}:{{serverPort}}/{{databaseName}}'
-          - key: driverClassName
-            value: 'com.mysql.cj.jdbc.Driver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:mysql://{{serverName}}:{{serverPort}}/{{databaseName}}'
+          driverClassName: 'com.mysql.cj.jdbc.Driver'
     from:
       uri: "kamelet:source"
       steps:

kamelets/mysql-source.kamelet.yaml

@@ -99,15 +99,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:mysql://{{serverName}}:{{serverPort}}/{{databaseName}}'
-          - key: driverClassName
-            value: 'com.mysql.cj.jdbc.Driver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:mysql://{{serverName}}:{{serverPort}}/{{databaseName}}'
+          driverClassName: 'com.mysql.cj.jdbc.Driver'
     from:
       uri: "sql:{{query}}"
       parameters:

kamelets/oracle-database-sink.kamelet.yaml

@@ -97,15 +97,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:oracle:thin:@{{serverName}}:{{serverPort}}/{{databaseName}}'
-          - key: driverClassName
-            value: 'oracle.jdbc.driver.OracleDriver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:oracle:thin:@{{serverName}}:{{serverPort}}/{{databaseName}}'
+          driverClassName: 'oracle.jdbc.driver.OracleDriver'
     from:
       uri: "kamelet:source"
       steps:

kamelets/oracle-database-source.kamelet.yaml

@@ -94,15 +94,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:oracle:thin:@{{serverName}}:{{serverPort}}/{{databaseName}}'
-          - key: driverClassName
-            value: 'oracle.jdbc.driver.OracleDriver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:oracle:thin:@{{serverName}}:{{serverPort}}/{{databaseName}}'
+          driverClassName: 'oracle.jdbc.driver.OracleDriver'
     from:
       uri: "sql:{{query}}"
       parameters:

kamelets/postgresql-sink.kamelet.yaml

@@ -94,15 +94,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:postgresql://{{serverName}}:{{serverPort}}/{{databaseName}}'
-          - key: driverClassName
-            value: 'org.postgresql.Driver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:postgresql://{{serverName}}:{{serverPort}}/{{databaseName}}'
+          driverClassName: 'org.postgresql.Driver'
     from:
       uri: "kamelet:source"
       steps:

kamelets/postgresql-source.kamelet.yaml

@@ -96,15 +96,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:postgresql://{{serverName}}:{{serverPort}}/{{databaseName}}'
-          - key: driverClassName
-            value: 'org.postgresql.Driver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:postgresql://{{serverName}}:{{serverPort}}/{{databaseName}}'
+          driverClassName: 'org.postgresql.Driver'
     from:
       uri: "sql:{{query}}"
       parameters:

kamelets/sqlserver-sink.kamelet.yaml

@@ -111,15 +111,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:sqlserver://{{serverName}}:{{serverPort}};databaseName={{databaseName}};encrypt={{encrypt}};trustServerCertificate={{trustServerCertificate}};'
-          - key: driverClassName
-            value: 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:sqlserver://{{serverName}}:{{serverPort}};databaseName={{databaseName}};encrypt={{encrypt}};trustServerCertificate={{trustServerCertificate}};'
+          driverClassName: 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
     from:
       uri: "kamelet:source"
       steps:

kamelets/sqlserver-source.kamelet.yaml

@@ -113,15 +113,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:sqlserver://{{serverName}}:{{serverPort}};databaseName={{databaseName}};encrypt={{encrypt}};trustServerCertificate={{trustServerCertificate}};'
-          - key: driverClassName
-            value: 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:sqlserver://{{serverName}}:{{serverPort}};databaseName={{databaseName}};encrypt={{encrypt}};trustServerCertificate={{trustServerCertificate}};'
+          driverClassName: 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
     from:
       uri: "sql:{{query}}"
       parameters:

library/camel-kamelets/src/main/resources/kamelets/mariadb-sink.kamelet.yaml

@@ -97,15 +97,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:mariadb://{{serverName}}:{{serverPort}}/{{databaseName}}'
-          - key: driverClassName
-            value: 'org.mariadb.jdbc.Driver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:mariadb://{{serverName}}:{{serverPort}}/{{databaseName}}'
+          driverClassName: 'org.mariadb.jdbc.Driver'
     from:
       uri: "kamelet:source"
       steps:

library/camel-kamelets/src/main/resources/kamelets/mariadb-source.kamelet.yaml

@@ -99,15 +99,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:mariadb://{{serverName}}:{{serverPort}}/{{databaseName}}'
-          - key: driverClassName
-            value: 'org.mariadb.jdbc.Driver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:mariadb://{{serverName}}:{{serverPort}}/{{databaseName}}'
+          driverClassName: 'org.mariadb.jdbc.Driver'
     from:
       uri: "sql:{{query}}"
       parameters:

library/camel-kamelets/src/main/resources/kamelets/mysql-sink.kamelet.yaml

@@ -97,15 +97,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:mysql://{{serverName}}:{{serverPort}}/{{databaseName}}'
-          - key: driverClassName
-            value: 'com.mysql.cj.jdbc.Driver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:mysql://{{serverName}}:{{serverPort}}/{{databaseName}}'
+          driverClassName: 'com.mysql.cj.jdbc.Driver'
     from:
       uri: "kamelet:source"
       steps:

library/camel-kamelets/src/main/resources/kamelets/mysql-source.kamelet.yaml

@@ -99,15 +99,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:mysql://{{serverName}}:{{serverPort}}/{{databaseName}}'
-          - key: driverClassName
-            value: 'com.mysql.cj.jdbc.Driver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:mysql://{{serverName}}:{{serverPort}}/{{databaseName}}'
+          driverClassName: 'com.mysql.cj.jdbc.Driver'
     from:
       uri: "sql:{{query}}"
       parameters:

library/camel-kamelets/src/main/resources/kamelets/oracle-database-sink.kamelet.yaml

@@ -97,15 +97,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:oracle:thin:@{{serverName}}:{{serverPort}}/{{databaseName}}'
-          - key: driverClassName
-            value: 'oracle.jdbc.driver.OracleDriver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:oracle:thin:@{{serverName}}:{{serverPort}}/{{databaseName}}'
+          driverClassName: 'oracle.jdbc.driver.OracleDriver'
     from:
       uri: "kamelet:source"
       steps:

library/camel-kamelets/src/main/resources/kamelets/oracle-database-source.kamelet.yaml

@@ -94,15 +94,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:oracle:thin:@{{serverName}}:{{serverPort}}/{{databaseName}}'
-          - key: driverClassName
-            value: 'oracle.jdbc.driver.OracleDriver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:oracle:thin:@{{serverName}}:{{serverPort}}/{{databaseName}}'
+          driverClassName: 'oracle.jdbc.driver.OracleDriver'
     from:
       uri: "sql:{{query}}"
       parameters:

library/camel-kamelets/src/main/resources/kamelets/postgresql-sink.kamelet.yaml

@@ -94,15 +94,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:postgresql://{{serverName}}:{{serverPort}}/{{databaseName}}'
-          - key: driverClassName
-            value: 'org.postgresql.Driver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:postgresql://{{serverName}}:{{serverPort}}/{{databaseName}}'
+          driverClassName: 'org.postgresql.Driver'
     from:
       uri: "kamelet:source"
       steps:

library/camel-kamelets/src/main/resources/kamelets/postgresql-source.kamelet.yaml

@@ -96,15 +96,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:postgresql://{{serverName}}:{{serverPort}}/{{databaseName}}'
-          - key: driverClassName
-            value: 'org.postgresql.Driver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:postgresql://{{serverName}}:{{serverPort}}/{{databaseName}}'
+          driverClassName: 'org.postgresql.Driver'
     from:
       uri: "sql:{{query}}"
       parameters:

library/camel-kamelets/src/main/resources/kamelets/sqlserver-sink.kamelet.yaml

@@ -111,15 +111,11 @@ spec:
     beans:
       - name: dsBean
         type: "#class:org.apache.commons.dbcp2.BasicDataSource"
-        property:
-          - key: username
-            value: '{{username}}'
-          - key: password
-            value: '{{password}}'
-          - key: url
-            value: 'jdbc:sqlserver://{{serverName}}:{{serverPort}};databaseName={{databaseName}};encrypt={{encrypt}};trustServerCertificate={{trustServerCertificate}};'
-          - key: driverClassName
-            value: 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
+        properties:
+          username: '{{username}}'
+          password: '{{password}}'
+          url: 'jdbc:sqlserver://{{serverName}}:{{serverPort}};databaseName={{databaseName}};encrypt={{encrypt}};trustServerCertificate={{trustServerCertificate}};'
+          driverClassName: 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
     from:
       uri: "kamelet:source"
       steps: