Author: rareddy Date: 2010-09-16 17:31:28 -0400 (Thu, 16 Sep 2010) New Revision: 2586 Removed: branches/7.1.x/build/assembly/bin.xml Modified: branches/7.1.x/adminshell/pom.xml branches/7.1.x/api/pom.xml branches/7.1.x/build/assembly/adminshell/adminshell-dist.xml branches/7.1.x/build/assembly/client-jar.xml branches/7.1.x/build/assembly/docs.xml branches/7.1.x/build/assembly/jboss-container/dist.xml branches/7.1.x/build/assembly/src.xml branches/7.1.x/build/pom.xml branches/7.1.x/cache-jbosscache/pom.xml branches/7.1.x/client/pom.xml branches/7.1.x/common-core/pom.xml branches/7.1.x/connectors/pom.xml branches/7.1.x/console/pom.xml branches/7.1.x/documentation/pom.xml branches/7.1.x/engine/pom.xml branches/7.1.x/hibernate-dialect/pom.xml branches/7.1.x/jboss-integration/pom.xml branches/7.1.x/metadata/pom.xml branches/7.1.x/pom.xml branches/7.1.x/runtime/pom.xml branches/7.1.x/test-integration/pom.xml Log: TEIID-1264: With the changes the "build" project will build all the assemblies for the Teiid. This also installs all the assemblies into maven repository. Modified: branches/7.1.x/adminshell/pom.xml =================================================================== --- branches/7.1.x/adminshell/pom.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/adminshell/pom.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -1,7 +1,7 @@ <?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</artifactId> + <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> <version>7.1.1</version> </parent> Modified: branches/7.1.x/api/pom.xml =================================================================== --- branches/7.1.x/api/pom.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/api/pom.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -1,7 +1,7 @@ <?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</artifactId> + <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> <version>7.1.1</version> </parent> Modified: branches/7.1.x/build/assembly/adminshell/adminshell-dist.xml =================================================================== --- branches/7.1.x/build/assembly/adminshell/adminshell-dist.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/build/assembly/adminshell/adminshell-dist.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -12,6 +12,7 @@ <moduleSets> <moduleSet> <includeSubModules>true</includeSubModules> + <useAllReactorProjects>true</useAllReactorProjects> <includes> <include>org.jboss.teiid:teiid-adminshell</include> @@ -39,7 +40,7 @@ <fileSets> <fileSet> - <directory>build/target/kits/adminshell</directory> + <directory>target/kits/adminshell</directory> <outputDirectory>/</outputDirectory> <includes> <include>**/*.sh</include> @@ -48,7 +49,7 @@ </fileSet> <fileSet> - <directory>build/target/kits/adminshell</directory> + <directory>target/kits/adminshell</directory> <outputDirectory>/</outputDirectory> <excludes> <exclude>**/*.sh</exclude> @@ -57,7 +58,7 @@ </fileSet> <fileSet> - <directory>target/distribution</directory> + <directory>target</directory> <includes> <include>teiid-${version}-client.jar</include> </includes> @@ -69,9 +70,9 @@ <files> <file> - <source>target/distribution/teiid-${version}-docs/admin-guide/en-US/pdf/teiid_admin_guide.pdf</source> + <source>target/teiid-${version}-docs/admin-guide/en-US/pdf/teiid_admin_guide.pdf</source> <fileMode>0644</fileMode> </file> </files> -</assembly> \ No newline at end of file +</assembly> Deleted: branches/7.1.x/build/assembly/bin.xml =================================================================== --- branches/7.1.x/build/assembly/bin.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/build/assembly/bin.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -1,35 +0,0 @@ -<!--This script builds a JAR for a Teiid Embedded Server Installation --> -<assembly> - - <id>bin</id> - - <formats> - <format>zip</format> - </formats> - - <includeBaseDirectory>false</includeBaseDirectory> - - <fileSets> - <fileSet> - <includes> - <include>*.txt</include> - </includes> - <useDefaultExcludes>true</useDefaultExcludes> - </fileSet> - </fileSets> - - <moduleSets> - <moduleSet> - <includeSubModules>true</includeSubModules> - <binaries> - <includeDependencies>false</includeDependencies> - <unpack>false</unpack> - <outputDirectory></outputDirectory> - <includes> - <include>:jar:*</include> - </includes> - </binaries> - </moduleSet> - </moduleSets> - -</assembly> \ No newline at end of file Modified: branches/7.1.x/build/assembly/client-jar.xml =================================================================== --- branches/7.1.x/build/assembly/client-jar.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/build/assembly/client-jar.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -13,7 +13,8 @@ <moduleSets> <moduleSet> <includeSubModules>true</includeSubModules> - + <useAllReactorProjects>true</useAllReactorProjects> + <includes> <include>org.jboss.teiid:teiid-client</include> <include>org.jboss.teiid:teiid-common-core</include> Modified: branches/7.1.x/build/assembly/docs.xml =================================================================== --- branches/7.1.x/build/assembly/docs.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/build/assembly/docs.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -12,7 +12,8 @@ <moduleSets> <moduleSet> <includeSubModules>true</includeSubModules> - + <useAllReactorProjects>true</useAllReactorProjects> + <includes> <include>org.jboss.teiid.documentation:admin-guide</include> <include>org.jboss.teiid.documentation:reference</include> Modified: branches/7.1.x/build/assembly/jboss-container/dist.xml =================================================================== --- branches/7.1.x/build/assembly/jboss-container/dist.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/build/assembly/jboss-container/dist.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -13,7 +13,7 @@ <fileSets> <fileSet> - <directory>build/target/kits/jboss-container</directory> + <directory>target/kits/jboss-container</directory> <outputDirectory>/</outputDirectory> <includes> <include>**/*.sh</include> @@ -23,7 +23,7 @@ </fileSet> <fileSet> - <directory>build/target/kits/jboss-container</directory> + <directory>target/kits/jboss-container</directory> <outputDirectory>/</outputDirectory> <excludes> <exclude>**/*.sh</exclude> @@ -34,7 +34,7 @@ <!-- only true dependency file for any client --> <fileSet> - <directory>target/distribution</directory> + <directory>target</directory> <includes> <include>teiid-${version}-client.jar</include> </includes> @@ -44,7 +44,7 @@ </fileSet> <fileSet> - <directory>client/src/main/resources</directory> + <directory>../client/src/main/resources</directory> <includes> <include>vdb-deployer.xsd</include> </includes> @@ -70,32 +70,32 @@ <files> <file> - <source>target/distribution/teiid-${version}-docs/admin-guide/en-US/pdf/teiid_admin_guide.pdf</source> + <source>target/teiid-${version}-docs/admin-guide/en-US/pdf/teiid_admin_guide.pdf</source> <outputDirectory>teiid-docs</outputDirectory> <fileMode>0644</fileMode> </file> <file> - <source>target/distribution/teiid-${version}-docs/reference/en-US/pdf/teiid_reference.pdf</source> + <source>target/teiid-${version}-docs/reference/en-US/pdf/teiid_reference.pdf</source> <outputDirectory>teiid-docs</outputDirectory> <fileMode>0644</fileMode> </file> <file> - <source>target/distribution/teiid-${version}-docs/quick-start-example/en-US/pdf/teiid_quick_start_example.pdf</source> + <source>target/teiid-${version}-docs/quick-start-example/en-US/pdf/teiid_quick_start_example.pdf</source> <outputDirectory>teiid-docs</outputDirectory> <fileMode>0644</fileMode> </file> <file> - <source>target/distribution/teiid-${version}-docs/developer-guide/en-US/pdf/teiid_developer_guide.pdf</source> + <source>target/teiid-${version}-docs/developer-guide/en-US/pdf/teiid_developer_guide.pdf</source> <outputDirectory>teiid-docs</outputDirectory> <fileMode>0644</fileMode> </file> <file> - <source>target/distribution/teiid-${version}-docs/client-developers-guide/en-US/pdf/teiid_client_developers_guide.pdf</source> + <source>target/teiid-${version}-docs/client-developers-guide/en-US/pdf/teiid_client_developers_guide.pdf</source> <outputDirectory>teiid-docs</outputDirectory> <fileMode>0644</fileMode> </file> <file> - <source>target/distribution/teiid-${version}-docs/caching-guide/en-US/pdf/teiid_caching_guide.pdf</source> + <source>target/teiid-${version}-docs/caching-guide/en-US/pdf/teiid_caching_guide.pdf</source> <outputDirectory>teiid-docs</outputDirectory> <fileMode>0644</fileMode> </file> @@ -104,7 +104,9 @@ <!-- these have external dependent clients like connectors--> <moduleSets> + <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> <includes> <include>org.jboss.teiid:teiid-hibernate-dialect</include> </includes> @@ -118,6 +120,7 @@ <!-- These are Teiid internal dependencies; to make JCA work --> <moduleSet> <includeSubModules>true</includeSubModules> + <useAllReactorProjects>true</useAllReactorProjects> <includes> <include>org.jboss.teiid:teiid-jboss-integration</include> @@ -142,7 +145,8 @@ <!-- These are built in connectors --> <moduleSet> <includeSubModules>true</includeSubModules> - + <useAllReactorProjects>true</useAllReactorProjects> + <includes> <include>org.jboss.teiid.connectors:connector-file:rar</include> <include>org.jboss.teiid.connectors:connector-ldap:rar</include> @@ -171,7 +175,8 @@ <!-- These are built in translators --> <moduleSet> <includeSubModules>true</includeSubModules> - + <useAllReactorProjects>true</useAllReactorProjects> + <includes> <include>org.jboss.teiid.connectors:translator-jdbc</include> <include>org.jboss.teiid.connectors:translator-loopback</include> @@ -201,7 +206,8 @@ <!-- Include the JOPR plugin --> <moduleSet> <includeSubModules>true</includeSubModules> - + <useAllReactorProjects>true</useAllReactorProjects> + <includes> <include>org.jboss.teiid:teiid-console</include> </includes> @@ -215,4 +221,4 @@ </moduleSet> </moduleSets> -</assembly> \ No newline at end of file +</assembly> Modified: branches/7.1.x/build/assembly/src.xml =================================================================== --- branches/7.1.x/build/assembly/src.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/build/assembly/src.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -11,7 +11,7 @@ <fileSets> <fileSet> - <directory>${project.basedir}</directory> + <directory>${project.basedir}/..</directory> <useDefaultExcludes>true</useDefaultExcludes> <outputDirectory>teiid</outputDirectory> <excludes> Modified: branches/7.1.x/build/pom.xml =================================================================== --- branches/7.1.x/build/pom.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/build/pom.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -1,11 +1,11 @@ <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</artifactId> + <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> <version>7.1.1</version> </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>build</artifactId> + <artifactId>teiid</artifactId> <name>Build</name> <description>Teiid Build</description> <build> @@ -34,5 +34,61 @@ </excludes> </resource> </resources> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-6-m1-jboss</version> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + + <configuration> + <descriptors> + <descriptor>assembly/client-jar.xml</descriptor> + <descriptor>assembly/jboss-container/dist.xml</descriptor> + <descriptor>assembly/adminshell/adminshell-dist.xml</descriptor> + </descriptors> + </configuration> + + <executions> + <execution> + <id>create-assemblies</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> + + <profiles> + <profile> + <!-- + This profile is activated manually, as in "mvn ... -P release ..." + --> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>assembly/src.xml</descriptor> + <descriptor>assembly/docs.xml</descriptor> + <descriptor>assembly/client-jar.xml</descriptor> + <descriptor>assembly/jboss-container/dist.xml</descriptor> + <descriptor>assembly/adminshell/adminshell-dist.xml</descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> \ No newline at end of file Modified: branches/7.1.x/cache-jbosscache/pom.xml =================================================================== --- branches/7.1.x/cache-jbosscache/pom.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/cache-jbosscache/pom.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -1,7 +1,7 @@ <?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</artifactId> + <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> <version>7.1.1</version> </parent> Modified: branches/7.1.x/client/pom.xml =================================================================== --- branches/7.1.x/client/pom.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/client/pom.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -1,7 +1,7 @@ <?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</artifactId> + <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> <version>7.1.1</version> </parent> Modified: branches/7.1.x/common-core/pom.xml =================================================================== --- branches/7.1.x/common-core/pom.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/common-core/pom.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -1,7 +1,7 @@ <?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</artifactId> + <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> <version>7.1.1</version> </parent> Modified: branches/7.1.x/connectors/pom.xml =================================================================== --- branches/7.1.x/connectors/pom.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/connectors/pom.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -1,7 +1,7 @@ <?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</artifactId> + <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> <version>7.1.1</version> </parent> Modified: branches/7.1.x/console/pom.xml =================================================================== --- branches/7.1.x/console/pom.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/console/pom.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <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</artifactId> + <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> <version>7.1.1</version> </parent> Modified: branches/7.1.x/documentation/pom.xml =================================================================== --- branches/7.1.x/documentation/pom.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/documentation/pom.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -1,6 +1,6 @@ <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</artifactId> + <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> <version>7.1.1</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: branches/7.1.x/engine/pom.xml =================================================================== --- branches/7.1.x/engine/pom.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/engine/pom.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -1,7 +1,7 @@ <?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</artifactId> + <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> <version>7.1.1</version> </parent> Modified: branches/7.1.x/hibernate-dialect/pom.xml =================================================================== --- branches/7.1.x/hibernate-dialect/pom.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/hibernate-dialect/pom.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -1,6 +1,6 @@ <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</artifactId> + <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> <version>7.1.1</version> </parent> Modified: branches/7.1.x/jboss-integration/pom.xml =================================================================== --- branches/7.1.x/jboss-integration/pom.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/jboss-integration/pom.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -1,6 +1,6 @@ <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</artifactId> + <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> <version>7.1.1</version> </parent> Modified: branches/7.1.x/metadata/pom.xml =================================================================== --- branches/7.1.x/metadata/pom.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/metadata/pom.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -1,7 +1,7 @@ <?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</artifactId> + <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> <version>7.1.1</version> </parent> Modified: branches/7.1.x/pom.xml =================================================================== --- branches/7.1.x/pom.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/pom.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -2,7 +2,7 @@ <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"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.teiid</groupId> - <artifactId>teiid</artifactId> + <artifactId>teiid-parent</artifactId> <packaging>pom</packaging> <name>Teiid</name> <version>7.1.1</version> @@ -67,61 +67,28 @@ </developer> </developers> <profiles> - <profile> - <!-- + <profile> + <!-- This profile is activated manually, as in "mvn ... -P release ..." --> - <id>release</id> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> - <configuration> - <descriptors> - <descriptor>build/assembly/src.xml</descriptor> - <descriptor>build/assembly/docs.xml</descriptor> - <descriptor>build/assembly/client-jar.xml</descriptor> - <descriptor>build/assembly/jboss-container/dist.xml</descriptor> - <descriptor>build/assembly/adminshell/adminshell-dist.xml</descriptor> - </descriptors> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> - </configuration> - </plugin> - </plugins> - </build> - <modules> - <module>build</module> - <module>documentation</module> - </modules> - </profile> - <profile> - <!-- + <id>release</id> + <modules> + <module>documentation</module> + <module>build</module> + </modules> + </profile> + <profile> + <!-- This is to enable faster build for development time. --> - <id>dev</id> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> - <configuration> - <descriptors> - <descriptor>build/assembly/client-jar.xml</descriptor> - <descriptor>build/assembly/jboss-container/dist.xml</descriptor> - <descriptor>build/assembly/adminshell/adminshell-dist.xml</descriptor> - </descriptors> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> - </configuration> - </plugin> - </plugins> - </build> - <modules> - <module>build</module> - </modules> - </profile> + <id>dev</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>build</module> + </modules> + </profile> </profiles> <build> <!-- This section defines the default plugin settings inherited by child projects. --> @@ -504,7 +471,7 @@ <module>hibernate-dialect</module> <module>jboss-integration</module> <module>test-integration</module> - </modules> + </modules> <distributionManagement> <repository> <id>jboss-releases-repository</id> @@ -517,4 +484,4 @@ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/... </snapshotRepository> </distributionManagement> -</project> +</project> \ No newline at end of file Modified: branches/7.1.x/runtime/pom.xml =================================================================== --- branches/7.1.x/runtime/pom.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/runtime/pom.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -1,7 +1,7 @@ <?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</artifactId> + <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> <version>7.1.1</version> </parent> Modified: branches/7.1.x/test-integration/pom.xml =================================================================== --- branches/7.1.x/test-integration/pom.xml 2010-09-16 19:37:03 UTC (rev 2585) +++ branches/7.1.x/test-integration/pom.xml 2010-09-16 21:31:28 UTC (rev 2586) @@ -1,7 +1,7 @@ <?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</artifactId> + <artifactId>teiid-parent</artifactId> <groupId>org.jboss.teiid</groupId> <version>7.1.1</version> </parent>