Fixed maven connector generation plugin tests.

apache · Sep 5, 2023 · bdcafdb · bdcafdb
1 parent 6a5054f
commit bdcafdb
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/connectors/camel-kafka-connector-fix-dependencies.properties b/connectors/camel-kafka-connector-fix-dependencies.properties
@@ -22,6 +22,6 @@
 global=org.apache.camel.kafkaconnector:camel-kafka-connector,org.apache.camel:camel-jackson
 
 # we add a default connection factory maven variables can be used as ${varname}
-camel-sjms2=org.apache.activemq:artemis-jms-client::runtime
-exclude_camel-sjms2=
-additional_properties_camel-sjms2=camel.component.sjms2.connection-factory=#class:org.apache.activemq.ActiveMQConnectionFactory,camel.component.sjms2.connection-factory.brokerURL=tcp://localhost:61616
+#camel-sjms2=org.apache.activemq:artemis-jms-client::runtime
+#exclude_camel-sjms2=
+#additional_properties_camel-sjms2=camel.component.sjms2.connection-factory=#class:org.apache.activemq.ActiveMQConnectionFactory,camel.component.sjms2.connection-factory.brokerURL=tcp://localhost:61616
diff --git a/...nerator-maven-plugin/src/main/resources/camel-kafka-connector-fix-dependencies.properties b/...nerator-maven-plugin/src/main/resources/camel-kafka-connector-fix-dependencies.properties
@@ -22,6 +22,6 @@
 global=org.apache.camel.kafkaconnector:camel-kafka-connector,org.apache.camel:camel-jackson
 
 # we add a default connection factory maven variables can be used as ${varname}
-camel-sjms2=org.apache.activemq:activemq-client::runtime,org.apache.activemq:artemis-jms-client::runtime
-exclude_camel-sjms2=
-additional_properties_camel-sjms2=camel.component.sjms2.connection-factory=#class:org.apache.activemq.ActiveMQConnectionFactory,camel.component.sjms2.connection-factory.brokerURL=tcp://localhost:61616
+#camel-sjms2=org.apache.activemq:activemq-client::runtime,org.apache.activemq:artemis-jms-client::runtime
+#exclude_camel-sjms2=
+#additional_properties_camel-sjms2=camel.component.sjms2.connection-factory=#class:org.apache.activemq.ActiveMQConnectionFactory,camel.component.sjms2.connection-factory.brokerURL=tcp://localhost:61616
diff --git a/...pache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml b/...pache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojoIT/maven_project/pom.xml
@@ -132,7 +132,7 @@
                     <!-- set to true to make build fail if an option has no description -->
                     <!--  <failOnMissingDescription>false</failOnMissingDescription> -->
                     <!-- Process just this, comma separated, components -->
-                    <!--  <filter></filter>-->
+                    <filter>netty,https,netty-http,couchbase,cxf,cxfrs,file,hdfs,jdbc,sjms2,sql,aws2-iam,aws2-kms,cassandraql</filter>
                     <!-- Regenerate connector pom file completely even if one already exists -->
                     <!-- WARNING: you may lose some changes done to the pom. -->
                     <!-- <overridePomFile>false</overridePomFile> -->
@@ -165,7 +165,10 @@
                     </exampleSinkPropertiesFileTemplate>
                     <removeMissingComponents>true</removeMissingComponents>
                     <excludedKamelets>
+                        <!-- XXX: remove datalake exclusions after https://github.com/apache/camel-kamelets/issues/1597  is released -->
                         <param>ms-exchange-online-imap-oauth-source</param>
+                        <param>azure-storage-datalake-sink</param>
+                        <param>azure-storage-datalake-source</param>
                     </excludedKamelets>
                     <excludedComponents>
                         <param>bonita</param>

diff --git a/...nerator-maven-plugin/src/test/resources/camel-kafka-connector-fix-dependencies.properties b/...nerator-maven-plugin/src/test/resources/camel-kafka-connector-fix-dependencies.properties
@@ -22,6 +22,6 @@
 global=org.apache.camel.kafkaconnector:camel-kafka-connector,org.apache.camel:camel-jackson
 
 # we add a default connection factory maven variables can be used as ${varname}
-camel-sjms2=org.apache.activemq:activemq-client::runtime,org.apache.activemq:artemis-jms-client::runtime
-exclude_camel-sjms2=
-additional_properties_camel-sjms2=camel.component.sjms2.connection-factory=#class:org.apache.activemq.ActiveMQConnectionFactory,camel.component.sjms2.connection-factory.brokerURL=tcp://localhost:61616
+#camel-sjms2=org.apache.activemq:activemq-client::runtime,org.apache.activemq:artemis-jms-client::runtime
+#exclude_camel-sjms2=
+#additional_properties_camel-sjms2=camel.component.sjms2.connection-factory=#class:org.apache.activemq.ActiveMQConnectionFactory,camel.component.sjms2.connection-factory.brokerURL=tcp://localhost:61616
diff --git a/...maven-plugin/src/test/resources/camel-kafka-connector-kamelet-fix-dependencies.properties b/...maven-plugin/src/test/resources/camel-kafka-connector-kamelet-fix-dependencies.properties
@@ -24,6 +24,6 @@ global=org.apache.camel.kafkaconnector:camel-kafka-connector
 camel-couchbase=com.couchbase.client:java-client::runtime
 
 # we add a default connection factory maven variables can be used as ${varname}
-camel-sjms2=org.apache.activemq:activemq-client::runtime,org.apache.activemq:artemis-jms-client::runtime
-exclude_camel-sjms2=
-additional_properties_camel-sjms2=camel.component.sjms2.connection-factory=#class:org.apache.activemq.ActiveMQConnectionFactory,camel.component.sjms2.connection-factory.brokerURL=tcp://localhost:61616
+#camel-sjms2=org.apache.activemq:activemq-client::runtime,org.apache.activemq:artemis-jms-client::runtime
+#exclude_camel-sjms2=
+#additional_properties_camel-sjms2=camel.component.sjms2.connection-factory=#class:org.apache.activemq.ActiveMQConnectionFactory,camel.component.sjms2.connection-factory.brokerURL=tcp://localhost:61616