Fix Karaf 4.2.1 broken SSH output using an override (openhab#800)

Fixes openhab#764 Signed-off-by: Wouter Born <[email protected]>
spezialtyp · Oct 26, 2018 · da428cf · da428cf
1 parent c9d8079
commit da428cf
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 0 deletions.
diff --git a/distributions/openhab/pom.xml b/distributions/openhab/pom.xml
@@ -51,6 +51,14 @@
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
+        <dependency>	
+            <groupId>org.openhab.distro</groupId>	
+            <artifactId>overrides</artifactId>	
+            <version>${project.version}</version>	
+            <classifier>features</classifier>	
+            <type>xml</type>	
+            <scope>runtime</scope>	
+        </dependency>
     </dependencies>
 
     <build>
@@ -112,6 +120,7 @@
                     <installedFeatures>
                         <feature>wrapper</feature>
                         <feature>wrap</feature>
+                        <feature>openhab-overrides</feature>
                     </installedFeatures>
                     <startupFeatures>
                         <feature>eventadmin</feature>

diff --git a/distributions/openhab/src/main/resources/userdata/etc/overrides.properties b/distributions/openhab/src/main/resources/userdata/etc/overrides.properties
@@ -0,0 +1 @@
+mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/4.2.1-sp1
diff --git a/features/overrides/pom.xml b/features/overrides/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><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>	
+    <groupId>org.openhab.distro</groupId>	
+    <artifactId>pom-features</artifactId>	
+    <version>2.4.0-SNAPSHOT</version>	
+  </parent>	
+   <artifactId>overrides</artifactId>	
+  <packaging>feature</packaging>	
+   <name>openHAB Overrides</name>	
+   <build>	
+    <plugins>	
+      <plugin>	
+        <groupId>org.apache.karaf.tooling</groupId>	
+        <artifactId>karaf-maven-plugin</artifactId>	
+        <extensions>true</extensions>	
+        <configuration>	
+          <startLevel>80</startLevel>	
+          <enableGeneration>true</enableGeneration>	
+          <aggregateFeatures>true</aggregateFeatures>	
+          <checkDependencyChange>true</checkDependencyChange>	
+          <failOnDependencyChange>false</failOnDependencyChange>	
+          <logDependencyChanges>true</logDependencyChanges>	
+          <overwriteChangedDependencies>true</overwriteChangedDependencies>	
+        </configuration>	
+        <executions>	
+          <execution>	
+            <id>generate-features-file</id>	
+            <phase>generate-resources</phase>	
+            <goals>	
+              <goal>features-generate-descriptor</goal>	
+            </goals>	
+          </execution>	
+        </executions>	
+      </plugin>	
+    </plugins>	
+  </build>	
+ </project>
diff --git a/features/overrides/src/main/feature/feature.xml b/features/overrides/src/main/feature/feature.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>	
+<features name="${project.artifactId}-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">	
+   <feature name="openhab-overrides" description="force to bundle packages" version="${project.version}" hidden="true">	
+    <bundle dependency="true">mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/4.2.1-sp1</bundle>	
+  </feature>	
+</features>
diff --git a/features/pom.xml b/features/pom.xml
@@ -19,6 +19,7 @@
 		<module>distro-kar</module>
 		<module>distro-resources</module>
 		<module>addons</module>
+		<module>overrides</module>
 	</modules>
 
 </project>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		mvn:org.apache.karaf.shell/org.apache.karaf.shell.ssh/4.2.1-sp1