Skip to content

Commit

Permalink
TEIID-4220: correcting the Olingo dependencies after move to olingo-4…
Browse files Browse the repository at this point in the history 
….2.0 (#706)
  • Loading branch information
@rareddy
rareddy committed Jun 3, 2016
1 parent fef40cd commit a332870
Show file tree
Hide file tree
Showing 10 changed files with 61 additions and 101 deletions.
48 changes: 8 additions & 40 deletions olingo-common/kits/wildfly-dist.xml
View file
Expand Up @@ -10,21 +10,14 @@
<baseDirectory>modules</baseDirectory>

<fileSets>
<fileSet>
<directory>kits/wildfly/modules</directory>
<outputDirectory>${wildfly-module-root}</outputDirectory>
<filtered>true</filtered>
<includes>
<include>**/*</include>
</includes>
</fileSet>
<fileSet>
<directory>target</directory>
<outputDirectory>${wildfly-module-root}/org/jboss/teiid/main/deployments</outputDirectory>
<includes>
<include>**/*.war</include>
</includes>
</fileSet>
<fileSet>
<directory>kits/wildfly/modules</directory>
<outputDirectory>${wildfly-module-root}</outputDirectory>
<filtered>true</filtered>
<includes>
<include>**/*</include>
</includes>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
Expand All @@ -44,30 +37,5 @@
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
<outputDirectory>${wildfly-module-root}/org/antlr/4.5</outputDirectory>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
<include>org.antlr:antlr4-runtime</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>
</dependencySets>

</assembly>
9 changes: 0 additions & 9 deletions olingo-common/kits/wildfly/modules/org/antlr/4.5/module.xml
View file

This file was deleted.

4 changes: 0 additions & 4 deletions olingo-common/kits/wildfly/modules/org/apache/olingo/commons/main/module.xml
View file
Expand Up @@ -14,12 +14,8 @@
<module name="javax.servlet.api"/>
<module name="javax.xml.stream.api"/>
<module name="org.apache.httpcomponents"/>
<module name="com.fasterxml.jackson.core"/>
<module name="org.slf4j"/>
<module name="org.codehaus.woodstox"/>
<module name="org.apache.commons.codec"/>
<module name="org.apache.commons.lang" slot="3.3.2"/>
<module name="org.antlr" slot="4.5"/>
</dependencies>

</module>
18 changes: 4 additions & 14 deletions olingo-common/pom.xml
View file
Expand Up @@ -71,20 +71,10 @@
</dependency>

<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml</groupId>
<artifactId>aalto-xml</artifactId>
</dependency>

<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>

</dependencies>

</project>
18 changes: 17 additions & 1 deletion olingo/kits/wildfly-dist.xml
View file
Expand Up @@ -61,7 +61,23 @@
<include>com.fasterxml.jackson.core:jackson-databind</include>
<include>com.fasterxml.jackson.core:jackson-annotations</include>
</includes>
<useProjectArtifact>true</useProjectArtifact>
<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>
</dependencySets>

Expand Down
0 ...s/com/fasterxml/aalto-xml/main/module.xml → ...s/com/fasterxml/aalto-xml/main/module.xml
View file
File renamed without changes.
0 .../org/apache/commons/lang/3.3.2/module.xml → .../org/apache/commons/lang/3.3.2/module.xml
View file
File renamed without changes.
9 changes: 1 addition & 8 deletions olingo/kits/wildfly/modules/org/apache/olingo/server/main/module.xml
View file
Expand Up @@ -16,15 +16,8 @@
<module name="javax.servlet.api"/>
<module name="javax.xml.stream.api"/>
<module name="org.apache.httpcomponents"/>
<module name="com.fasterxml.jackson.core.jackson-core"/>
<module name="com.fasterxml.jackson.core.jackson-databind"/>
<module name="com.fasterxml.jackson.core.jackson-annotations"/>
<module name="com.fasterxml.jackson.core"/>
<module name="com.fasterxml.aalto-xml"/>
<module name="org.slf4j"/>
<module name="org.codehaus.woodstox"/>
<module name="org.apache.commons.codec"/>
<module name="org.apache.commons.lang" slot="3.3.2"/>
<module name="org.antlr" slot="4.5"/>
<module name="org.apache.olingo.commons"/>
</dependencies>

Expand Down
1 change: 0 additions & 1 deletion olingo/kits/wildfly/modules/org/jboss/teiid/olingo/main/module.xml
View file
Expand Up @@ -11,7 +11,6 @@
<dependencies>
<module name="javax.api"/>
<module name="javax.servlet.api"/>
<module name="com.fasterxml.jackson.core"/>
<module name="org.jboss.teiid.olingo.common"/>
<module name="org.apache.olingo.server"/>
<module name="org.jboss.teiid.common-core" />
Expand Down
55 changes: 31 additions & 24 deletions olingo/pom.xml
View file
Expand Up @@ -117,44 +117,51 @@
<groupId>org.apache.olingo</groupId>
<artifactId>odata-server-core-ext</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>org.jboss.teiid</groupId>
<artifactId>teiid-runtime</artifactId>
</dependency>

<!-- runtime dependencies -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>

<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.1_spec</artifactId>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.1_spec</artifactId>
</dependency>
<!-- runtime dependencies -->

<!-- odata-server-core runtime dependencies -->
<dependency>
<groupId>com.fasterxml</groupId>
<artifactId>aalto-xml</artifactId>
</dependency>
</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.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>

<!-- aalto-xml runtime dependency -->
<dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.jboss.teiid</groupId>
Expand Down

0 comments on commit a332870

Please sign in to comment.