[resolves wildfly-extras#2115] Add a generic OpenShift template

ppalaga · Apr 6, 2018 · 5bfad99 · 5bfad99
1 parent d78e586
commit 5bfad99
Show file tree

Hide file tree

Showing 72 changed files with 1,206 additions and 21 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -144,6 +144,11 @@
                 <artifactId>jackson-module-jsonSchema</artifactId>
                 <version>${version.wildfly.fasterxml.jackson}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.jr</groupId>
+                <artifactId>jackson-jr-objects</artifactId>
+                <version>${version.wildfly.fasterxml.jackson}</version>
+            </dependency>
             <dependency>
                 <groupId>com.icegreen</groupId>
                 <artifactId>greenmail-webapp</artifactId>

diff --git a/catalog/src/main/resources/component.roadmap b/catalog/src/main/resources/component.roadmap
@@ -229,6 +229,7 @@ stub
 telegram
 test
 thrift
+tika
 timer
 twilio
 twitter                                             #deprecated
@@ -255,7 +256,6 @@ zookeeper-master
 [planned]
 cmis                                                #1989 Blocked by camel-2.21.x
 restlet                                             #2024 Blocked by camel-2.21.x
-tika                                                #1850 Blocked by camel-2.21.x
 
 [undecided]
 elasticsearch-rest

diff --git a/feature/common/etc/smartics/skipped-modules.xml b/feature/common/etc/smartics/skipped-modules.xml
@@ -113,6 +113,10 @@
         <include artifact="com.google.inject.extensions:guice-servlet"/>
     </module>
 
+    <module name="com.googlecode.jaxb-namespaceprefixmapper-interfaces.JAXBNamespacePrefixMapper" skip="true">
+        <include artifact="com.googlecode.jaxb-namespaceprefixmapper-interfaces:JAXBNamespacePrefixMapper"/>
+    </module>
+
     <module name="com.google.oauth-client.google-oauth-client-jetty" skip="true">
         <include artifact="com.google.oauth-client:google-oauth-client-jetty"/>
     </module>
@@ -208,6 +212,10 @@
         <include artifact="io.sundr:sundr-codegen" />
     </module>
 
+    <module name="javax.transaction.jta" skip="true">
+        <include artifact=":jta" />
+    </module>
+
     <module name="jaxmeapi" skip="true">
         <include artifact=":jaxmeapi" />
     </module>
@@ -248,6 +256,10 @@
         <include artifact="net.sf.ehcache:ehcache" />
     </module>
 
+    <module name="net.sf.ehcache.sizeof-agent" skip="true">
+        <include artifact="net.sf.ehcache:sizeof-agent" />
+    </module>
+
     <module name="net.sf.kxml" skip="true">
         <include artifact="net.sf.kxml:(.*)" />
     </module>
@@ -284,6 +296,14 @@
         <include artifact=":commons-daemon"/>
     </module>
 
+    <module name="org.apache.commons.vfs2" skip="true">
+        <include artifact=":commons-vfs2"/>
+    </module>
+
+    <module name="org.apache.ctakes.ctakes-core" skip="true">
+        <include artifact="org.apache.ctakes:ctakes-core"/>
+    </module>
+
     <module name="org.apache.felix" skip="true">
         <include artifact="org.apache.felix:org.apache.felix.http.proxy" />
         <include artifact="org.apache.felix:org.apache.felix.gogo.runtime" />
@@ -465,8 +485,7 @@
         <include artifact="org.osgi:org.osgi.compendium" />
     </module>
 
-    <module name="org.ow2.asm" skip="true">
-        <include artifact="org.ow2.asm:asm"/>
+    <module name="org.ow2.asm.commons" skip="true">
         <include artifact="org.ow2.asm:asm-commons"/>
     </module>
 
@@ -498,6 +517,10 @@
         <include artifact="org.uncommons.maths:uncommons-maths" />
     </module>
 
+    <module name="org.xerial.sqlite-jdbc" skip="true">
+        <include artifact="org.xerial:sqlite-jdbc" />
+    </module>
+
     <module name="software.amazon.ion.ion-java" skip="true">
         <include artifact="software.amazon.ion:ion-java" />
     </module>

diff --git a/feature/common/etc/smartics/wildfly-modules.xml b/feature/common/etc/smartics/wildfly-modules.xml
@@ -27,7 +27,7 @@
 <modules xmlns="http://smartics.de/ns/jboss-modules-descriptor/2">
 
     <module name="asm.asm" skip="true">
-        <include artifact="asm:asm" />
+        <include artifact="org.ow2.asm:asm" />
     </module>
 
     <module name="com.fasterxml.jackson.core.jackson-annotations" skip="true">

diff --git a/feature/extrasA/etc/smartics/skipped-modules.xml b/feature/extrasA/etc/smartics/skipped-modules.xml
@@ -36,10 +36,6 @@
         <include artifact="com.jcraft:jsch" />
     </module>
 
-    <module name="com.rometools.rome" skip="true">
-        <include artifact="rome:rome" />
-    </module>
-
     <module name="com.thoughtworks.xstream" skip="true">
         <include artifact="com.thoughtworks.xstream:xstream" />
     </module>

diff --git a/feature/extrasA/etc/wildfly-feature-pack.xml b/feature/extrasA/etc/wildfly-feature-pack.xml
@@ -88,6 +88,7 @@
         <artifact groupId="org.kie.remote" artifactId="kie-remote-jaxb" version="6.5.0.Final"/>
         <artifact groupId="org.kie.remote.ws" artifactId="kie-remote-ws-common" version="6.5.0.Final"/>
         <artifact groupId="org.slf4j" artifactId="slf4j-api" version="1.7.10"/>
+        <artifact groupId="org.tukaani" artifactId="xz" version="1.0"/>
         <artifact groupId="org.wildfly.camel" artifactId="wildfly-camel-feature-modules" version="6.1.0-SNAPSHOT" extension="zip"/>
         <artifact groupId="org.xerial.snappy" artifactId="snappy-java" version="1.0.4.1"/>
         <artifact groupId="rome" artifactId="rome" version="1.0"/>

diff --git a/.../main/resources/modules/system/layers/fuse/org/apache/camel/component/jcr/main/module.xml b/.../main/resources/modules/system/layers/fuse/org/apache/camel/component/jcr/main/module.xml
@@ -6,10 +6,10 @@
   <dependencies>
     <module name="javax.jcr" export="true" />
     <module name="org.slf4j" />
-    <module name="com.rometools.rome" />
     <module name="javax.xml.bind.api" />
     <module name="org.apache.camel.core" />
     <module name="org.apache.jackrabbit" />
     <module name="org.apache.lucene" slot="3.6" />
+    <module name="rome" />
   </dependencies>
 </module>
diff --git a/feature/extrasA/src/main/resources/modules/system/layers/fuse/rome/main/module.xml b/feature/extrasA/src/main/resources/modules/system/layers/fuse/rome/main/module.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="urn:jboss:module:1.1" name="rome">
+  <resources>
+    <artifact name="${rome:rome}" />
+  </resources>
+  <dependencies>
+    <module name="org.jdom" />
+  </dependencies>
+</module>
diff --git a/feature/extrasB/etc/smartics/skipped-modules.xml b/feature/extrasB/etc/smartics/skipped-modules.xml
@@ -32,6 +32,10 @@
         <include artifact=":jackson-dataformat-yaml" />
     </module>
 
+    <module name="com.fasterxml.jackson.jr" skip="true">
+        <include artifact=":jackson-jr-objects" />
+    </module>
+
     <module name="com.google.guava" skip="true">
         <include artifact="com.google.guava:guava" />
     </module>

diff --git a/feature/extrasB/etc/wildfly-feature-pack.xml b/feature/extrasB/etc/wildfly-feature-pack.xml
@@ -10,6 +10,7 @@
         <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-cbor" version="2.9.4"/>
         <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-smile" version="2.9.4"/>
         <artifact groupId="com.fasterxml.jackson.dataformat" artifactId="jackson-dataformat-yaml" version="2.9.4"/>
+        <artifact groupId="com.fasterxml.jackson.jr" artifactId="jackson-jr-objects" version="2.9.4"/>
         <artifact groupId="com.google.guava" artifactId="guava" version="18.0"/>
         <artifact groupId="com.ning" artifactId="compress-lzf" version="1.0.2"/>
         <artifact groupId="com.spatial4j" artifactId="spatial4j" version="0.5"/>

diff --git a/feature/extrasB/pom.xml b/feature/extrasB/pom.xml
@@ -55,6 +55,12 @@
             <artifactId>jackson-dataformat-yaml</artifactId>
             <version>${version.wildfly.fasterxml.jackson}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.jr</groupId>
+            <artifactId>jackson-jr-objects</artifactId>
+            <version>${version.wildfly.fasterxml.jackson}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-elasticsearch</artifactId>

diff --git a/feature/extrasD/etc/wildfly-feature-pack.xml b/feature/extrasD/etc/wildfly-feature-pack.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<feature-pack xmlns="urn:wildfly:feature-pack:1.1">
+    <dependencies>
+        <artifact name="org.wildfly.camel:wildfly-camel-feature-extrasC"/>
+    </dependencies>
+    <artifact-versions>
+        <artifact groupId="aopalliance" artifactId="aopalliance" version="1.0"/>
+        <artifact groupId="com.google.code.gson" artifactId="gson" version="2.5"/>
+        <artifact groupId="com.google.guava" artifactId="guava" version="18.0"/>
+        <artifact groupId="com.google.inject" artifactId="guice" version="3.0"/>
+        <artifact groupId="com.google.inject.extensions" artifactId="guice-assistedinject" version="3.0"/>
+        <artifact groupId="javax.inject" artifactId="javax.inject" version="1"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-core" version="2.21.0"/>
+        <artifact groupId="org.apache.camel" artifactId="camel-jclouds" version="2.21.0"/>
+        <artifact groupId="org.apache.jclouds" artifactId="jclouds-blobstore" version="2.1.0"/>
+        <artifact groupId="org.apache.jclouds" artifactId="jclouds-compute" version="2.1.0"/>
+        <artifact groupId="org.apache.jclouds" artifactId="jclouds-core" version="2.1.0"/>
+        <artifact groupId="org.apache.jclouds" artifactId="jclouds-scriptbuilder" version="2.1.0"/>
+        <artifact groupId="org.slf4j" artifactId="slf4j-api" version="1.7.25"/>
+        <artifact groupId="org.wildfly.camel" artifactId="wildfly-camel-feature-extrasC" version="6.1.0-SNAPSHOT" extension="zip"/>
+    </artifact-versions>
+</feature-pack>
diff --git a/...etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml b/...etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml
@@ -243,6 +243,7 @@
         <module name="org.apache.camel.component.tarfile" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.telegram" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.thrift" export="true" services="export" optional="true" />
+        <module name="org.apache.camel.component.tika" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.twilio" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.twitter" export="true" services="export" optional="true" />
         <module name="org.apache.camel.component.undertow" export="true" services="export" optional="true" />

diff --git a/feature/modules/etc/smartics/camel-modules.xml b/feature/modules/etc/smartics/camel-modules.xml
@@ -2346,13 +2346,14 @@
             <include module="org.springframework.boot" />
         </apply-to-dependencies>
         <dependencies>
-            <module name="com.rometools.rome" export="true">
+            <module name="com.rometools.rome" export="true" slot="1.0">
                 <exports>
                     <include path="com/sun/syndication/feed" />
                     <include path="com/sun/syndication/feed/atom" />
                     <include path="com/sun/syndication/feed/module" />
                     <include path="com/sun/syndication/feed/rss" />
                     <include path="com/sun/syndication/feed/synd" />
+                    <include path="com/sun/syndication/io" />
                     <exclude path="com/sun**" />
                 </exports>
             </module>
@@ -2924,6 +2925,23 @@
         </exports>
     </module>
 
+    <module name="org.apache.camel.component.tika">
+        <include artifact="org.apache.camel:camel-tika" />
+        <apply-to-dependencies skip="true">
+            <include module="org.apache.camel.apt" />
+            <include module="org.springframework.boot" />
+        </apply-to-dependencies>
+        <dependencies>
+            <module name="org.apache.tika" export="true" >
+                <exports>
+                    <exclude path="org/apache/tika/parser/internal**" />
+                </exports>
+            </module>
+            <module name="javax.api"/>
+            <module name="org.slf4j"/>
+        </dependencies>
+    </module>
+
     <module name="org.apache.camel.component.twitter">
         <include artifact="org.apache.camel:camel-twitter" />
         <include artifact=":twitter4j-core" />