fix: use spring-boot-3-style autoconfiguration

camunda · May 3, 2023 · 5c412d4 · 5c412d4
1 parent b8b1397
commit 5c412d4
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 17 deletions.
diff --git a/bundle/default-bundle/pom.xml b/bundle/default-bundle/pom.xml
@@ -76,7 +76,7 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
         <configuration>
-          <mainClass>io.camunda.connector.runtime.ConnectorRuntimeApplication</mainClass>
+          <mainClass>io.camunda.connector.bundle.ConnectorRuntimeApplication</mainClass>
         </configuration>
       </plugin>
        <plugin>
@@ -131,7 +131,7 @@
                   <resource>META-INF/io.netty.versions.properties</resource>
               </transformer>
               <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                <mainClass>io.camunda.connector.runtime.ConnectorRuntimeApplication</mainClass>
+                <mainClass>io.camunda.connector.bundle.ConnectorRuntimeApplication</mainClass>
               </transformer>
             </transformers>
           </configuration>

diff --git a/.../runtime/ConnectorRuntimeApplication.java → ...r/bundle/ConnectorRuntimeApplication.java b/.../runtime/ConnectorRuntimeApplication.java → ...r/bundle/ConnectorRuntimeApplication.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.camunda.connector.runtime;
+package io.camunda.connector.bundle;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/bundle/default-bundle/src/main/resources/application.properties b/bundle/default-bundle/src/main/resources/application.properties
@@ -1,13 +1,19 @@
+
+server.port=9898
+zeebe.broker.gateway-address=localhost:26500
+zeebe.client.security.plaintext=true
+
 camunda.connector.polling.enabled=true
 camunda.connector.polling.interval=5000
 
 camunda.connector.webhook.enabled=true
-#spring.main.web-application-type=none
 
-# uncomment to activate inbound and adjust operate config if necessary
-#operate.client.enabled=true
+operate.client.enabled=true
 # Operate config for use with docker-compose-core.yml
-#camunda.operate.client.url=http://localhost:8081
-#camunda.operate.client.username=demo
-#camunda.operate.client.password=demo
-#camunda.connector.webhook.enabled=true
+camunda.operate.client.url=http://localhost:8081
+camunda.operate.client.username=demo
+camunda.operate.client.password=demo
+camunda.connector.webhook.enabled=true
+
+logging.level.io.camunda.connector=trace
+debug=true
diff --git a/bundle/default-bundle/src/test/resources/application.properties b/bundle/default-bundle/src/test/resources/application.properties
@@ -15,5 +15,3 @@ camunda.operate.client.url=http://localhost:8081
 camunda.operate.client.username=demo
 camunda.operate.client.password=demo
 camunda.connector.webhook.enabled=true
-
-logging.level.io.camunda.connector=trace
diff --git a/spring-boot-starter-camunda-connectors/README.md b/spring-boot-starter-camunda-connectors/README.md
@@ -167,14 +167,14 @@ It uses the default configuration specified through the `@OutboundConnector` ann
 
 ```bash
 java -cp 'connector-runtime-VERSION-with-dependencies.jar:connector-http-json-VERSION-with-dependencies.jar' \
-    io.camunda.connector.runtime.ConnectorRuntimeApplication
+    io.camunda.connector.bundle.ConnectorRuntimeApplication
 ```
 
 Note that you need to use `;` instead of `:` on Windows machines:
 
 ```bash
 java -cp 'connector-runtime-VERSION-with-dependencies.jar;connector-http-json-VERSION-with-dependencies.jar' \
-    io.camunda.connector.runtime.ConnectorRuntimeApplication
+    io.camunda.connector.bundle.ConnectorRuntimeApplication
 ```
 
 #### Manual Discovery
@@ -195,7 +195,7 @@ CONNECTOR_HTTPJSON_FUNCTION=io.camunda.connector.http.HttpJsonFunction
 CONNECTOR_HTTPJSON_TYPE=non-default-httpjson-task-type
 
 java -cp 'connector-runtime-VERSION-with-dependencies.jar:connector-http-json-VERSION-with-dependencies.jar' \
-    io.camunda.connector.runtime.ConnectorRuntimeApplication
+    io.camunda.connector.bundle.ConnectorRuntimeApplication
 ```
 
 ### Secrets

diff --git a/spring-boot-starter-camunda-connectors/pom.xml b/spring-boot-starter-camunda-connectors/pom.xml
@@ -77,7 +77,7 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
         <configuration>
-          <mainClass>io.camunda.connector.runtime.ConnectorRuntimeApplication</mainClass>
+          <mainClass>io.camunda.connector.bundle.ConnectorRuntimeApplication</mainClass>
         </configuration>
       </plugin>
       <plugin>
@@ -147,7 +147,7 @@
             </transformer>
             <transformer
               implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-              <mainClass>io.camunda.connector.runtime.ConnectorRuntimeApplication</mainClass>
+              <mainClass>io.camunda.connector.bundle.ConnectorRuntimeApplication</mainClass>
             </transformer>
           </transformers>
         </configuration>

diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+io.camunda.connector.runtime.ConnectorsAutoConfiguration
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		io.camunda.connector.runtime.ConnectorsAutoConfiguration