Skip to content

Commit

Permalink
TEIID-4164: Adding the runtime dependencies to the pom.xml, and also …
Browse files Browse the repository at this point in the history 
…making the wildfly kit self sufficient to deploy without requiring additional modules be there (#707)
  • Loading branch information
@rareddy
rareddy committed Jun 3, 2016
1 parent a332870 commit c26cc17
Show file tree
Hide file tree
Showing 7 changed files with 134 additions and 16 deletions.
37 changes: 36 additions & 1 deletion connectors/translator-odata4/kits/wildfly-dist.xml
View file
Expand Up @@ -46,7 +46,42 @@
<include>org.apache.olingo:odata-client-core</include>
</includes>
</dependencySet>

<dependencySet>
<outputDirectory>${wildfly-module-root}/com/fasterxml/jackson/core/main</outputDirectory>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
<include>com.fasterxml.jackson.core:jackson-core</include>
<include>com.fasterxml.jackson.core:jackson-databind</include>
<include>com.fasterxml.jackson.core:jackson-annotations</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
<outputDirectory>${wildfly-module-root}/org/apache/commons/lang/3.3.2</outputDirectory>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
<include>org.apache.commons:commons-lang3</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
<outputDirectory>${wildfly-module-root}/com/fasterxml/aalto-xml/main</outputDirectory>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
<include>com.fasterxml:aalto-xml</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
<includes>
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-yaml</include>
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml</include>
<include>com.fasterxml.jackson.datatype:jackson-datatype-joda</include>
</includes>
<outputDirectory>${wildfly-module-root}/com/fasterxml/jackson/dataformat/main</outputDirectory>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useTransitiveFiltering>false</useTransitiveFiltering>
</dependencySet>
<dependencySet>
<outputDirectory>${wildfly-module-root}/org/jboss/teiid/translator/odata4/main</outputDirectory>
<useTransitiveDependencies>false</useTransitiveDependencies>
Expand Down
16 changes: 16 additions & 0 deletions connectors/translator-odata4/kits/wildfly/modules/com/fasterxml/aalto-xml/main/module.xml
View file
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.0" name="com.fasterxml.aalto-xml">
<properties>
<property name="jboss.api" value="private"/>
</properties>

<resources>
<resource-root path="aalto-xml-${version.com.fasterxml.aalto-xml}.jar" />
</resources>

<dependencies>
<module name="org.codehaus.woodstox"/>
<module name="javax.api"/>
</dependencies>

</module>
14 changes: 14 additions & 0 deletions connectors/translator-odata4/kits/wildfly/modules/com/fasterxml/jackson/core/main/module.xml
View file
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.0" name="com.fasterxml.jackson.core">
<properties>
<property name="jboss.api" value="private"/>
</properties>
<resources>
<resource-root path="jackson-core-${version.com.fasterxml.jackson.core}.jar" />
<resource-root path="jackson-databind-${version.com.fasterxml.jackson.core}.jar" />
<resource-root path="jackson-annotations-${version.com.fasterxml.jackson.core}.jar" />
</resources>
<dependencies>
<module name="javax.api"/>
</dependencies>
</module>
19 changes: 19 additions & 0 deletions ...s/translator-odata4/kits/wildfly/modules/com/fasterxml/jackson/dataformat/main/module.xml
View file
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.0" name="com.fasterxml.jackson.dataformat">
<properties>
<property name="jboss.api" value="private"/>
</properties>
<resources>
<resource-root path="jackson-dataformat-yaml-${version.com.fasterxml.jackson.dataformat}.jar" />
<resource-root path="jackson-dataformat-xml-${version.com.fasterxml.jackson.dataformat}.jar" />
<resource-root path="jackson-datatype-joda-${version.com.fasterxml.jackson.dataformat}.jar"/>
</resources>

<dependencies>
<module name="javax.api"/>
<module name="javax.xml.stream.api"/>
<module name="com.fasterxml.jackson.core"/>
<module name="org.yaml.snakeyaml" />
<module name="org.codehaus.woodstox"/>
</dependencies>
</module>
9 changes: 9 additions & 0 deletions connectors/translator-odata4/kits/wildfly/modules/org/apache/commons/lang/3.3.2/module.xml
View file
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.0" name="org.apache.commons.lang" slot="3.3.2">
<properties>
<property name="jboss.api" value="private"/>
</properties>
<resources>
<resource-root path="commons-lang3-${version.org.apache.commons}.jar" />
</resources>
</module>
11 changes: 7 additions & 4 deletions connectors/translator-odata4/kits/wildfly/modules/org/apache/olingo/client/main/module.xml
View file
Expand Up @@ -11,13 +11,16 @@
<module name="javax.api"/>
<module name="javax.xml.stream.api"/>
<module name="org.apache.commons.lang" slot="3.3.2"/>
<module name="com.fasterxml.jackson.core"/>
<module name="org.apache.commons.io"/>
<module name="org.jboss.teiid.olingo.common"/>
<module name="org.slf4j"/>

<module name="com.fasterxml.jackson.core"/>
<module name="com.fasterxml.aalto-xml"/>
<module name="org.codehaus.woodstox"/>
<module name="com.fasterxml.jackson.dataformat"/>
<module name="org.slf4j"/>
<module name="com.fasterxml.jackson.dataformat"/>
<module name="org.apache.httpcomponents"/>
<module name="org.apache.olingo.commons"/>

</dependencies>

</module>
44 changes: 33 additions & 11 deletions connectors/translator-odata4/pom.xml
View file
Expand Up @@ -41,14 +41,6 @@
<groupId>org.jboss.teiid.connectors</groupId>
<artifactId>translator-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-commons-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-commons-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.olingo</groupId>
<artifactId>odata-client-api</artifactId>
Expand All @@ -57,10 +49,40 @@
<groupId>org.apache.olingo</groupId>
<artifactId>odata-client-core</artifactId>
</dependency>

<!-- Rutime dependencies -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml</groupId>
<artifactId>aalto-xml</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml</groupId>
<artifactId>aalto-xml</artifactId>
</dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
</dependencies>

<build>
Expand Down

0 comments on commit c26cc17

Please sign in to comment.