Merge pull request #83 from assimbly/develop

Release patch 3.8.2
assimbly · Jan 19, 2023 · e64b9aa · e64b9aa
2 parents 4e8d858 + 396ce59
commit e64b9aa
Show file tree

Hide file tree

Showing 72 changed files with 3,906 additions and 873 deletions.
diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
@@ -16,6 +16,6 @@ jobs:
           java-version: '11'
           distribution: 'adopt'
       - name: Publish package
-        run: mvn clean deploy
+        run: ./bin/mac/deploy.sh
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/update-version.yml b/.github/workflows/update-version.yml
@@ -0,0 +1,30 @@
+name: Update POM files version
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+      - '!workflows'
+      - master
+
+jobs:
+  update_version:
+    runs-on: ubuntu-latest 
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Update POM Version
+      run: |
+        echo "Updating to version: $(jq -r '.pull_request.milestone.title' $GITHUB_EVENT_PATH)"
+        mvn versions:set -DnewVersion=$(jq -r '.pull_request.milestone.title' $GITHUB_EVENT_PATH)
+
+    - name: Diff check
+      run: git diff
+
+    - name: Add & Commit
+      uses: EndBug/[email protected]
+      with:
+        add: '.'
+        default_author: github_actions
+        push: origin HEAD:develop --force
diff --git a/bin/mac/updateversion.sh b/bin/mac/updateversion.sh
@@ -1,6 +1,7 @@
 if [ -n "$1" ]; then
     printf "\nupdate version to: $1\n"
     mvn -f ../../pom.xml versions:set -DgenerateBackupPoms=false -DnewVersion="$1"
+    mvn -f ../../pom.xml versions:set-property -Dproperty=assimbly.version -DnewVersion="$1"
 else
     printf "\nUsage:\n"
     printf "\nupdateversion.sh <versionnumber>\n"

diff --git a/bin/win/checkversions.bat b/bin/win/checkversions.bat
@@ -1 +1 @@
-mvn -f ..\..\pom.xml versions:display-dependency-updates -Dexcludes=org.apache.camel:*
+mvn -f ..\..\pom.xml versions:display-dependency-updates -Dexcludes=org.apache.camel:* -DlogOutput=false
diff --git a/bin/win/updateversion.bat b/bin/win/updateversion.bat
@@ -5,6 +5,7 @@ echo:
 @echo update version to %1
 echo:
 mvn -f ..\..\pom.xml versions:set -DgenerateBackupPoms=false -DnewVersion=%1
+mvn -f ..\..\pom.xml versions:set-property -Dproperty=assimbly.version -DnewVersion=%1
 :usage
 echo:
 @echo updateversion ^<versionnumber^>

diff --git a/broker/pom.xml b/broker/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.assimbly</groupId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <name>broker</name>

diff --git a/broker/pom.xml.versionsBackup b/broker/pom.xml.versionsBackup
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>runtime</artifactId>
+    <groupId>org.assimbly</groupId>
+    <version>3.8.1</version>
+  </parent>
+
+  <name>broker</name>
+  <packaging>jar</packaging>
+
+  <artifactId>broker</artifactId>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.release>11</maven.compiler.release>
+    <maven-versions-rules>file:///${project.parent.basedir}/rules.xml</maven-versions-rules>    
+  </properties>
+
+  <distributionManagement> 
+        <repository>
+            <id>github</id> 
+            <name>Temporary Staging Repository</name> 
+            <url>https://maven.pkg.github.com/assimbly/runtime</url> 
+        </repository> 
+    </distributionManagement>
+
+  <dependencies>
+      	<dependency>
+			<groupId>org.assimbly</groupId>
+			<artifactId>activemq-base</artifactId>
+			<version>${assimbly.version}</version>
+		</dependency>
+	  <dependency>
+		  <groupId>org.assimbly</groupId>
+		  <artifactId>spring-base</artifactId>
+		  <version>${assimbly.version}</version>
+	  </dependency>
+	  <dependency>
+		  <groupId>org.assimbly</groupId>
+		  <artifactId>utils</artifactId>
+		  <version>${assimbly.version}</version>
+	  </dependency>	  
+     <dependency>
+	    	<groupId>org.assimbly</groupId>
+			<artifactId>test-base</artifactId>
+			<version>${assimbly.version}</version>
+			<scope>test</scope>
+	  </dependency>
+  </dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-toolchains-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>toolchain</goal>
+						</goals>
+						<configuration>
+							<toolchains>
+								<jdk>
+									<version>11</version>
+								</jdk>
+							</toolchains>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/brokerRest/pom.xml b/brokerRest/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.assimbly</groupId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <name>broker-rest</name>
@@ -34,11 +34,6 @@
 		  <artifactId>broker</artifactId>
 		  <version>${assimbly.version}</version>
 	  </dependency>
-      <dependency>
-		   <groupId>org.springdoc</groupId>
-		   <artifactId>springdoc-openapi-ui</artifactId>
-		   <version>${springdoc-openapi-ui.version}</version>
-	  </dependency>
   </dependencies>
 
 	<build>

diff --git a/brokerRest/pom.xml.versionsBackup b/brokerRest/pom.xml.versionsBackup
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>runtime</artifactId>
+    <groupId>org.assimbly</groupId>
+    <version>3.8.1</version>
+  </parent>
+
+  <name>broker-rest</name>
+  <packaging>jar</packaging>
+
+  <artifactId>broker-rest</artifactId>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.release>11</maven.compiler.release>
+    <maven-versions-rules>file:///${project.parent.basedir}/rules.xml</maven-versions-rules>    
+  </properties>
+
+  <distributionManagement> 
+        <repository>
+            <id>github</id> 
+            <name>Temporary Staging Repository</name> 
+            <url>https://maven.pkg.github.com/assimbly/runtime</url> 
+        </repository> 
+    </distributionManagement>
+
+  <dependencies>
+	  <dependency>
+		  <groupId>org.assimbly</groupId>
+		  <artifactId>broker</artifactId>
+		  <version>${assimbly.version}</version>
+	  </dependency>
+  </dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-toolchains-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>toolchain</goal>
+						</goals>
+						<configuration>
+							<toolchains>
+								<jdk>
+									<version>11</version>
+								</jdk>
+							</toolchains>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/.../brokerrest/BrokerConfigurerResource.java → ...y/brokerrest/BrokerConfigurerRuntime.java b/.../brokerrest/BrokerConfigurerResource.java → ...y/brokerrest/BrokerConfigurerRuntime.java
@@ -11,20 +11,20 @@
  */
 @RestController
 @RequestMapping("/api")
-public class BrokerConfigurerResource {
+public class BrokerConfigurerRuntime {
 
 	protected Logger log = LoggerFactory.getLogger(getClass());
 
     @Autowired
-	private ManagedBroker broker;
+	private ManagedBrokerRuntime broker;
 
     /**
      * GET  /brokers/:id : get the broker configuration by "id".
      *
      * @param id the id of the brokerDTO to retrieve
      * @return the status (stopped or started) with status 200 (OK) or with status 404 (Not Found)
      */
-    @GetMapping("/brokers/{id}/getconfiguration")
+    @GetMapping("/brokers/{id}/configure")
     public String getConfigurationBroker(@PathVariable Long id, @RequestParam String brokerType) {
         log.debug("REST request to get configuration of Broker : {}", id);
 
@@ -47,7 +47,7 @@ public String getConfigurationBroker(@PathVariable Long id, @RequestParam String
      * @return the status (stopped or started) with status 200 (OK) or with status 404 (Not Found)
      * @throws Exception
      */
-    @PostMapping(path = "/brokers/{id}/setconfiguration")
+    @PostMapping(path = "/brokers/{id}/configure")
     public ResponseEntity<String> setConfigurationBroker(@PathVariable Long id, @RequestParam String brokerType, @RequestParam String brokerConfigurationType, @RequestBody(required = false) String brokerConfiguration) throws Exception {
         log.debug("REST request to set configuration of Broker : {}", id);
 

diff --git a/...bly/brokerrest/BrokerManagerResource.java → ...mbly/brokerrest/BrokerManagerRuntime.java b/...bly/brokerrest/BrokerManagerResource.java → ...mbly/brokerrest/BrokerManagerRuntime.java
@@ -12,12 +12,12 @@
  */
 @RestController
 @RequestMapping("/api")
-public class BrokerManagerResource {
+public class BrokerManagerRuntime {
 
 	protected Logger log = LoggerFactory.getLogger(getClass());
 
     @Autowired
-	private ManagedBroker broker;
+	private ManagedBrokerRuntime broker;
 
     private String result;
 

diff --git a/...rg/assimbly/brokerrest/ManagedBroker.java → ...mbly/brokerrest/ManagedBrokerRuntime.java b/...rg/assimbly/brokerrest/ManagedBroker.java → ...mbly/brokerrest/ManagedBrokerRuntime.java
@@ -12,7 +12,7 @@
 import java.util.Map;
 
 @Component
-public class ManagedBroker {
+public class ManagedBrokerRuntime {
 
 	protected Logger log = LoggerFactory.getLogger(getClass());
 

diff --git a/...bly/brokerrest/MessageBrokerResource.java → ...mbly/brokerrest/MessageBrokerRuntime.java b/...bly/brokerrest/MessageBrokerResource.java → ...mbly/brokerrest/MessageBrokerRuntime.java
@@ -16,12 +16,12 @@
  */
 @RestController
 @RequestMapping("/api")
-public class MessageBrokerResource {
+public class MessageBrokerRuntime {
 
 	protected Logger log = LoggerFactory.getLogger(getClass());
 
     @Autowired
-    private ManagedBroker broker;
+    private ManagedBrokerRuntime broker;
 
     private String result;
 

diff --git a/...mbly/brokerrest/QueueManagerResource.java → ...imbly/brokerrest/QueueManagerRuntime.java b/...mbly/brokerrest/QueueManagerResource.java → ...imbly/brokerrest/QueueManagerRuntime.java
@@ -12,12 +12,12 @@
  */
 @RestController
 @RequestMapping("/api")
-public class QueueManagerResource {
+public class QueueManagerRuntime {
 
 	protected Logger log = LoggerFactory.getLogger(getClass());
 
     @Autowired
-    private ManagedBroker broker;
+    private ManagedBrokerRuntime broker;
 
 	private String result;
 

diff --git a/...mbly/brokerrest/TopicManagerResource.java → ...imbly/brokerrest/TopicManagerRuntime.java b/...mbly/brokerrest/TopicManagerResource.java → ...imbly/brokerrest/TopicManagerRuntime.java
@@ -12,12 +12,12 @@
  */
 @RestController
 @RequestMapping("/api")
-public class TopicManagerResource {
+public class TopicManagerRuntime {
 
 	protected Logger log = LoggerFactory.getLogger(getClass());
 
     @Autowired
-    public ManagedBroker broker;
+    public ManagedBrokerRuntime broker;
 
     private String result;
 

diff --git a/dil/pom.xml b/dil/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>runtime</artifactId>
     <groupId>org.assimbly</groupId>
-    <version>3.8.1</version>
+    <version>3.8.2</version>
   </parent>
 
   <name>dil</name>
@@ -28,9 +28,14 @@
 
   <dependencies>
 	  <dependency>
-			<groupId>org.assimbly</groupId>
-			<artifactId>camel-base</artifactId>
-			<version>${assimbly.version}</version>
+		  <groupId>org.assimbly</groupId>
+		  <artifactId>camel-base</artifactId>
+		  <version>${assimbly.version}</version>
+	  </dependency>
+	  <dependency>
+		  <groupId>org.assimbly</groupId>
+		  <artifactId>camel-components</artifactId>
+		  <version>${assimbly.version}</version>
 	  </dependency>
 	  <dependency>
 		  <groupId>org.assimbly</groupId>
@@ -41,7 +46,6 @@
 			<groupId>org.assimbly</groupId>
 			<artifactId>test-base</artifactId>
 			<version>${assimbly.version}</version>
-			<scope>test</scope>
 		</dependency>
 	  <dependency>
 		  <groupId>org.assimbly</groupId>