You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2024/05/31 19:44:48 UTC

(streampipes) branch rel/0.95.0 updated (40fb332a66 -> ca85271a5d)

This is an automated email from the ASF dual-hosted git repository.

riemer pushed a change to branch rel/0.95.0
in repository https://gitbox.apache.org/repos/asf/streampipes.git


    from 40fb332a66 Merge branch 'rel/0.95.0' of github.com:apache/streampipes into rel/0.95.0
     new ab6f0b0ca6 [#2906] Fix some imports in jvm archetype (#2907)
     new ca85271a5d Fix Maven version

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../main/resources/archetype-resources/src/main/java/Init.java |  2 +-
 .../pe/__packageName__/__classNamePrefix__GenericAdapter.java  |  3 ++-
 .../pe/__packageName__/__classNamePrefix__SpecificAdapter.java |  3 ++-
 streampipes-sdk-bundle/pom.xml                                 | 10 ++++++++++
 4 files changed, 15 insertions(+), 3 deletions(-)


(streampipes) 02/02: Fix Maven version

Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch rel/0.95.0
in repository https://gitbox.apache.org/repos/asf/streampipes.git

commit ca85271a5d5060475726b473018bbd24c3d68656
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Fri May 31 21:44:34 2024 +0200

    Fix Maven version
---
 streampipes-sdk-bundle/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/streampipes-sdk-bundle/pom.xml b/streampipes-sdk-bundle/pom.xml
index c87dd3fd15..2cbab47fcd 100644
--- a/streampipes-sdk-bundle/pom.xml
+++ b/streampipes-sdk-bundle/pom.xml
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.apache.streampipes</groupId>
             <artifactId>streampipes-messaging-pulsar</artifactId>
-            <version>0.97.0-SNAPSHOT</version>
+            <version>0.95.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.streampipes</groupId>


(streampipes) 01/02: [#2906] Fix some imports in jvm archetype (#2907)

Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch rel/0.95.0
in repository https://gitbox.apache.org/repos/asf/streampipes.git

commit ab6f0b0ca6230a3124d7e343592d9392a294b775
Author: Stefan Obermeier <st...@seeburger.de>
AuthorDate: Fri May 31 21:39:19 2024 +0200

    [#2906] Fix some imports in jvm archetype (#2907)
    
    * Add pulsar messaging protocol to sdk bundle
    
    * Fix some imports
---
 .../main/resources/archetype-resources/src/main/java/Init.java |  2 +-
 .../pe/__packageName__/__classNamePrefix__GenericAdapter.java  |  3 ++-
 .../pe/__packageName__/__classNamePrefix__SpecificAdapter.java |  3 ++-
 streampipes-sdk-bundle/pom.xml                                 | 10 ++++++++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/Init.java b/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/Init.java
index b7a0b51469..d1b9cd51e7 100644
--- a/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/Init.java
+++ b/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/Init.java
@@ -30,8 +30,8 @@ import org.apache.streampipes.extensions.management.model.SpServiceDefinitionBui
 import org.apache.streampipes.messaging.jms.SpJmsProtocolFactory;
 import org.apache.streampipes.messaging.kafka.SpKafkaProtocolFactory;
 import org.apache.streampipes.messaging.mqtt.SpMqttProtocolFactory;
-import org.apache.streampipes.messaging.pulsar.SpPulsarProtocolFactory;
 import org.apache.streampipes.messaging.nats.SpNatsProtocolFactory;
+import org.apache.streampipes.messaging.pulsar.SpPulsarProtocolFactory;
 import org.apache.streampipes.service.extensions.ExtensionsModelSubmitter;
 import org.apache.streampipes.wrapper.standalone.runtime.StandaloneStreamPipesRuntimeProvider;
 
diff --git a/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__GenericAdapter.java b/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__GenericAdapter.java
index 471489cf2e..891fdeaf3f 100644
--- a/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__GenericAdapter.java
+++ b/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__GenericAdapter.java
@@ -32,6 +32,7 @@ import org.apache.streampipes.extensions.api.extractor.IAdapterParameterExtracto
 import org.apache.streampipes.extensions.management.connect.adapter.parser.Parsers;
 import org.apache.streampipes.model.AdapterType;
 import org.apache.streampipes.model.connect.guess.GuessSchema;
+import org.apache.streampipes.model.extensions.ExtensionAssetType;
 import org.apache.streampipes.sdk.builder.adapter.AdapterConfigurationBuilder;
 import org.apache.streampipes.sdk.builder.adapter.GuessSchemaBuilder;
 import org.apache.streampipes.sdk.helpers.Labels;
@@ -53,7 +54,7 @@ public class ${classNamePrefix}GenericAdapter implements StreamPipesAdapter {
           ${classNamePrefix}GenericAdapter::new
         )
         .withCategory(AdapterType.Manufacturing)
-        .withAssets(Assets.DOCUMENTATION, Assets.ICON)
+        .withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
         .withLocales(Locales.EN)
         .withSupportedParsers(Parsers.defaultParsers())
         .requiredTextParameter(Labels.withId(EXAMPLE_KEY))
diff --git a/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__SpecificAdapter.java b/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__SpecificAdapter.java
index 24e4126b70..7d08b0a593 100644
--- a/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__SpecificAdapter.java
+++ b/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/src/main/java/pe/__packageName__/__classNamePrefix__SpecificAdapter.java
@@ -31,6 +31,7 @@ import org.apache.streampipes.extensions.api.connect.context.IAdapterRuntimeCont
 import org.apache.streampipes.extensions.api.extractor.IAdapterParameterExtractor;
 import org.apache.streampipes.model.AdapterType;
 import org.apache.streampipes.model.connect.guess.GuessSchema;
+import org.apache.streampipes.model.extensions.ExtensionAssetType;
 import org.apache.streampipes.sdk.builder.adapter.AdapterConfigurationBuilder;
 import org.apache.streampipes.sdk.builder.adapter.GuessSchemaBuilder;
 import org.apache.streampipes.sdk.helpers.Labels;
@@ -53,7 +54,7 @@ public class ${classNamePrefix}SpecificAdapter implements StreamPipesAdapter {
         ${classNamePrefix}SpecificAdapter::new
       )
       .withCategory(AdapterType.Manufacturing)
-      .withAssets(Assets.DOCUMENTATION, Assets.ICON)
+      .withAssets(ExtensionAssetType.DOCUMENTATION, ExtensionAssetType.ICON)
       .withLocales(Locales.EN)
       .requiredTextParameter(Labels.withId(EXAMPLE_KEY))
       .buildConfiguration();
diff --git a/streampipes-sdk-bundle/pom.xml b/streampipes-sdk-bundle/pom.xml
index a732e4b942..c87dd3fd15 100644
--- a/streampipes-sdk-bundle/pom.xml
+++ b/streampipes-sdk-bundle/pom.xml
@@ -67,6 +67,11 @@
             <artifactId>streampipes-messaging-kafka</artifactId>
             <version>0.95.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.streampipes</groupId>
+            <artifactId>streampipes-messaging-pulsar</artifactId>
+            <version>0.97.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.streampipes</groupId>
             <artifactId>streampipes-messaging-mqtt</artifactId>
@@ -83,6 +88,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <propertyExpansion>
+                        checkstyle.config.base.path=${project.parent.basedir}/tools/maven
+                    </propertyExpansion>
+                </configuration>
             </plugin>
         </plugins>
     </build>