Skip to content

Commit

Permalink
[resolves wildfly-extras#1962] Create a BOM for wildfly-camel
Browse files Browse the repository at this point in the history
  • Loading branch information
tdiesler committed Sep 22, 2017
1 parent 9febb4e commit 4a7bc32
Show file tree
Hide file tree
Showing 26 changed files with 392 additions and 413 deletions.
237 changes: 237 additions & 0 deletions bom/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,237 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
#%L
Wildfly Camel Enricher
%%
Copyright (C) 2013 - 2014 RedHat
%%
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
#L%
-->


<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.wildfly.camel</groupId>
<artifactId>wildfly-camel</artifactId>
<version>4.9.0-SNAPSHOT</version>
</parent>

<name>Wildfly Camel :: BOM</name>

<artifactId>wildfly-camel-bom</artifactId>
<packaging>pom</packaging>

<dependencyManagement>
<dependencies>

<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-parent</artifactId>
<version>${version.apache.camel}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-parent</artifactId>
<version>${version.wildfly}</version>
<scope>import</scope>
<type>pom</type>
</dependency>

<!-- Camel & WildFly define conflicting shrinkwrap versions, here we say which one we want -->
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-bom</artifactId>
<version>${version.jboss.shrinkwrap}</version>
<scope>import</scope>
<type>pom</type>
</dependency>

<dependency>
<groupId>args4j</groupId>
<artifactId>args4j</artifactId>
<version>${version.args4j}</version>
</dependency>
<dependency>
<groupId>io.hawt</groupId>
<artifactId>hawtio-wildfly</artifactId>
<version>${version.hawtio}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
<version>${version.javax.cache.api}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.log</artifactId>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</exclusion>
</exclusions>
<version>${version.apache.felix.log}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
<version>${version.apache.felix.metatype}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>${version.apache.felix.scr}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-common</artifactId>
<version>${version.apache.lucene}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-backward-codecs</artifactId>
<version>${version.apache.lucene}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<version>${version.apache.lucene}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-highlighter</artifactId>
<version>${version.apache.lucene}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-join</artifactId>
<version>${version.apache.lucene}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-memory</artifactId>
<version>${version.apache.lucene}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-misc</artifactId>
<version>${version.apache.lucene}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-queries</artifactId>
<version>${version.apache.lucene}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-queryparser</artifactId>
<version>${version.apache.lucene}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-sandbox</artifactId>
<version>${version.apache.lucene}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-spatial</artifactId>
<version>${version.apache.lucene}</version>
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-suggest</artifactId>
<version>${version.apache.lucene}</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId>
<version>${version.maven.aether.provider}</version>
</dependency>
<!-- [FIXME #1712] Use WildFly provided org.apache.qpid.proton module -->
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>proton-j</artifactId>
<version>${version.apache.qpid.proton}</version>
</dependency>
<dependency>
<groupId>org.eclipse.mylyn.github</groupId>
<artifactId>org.eclipse.egit.github.core</artifactId>
<version>${version.eclipse.egit.github}</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-jcache</artifactId>
<version>${version.wildfly.infinispan}</version>
</dependency>
<dependency>
<groupId>org.jboss.gravia</groupId>
<artifactId>gravia-container-wildfly-extension</artifactId>
<version>${version.jboss.gravia}</version>
</dependency>
<dependency>
<groupId>org.jboss.gravia</groupId>
<artifactId>gravia-resource</artifactId>
<version>${version.jboss.gravia}</version>
</dependency>
<dependency>
<groupId>org.jboss.gravia</groupId>
<artifactId>gravia-runtime-api</artifactId>
<version>${version.jboss.gravia}</version>
</dependency>
<dependency>
<groupId>org.jboss.gravia</groupId>
<artifactId>gravia-runtime-embedded</artifactId>
<version>${version.jboss.gravia}</version>
</dependency>
<dependency>
<groupId>org.jboss.gravia</groupId>
<artifactId>gravia-runtime-osgi</artifactId>
<version>${version.jboss.gravia}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${version.osgi}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
<version>${version.osgi}</version>
</dependency>
<dependency>
<groupId>org.wildfly.extras.patch</groupId>
<artifactId>fuse-patch-config</artifactId>
<version>${version.fusepatch}</version>
</dependency>
<dependency>
<groupId>org.wildfly.extras.patch</groupId>
<artifactId>fuse-patch-core</artifactId>
<version>${version.fusepatch}</version>
</dependency>
<dependency>
<groupId>org.wildfly.extras.patch</groupId>
<artifactId>fuse-patch-feature-pack</artifactId>
<version>${version.fusepatch}</version>
<type>zip</type>
</dependency>

</dependencies>
</dependencyManagement>

</project>
12 changes: 12 additions & 0 deletions catalog/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@

<artifactId>wildfly-camel-catalog</artifactId>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.wildfly.camel</groupId>
Expand Down
13 changes: 12 additions & 1 deletion config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,19 @@
<jboss.server.name>wildfly-${version.wildfly}</jboss.server.name>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>

<dependency>
<groupId>org.wildfly.extras.patch</groupId>
<artifactId>fuse-patch-config</artifactId>
Expand Down
12 changes: 12 additions & 0 deletions cxfhttp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,18 @@
<name>WildFly Camel :: CXF Undertow</name>
<artifactId>wildfly-camel-cxf-undertow</artifactId>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.apache.cxf</groupId>
Expand Down
5 changes: 2 additions & 3 deletions feature/pack/etc/smartics/other-modules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@
</module>

<!-- [FIXME #1357] Integrate with httpclient 4.5.2 when provided by WildFly -->
<module name="org.apache.httpcomponents" slot="4.5.2" inherit-slot="false">
<module name="org.apache.httpcomponents" slot="4.5" inherit-slot="false">
<properties>
<property name="jboss.api" value="private"/>
</properties>
Expand Down Expand Up @@ -854,6 +854,7 @@
</module>

<module name="org.apache.lucene" slot="5.5">
<include artifact="jakarta-regexp:jakarta-regexp" />
<include artifact="org.apache.lucene:lucene-analyzers-common" />
<include artifact="org.apache.lucene:lucene-backward-codecs" />
<include artifact="org.apache.lucene:lucene-core" />
Expand All @@ -867,9 +868,7 @@
<include artifact="org.apache.lucene:lucene-misc" />
<include artifact="org.apache.lucene:lucene-sandbox" />
<include artifact="org.apache.lucene:lucene-spatial" />
<include artifact="org.apache.lucene:lucene-spatial3d" />
<include artifact="org.apache.lucene:lucene-suggest" />
<include artifact="com.spatial4j:spatial4j" />
<dependencies>
<module name="javax.api" />
</dependencies>
Expand Down
20 changes: 18 additions & 2 deletions feature/pack/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,18 @@
<wildfly.camel.module.dir>${project.build.directory}/${project.artifactId}-${project.version}/modules/system/layers/fuse</wildfly.camel.module.dir>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel-bom</artifactId>
<version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.wildfly.camel</groupId>
Expand Down Expand Up @@ -134,6 +146,10 @@
<version>${version.net.sf.json}</version>
<classifier>jdk15</classifier>
</dependency>
<dependency>
<groupId>org.apache-extras.beanshell</groupId>
<artifactId>bsh</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-camel</artifactId>
Expand Down Expand Up @@ -727,8 +743,8 @@
<artifactId>kafka_2.11</artifactId>
</dependency>
<dependency>
<groupId>org.apache-extras.beanshell</groupId>
<artifactId>bsh</artifactId>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-sandbox</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.mylyn.github</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<module name="com.fasterxml.jackson.dataformat.cbor" />
<module name="com.fasterxml.jackson.core.jackson-databind" />
<module name="org.apache.commons.logging" />
<module name="org.apache.httpcomponents" slot="4.5.2" />
<module name="org.apache.httpcomponents" slot="4.5" />
<module name="org.joda.time" />
</dependencies>
<exports>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<module name="org.apache.commons.io" />
<module name="org.apache.commons.lang3" />
<module name="org.apache.commons.logging" />
<module name="org.apache.httpcomponents" slot="4.5.2" />
<module name="org.apache.httpcomponents" slot="4.5" />
<module name="org.apache.xalan" />
<module name="org.apache.xerces" />
<module name="org.eclipse.jetty.websocket" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<module name="org.apache.camel.core" />
<module name="org.apache.commons.codec" />
<module name="org.apache.commons.logging" />
<module name="org.apache.httpcomponents" slot="4.5.2" />
<module name="org.apache.httpcomponents" slot="4.5" />
<module name="org.joda.time" />
</dependencies>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
<module name="org.slf4j" />
<module name="javax.xml.bind.api" />
<module name="org.apache.camel.core" />
<module name="org.apache.httpcomponents" slot="4.5.2" />
<module name="org.apache.httpcomponents" slot="4.5" />
</dependencies>
</module>
Loading

0 comments on commit 4a7bc32

Please sign in to comment.