Skip to content

Commit

Permalink
Merge branch '63-8.12.x' of https://github.com/vhalbert/teiid into 63…
Browse files Browse the repository at this point in the history
…-8.12.x
  • Loading branch information
shawkins committed Mar 22, 2016
2 parents 2e27d4e + 8044ce5 commit 73438b9
Show file tree
Hide file tree
Showing 7 changed files with 122 additions and 22 deletions.
21 changes: 13 additions & 8 deletions build/assembly/adminshell/adminshell-dist.xml
Expand Up @@ -33,6 +33,19 @@
</binaries>

</moduleSet>

<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
<include>org.jboss.teiid:teiid-jdbc</include>
</includes>
<binaries>
<includeDependencies>false</includeDependencies>
<unpack>false</unpack>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>teiid-${project.version}-jdbc.jar</outputFileNameMapping>
</binaries>
</moduleSet>
</moduleSets>

<fileSets>
Expand All @@ -53,14 +66,6 @@
<exclude>**/*.sh</exclude>
</excludes>
</fileSet>

<fileSet>
<directory>target</directory>
<includes>
<include>teiid-${project.version}-jdbc.jar</include>
</includes>
<outputDirectory>lib</outputDirectory>
</fileSet>

</fileSets>

Expand Down
22 changes: 13 additions & 9 deletions build/assembly/jboss-as7/dist.xml
Expand Up @@ -5,7 +5,7 @@

<formats>
<format>zip</format>
<format>dir</format>
<!--format>dir</format-->
</formats>

<includeBaseDirectory>false</includeBaseDirectory>
Expand Down Expand Up @@ -122,14 +122,6 @@
</includes>
<outputDirectory>docs/schema</outputDirectory>
</fileSet>

<fileSet>
<directory>target</directory>
<outputDirectory>${jdbcjar.loc}</outputDirectory>
<includes>
<include>teiid-*-jdbc.jar</include>
</includes>
</fileSet>

<fileSet>
<directory>target</directory>
Expand All @@ -150,6 +142,18 @@

<!-- these have external dependent clients like connectors-->
<moduleSets>
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
<include>org.jboss.teiid:teiid-jdbc</include>
</includes>
<binaries>
<includeDependencies>false</includeDependencies>
<unpack>false</unpack>
<outputDirectory>${jdbcjar.loc}</outputDirectory>
<outputFileNameMapping>teiid-${project.version}-jdbc.jar</outputFileNameMapping>
</binaries>
</moduleSet>

<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
Expand Down
8 changes: 3 additions & 5 deletions build/pom.xml
Expand Up @@ -157,13 +157,12 @@
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>assembly/src.xml</descriptor>
<descriptor>assembly/client-jar.xml</descriptor>
<descriptor>assembly/console-jar.xml</descriptor>
<descriptor>assembly/adminshell/adminshell-dist.xml</descriptor>
<descriptor>assembly/embedded-dist.xml</descriptor>
Expand Down Expand Up @@ -196,7 +195,7 @@
<mainClass>net.sf.retrotranslator.transformer.Retrotranslator</mainClass>
<arguments>
<argument>-srcjar</argument>
<argument>${project.basedir}/target/teiid-${project.version}-jdbc.jar</argument>
<argument>${project.basedir}/../teiid-jdbc/target/teiid-jdbc-${project.version}.jar</argument>
<argument>-destjar</argument>
<argument>${project.basedir}/target/teiid-${project.version}-jdbc-jdk15.jar</argument>
<argument>-embed</argument>
Expand All @@ -216,7 +215,7 @@
<mainClass>net.sf.retrotranslator.transformer.Retrotranslator</mainClass>
<arguments>
<argument>-srcjar</argument>
<argument>${project.basedir}/target/teiid-${project.version}-jdbc.jar</argument>
<argument>${project.basedir}/../teiid-jdbc/target/teiid-jdbc-${project.version}.jar</argument>
<argument>-destjar</argument>
<argument>${project.basedir}/target/teiid-${project.version}-jdbc-jdk14.jar</argument>
<argument>-embed</argument>
Expand Down Expand Up @@ -277,7 +276,6 @@
<configuration>
<descriptors>
<descriptor>assembly/src.xml</descriptor>
<descriptor>assembly/client-jar.xml</descriptor>
<descriptor>assembly/console-jar.xml</descriptor>
<descriptor>assembly/adminshell/adminshell-dist.xml</descriptor>
<descriptor>assembly/embedded-dist.xml</descriptor>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Expand Up @@ -1714,6 +1714,7 @@
<module>common-core</module>
<module>api</module>
<module>client</module>
<module>teiid-jdbc</module>
<module>engine</module>
<module>olingo-common</module>
<module>olingo-patches</module>
Expand Down
File renamed without changes.
49 changes: 49 additions & 0 deletions teiid-jdbc/dependency-reduced-pom.xml
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
<version>8.12.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-jdbc</artifactId>
<name>Teiid JDBC Jar</name>
<description>Teiid JDBC Jar assembly</description>
<build>
<plugins>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
<configuration />
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>hamcrest-core</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>

43 changes: 43 additions & 0 deletions teiid-jdbc/pom.xml
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/maven-v4_0_0.xsd">
<parent>
<artifactId>teiid-parent</artifactId>
<groupId>org.jboss.teiid</groupId>
<version>8.12.5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>teiid-jdbc</artifactId>
<name>Teiid JDBC Jar</name>
<description>Teiid JDBC Jar assembly</description>

<dependencies>
<dependency>
<groupId>org.jboss.teiid</groupId>
<artifactId>teiid-common-core</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.teiid</groupId>
<artifactId>teiid-client</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
<configuration>
</configuration>
</plugin>
</plugins>
</build>

</project>

0 comments on commit 73438b9

Please sign in to comment.