[GitHub] sruehl closed pull request #42: [PLC4X-75] - Fixing dependency to the wrap url-handler

[GitBox <gi...@apache.org>]

sruehl closed pull request #42: [PLC4X-75] - Fixing dependency to the wrap url-handler
URL: https://github.com/apache/incubator-plc4x/pull/42
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/integrations/apache-karaf/karaf-demo-server/pom.xml b/integrations/apache-karaf/karaf-demo-server/pom.xml
index 08fbc6d58..074a4733a 100644
--- a/integrations/apache-karaf/karaf-demo-server/pom.xml
+++ b/integrations/apache-karaf/karaf-demo-server/pom.xml
@@ -40,19 +40,13 @@
       <version>${karaf.version}</version>
       <type>kar</type>
     </dependency>
-    <dependency>
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <version>${karaf.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.apache.karaf.features</groupId>
       <artifactId>standard</artifactId>
       <version>${karaf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
+      <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.plc4x</groupId>
@@ -97,30 +91,25 @@
         <groupId>org.apache.karaf.tooling</groupId>
         <artifactId>karaf-maven-plugin</artifactId>
         <configuration>
-          <bootFeatures>
-            <feature>framework</feature>
-            <feature>shell</feature>
-            <feature>shell-compat</feature>
-            <feature>feature</feature>
-            <feature>jaas</feature>
-            <feature>ssh</feature>
-            <feature>management</feature>
-            <feature>bundle</feature>
-            <feature>config</feature>
-            <feature>deployer</feature>
-            <feature>diagnostic</feature>
-            <feature>feature</feature>
-            <feature>instance</feature>
-            <feature>kar</feature>
-            <feature>log</feature>
+          <startupFeatures>
             <feature>wrap</feature>
-            <feature>package</feature>
-            <feature>service</feature>
-            <feature>system</feature>
+          </startupFeatures>
+          <bootFeatures>
+            <feature>standard</feature>
           </bootFeatures>
         </configuration>
       </plugin>
     </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.karaf.tooling</groupId>
+          <artifactId>karaf-maven-plugin</artifactId>
+          <version>${karaf-maven-plugin.version}</version>
+          <extensions>true</extensions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
   </build>
 
 </project>
\ No newline at end of file
diff --git a/integrations/apache-karaf/pom.xml b/integrations/apache-karaf/pom.xml
index 3752727d0..3d54f517c 100644
--- a/integrations/apache-karaf/pom.xml
+++ b/integrations/apache-karaf/pom.xml
@@ -45,7 +45,7 @@
     <module>karaf-s7-feature</module>
     <module>karaf-simulated-feature</module>
     <!-- TODO: karaf-demo doesn't compile right now as slf4-api bundle dependency can't be resolved -->
-    <!--module>karaf-demo-server</module-->
+    <module>karaf-demo-server</module>
   </modules>
 
   <build>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services