[portal-commits] JBoss Portal SVN: r11508 - in modules/common/tags/JBP_COMMON_1_1_2: build and 3 other directories.

Author: chris.laprun(a)jboss.com Date: 2008-07-18 17:33:32 -0400 (Fri, 18 Jul 2008) New Revision: 11508 Removed: modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.2.working modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-left.r10094 modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-left.r10199 modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-right.r10095 modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-right.r10200 modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.working Modified: modules/common/tags/JBP_COMMON_1_1_2/build/pom.xml modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml modules/common/tags/JBP_COMMON_1_1_2/mc/pom.xml modules/common/tags/JBP_COMMON_1_1_2/pom.xml modules/common/tags/JBP_COMMON_1_1_2/portal/pom.xml modules/common/tags/JBP_COMMON_1_1_2/releaseLibs.sh Log: - Updated to 1.1.2. - Cleaned up extra files. Modified: modules/common/tags/JBP_COMMON_1_1_2/build/pom.xml =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/build/pom.xml 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/build/pom.xml 2008-07-18 21:33:32 UTC (rev 11508) @@ -10,7 +10,7 @@ <artifactId>module-parent</artifactId> <packaging>pom</packaging> <name>JBoss Portal Modules Common</name> - <version>1.1-SNAPSHOT</version> + <version>1.1.2</version> <url>http://labs.jboss.com/jbossportal</url> <properties> Modified: modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml 2008-07-18 21:33:32 UTC (rev 11508) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.portal.common</groupId> <artifactId>module-parent</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1.2</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Deleted: modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.2.working =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.2.working 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.2.working 2008-07-18 21:33:32 UTC (rev 11508) @@ -1,208 +0,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> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.1.1</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - - <dependency> -<<<<<<< .working - <groupId>oswego-concurrent</groupId> - <artifactId>concurrent</artifactId> - <version>1.3.4</version> - </dependency> - - <dependency> -======= ->>>>>>> .merge-right.r10095 - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <version>2.2.0.GA</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>0.8</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - </manifest> - </archive> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-source-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <!-- To use in conjonctin with - export MAVEN_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" - --> -<!-- - <forkMode>never</forkMode> - <argLine>-enableassertions</argLine> ---> - <excludes> - <exclude>org/jboss/portal/test/common/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-changes-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.0</version> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <linkXref>true</linkXref> - <targetJdk>1.5</targetJdk> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - </plugins> - </reporting> - - <properties/> -</project> Deleted: modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-left.r10094 =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-left.r10094 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-left.r10094 2008-07-18 21:33:32 UTC (rev 11508) @@ -1,150 +0,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> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <dependency> - <groupId>oswego-concurrent</groupId> - <artifactId>concurrent</artifactId> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-backport-concurrent</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <!-- To use in conjonctin with - export MAVEN_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" - --> -<!-- - <forkMode>never</forkMode> - <argLine>-enableassertions</argLine> ---> - <forkMode>never</forkMode> - <argLine>-enableassertions</argLine> - <excludes> - <exclude>org/jboss/portal/test/common/i18n/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <properties/> -</project> Deleted: modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-left.r10199 =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-left.r10199 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-left.r10199 2008-07-18 21:33:32 UTC (rev 11508) @@ -1,138 +0,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> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <!-- To use in conjonctin with - export MAVEN_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" - --> -<!-- ---> - <forkMode>never</forkMode> - <argLine>-enableassertions</argLine> - <excludes> - <exclude>org/jboss/portal/test/common/i18n/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <properties/> -</project> Deleted: modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-right.r10095 =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-right.r10095 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-right.r10095 2008-07-18 21:33:32 UTC (rev 11508) @@ -1,140 +0,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> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <!-- To use in conjonctin with - export MAVEN_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" - --> -<!-- - <forkMode>never</forkMode> - <argLine>-enableassertions</argLine> ---> - <forkMode>never</forkMode> - <argLine>-enableassertions</argLine> - <excludes> - <exclude>org/jboss/portal/test/common/i18n/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <properties/> -</project> Deleted: modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-right.r10200 =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-right.r10200 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.merge-right.r10200 2008-07-18 21:33:32 UTC (rev 11508) @@ -1,136 +0,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> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../build/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <!-- To use in conjonctin with - export MAVEN_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" - --> - <forkMode>never</forkMode> - <argLine>-enableassertions</argLine> - <excludes> - <exclude>org/jboss/portal/test/common/i18n/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <properties/> -</project> Deleted: modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.working =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.working 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/common/pom.xml.working 2008-07-18 21:33:32 UTC (rev 11508) @@ -1,211 +0,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> - <groupId>org.jboss.portal.common</groupId> - <artifactId>module-parent</artifactId> - <version>1.1.1</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>common-common</artifactId> - <packaging>jar</packaging> - <name>JBoss Portal Modules Common</name> - - <dependencies> - - <dependency> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - - <dependency> - <groupId>oswego-concurrent</groupId> - <artifactId>concurrent</artifactId> - <version>1.3.4</version> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-j2ee</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <version>2.2.0.GA</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-jmx</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-system</artifactId> - <version>4.2.0.GA</version> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> - </dependency> - - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-backport-concurrent</artifactId> - <version>2.1.0.GA</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-junit</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>org.codehaus.cargo</groupId> - <artifactId>cargo-core-uberjar</artifactId> - <version>0.8</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-nodeps</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>ant</groupId> - <artifactId>ant-launcher</artifactId> - <version>1.6.5</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> - - </dependencies> - - <build> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources/format/code</directory> - <includes> - <include>*.tpl</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>iso-8859-1</encoding> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - </manifest> - </archive> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-source-plugin</artifactId> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <!-- To use in conjonctin with - export MAVEN_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" - --> -<!-- - <forkMode>never</forkMode> - <argLine>-enableassertions</argLine> ---> - <excludes> - <exclude>org/jboss/portal/test/common/BundleNameParserTestCase*.java</exclude> - <exclude>org/jboss/portal/test/common/net/URLNavigatorTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - - </plugins> - - <testSourceDirectory>src/test/java</testSourceDirectory> - - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - </testResource> - </testResources> - </build> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-changes-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.0</version> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <linkXref>true</linkXref> - <targetJdk>1.5</targetJdk> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - </plugins> - </reporting> - - <properties/> -</project> Modified: modules/common/tags/JBP_COMMON_1_1_2/mc/pom.xml =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/mc/pom.xml 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/mc/pom.xml 2008-07-18 21:33:32 UTC (rev 11508) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.portal.common</groupId> <artifactId>module-parent</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1.2</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: modules/common/tags/JBP_COMMON_1_1_2/pom.xml =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/pom.xml 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/pom.xml 2008-07-18 21:33:32 UTC (rev 11508) @@ -5,7 +5,7 @@ <artifactId>module-aggregator</artifactId> <packaging>pom</packaging> <name>JBoss Portal Modules Common (aggregator)</name> - <version>1.1-SNAPHOT</version> + <version>1.1.2</version> <distributionManagement> <repository> Modified: modules/common/tags/JBP_COMMON_1_1_2/portal/pom.xml =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/portal/pom.xml 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/portal/pom.xml 2008-07-18 21:33:32 UTC (rev 11508) @@ -3,7 +3,7 @@ <parent> <groupId>org.jboss.portal.common</groupId> <artifactId>module-parent</artifactId> - <version>1.1-SNAPSHOT</version> + <version>1.1.2</version> <relativePath>../build/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: modules/common/tags/JBP_COMMON_1_1_2/releaseLibs.sh =================================================================== --- modules/common/tags/JBP_COMMON_1_1_2/releaseLibs.sh 2008-07-18 21:17:34 UTC (rev 11507) +++ modules/common/tags/JBP_COMMON_1_1_2/releaseLibs.sh 2008-07-18 21:33:32 UTC (rev 11508) @@ -1,4 +1,4 @@ -repos=$HOME/Dev/portal-modules-respo/common/trunk-SNAPSHOT/lib +repos=$HOME/Dev/portal-modules-respo/common/1.1.2/lib thirdparty=$HOME/Dev/jboss-portal-2.7/thirdparty/jboss-portal/modules/common/lib/ echo "Copies current version of common libraries either to local repository copy or Portal thirdparty to test or release purpose" @@ -22,6 +22,6 @@ fi -cp common/target/common-common-1.1-SNAPSHOT.jar $loc/portal-common-lib.jar -cp mc/target/common-mc-1.1-SNAPSHOT.jar $loc/portal-common-mc-lib.jar -cp portal/target/common-portal-1.1-SNAPSHOT.jar $loc/portal-common-portal-lib.jar +cp common/target/common-common-1.1.2.jar $loc/portal-common-lib.jar +cp mc/target/common-mc-1.1.2.jar $loc/portal-common-mc-lib.jar +cp portal/target/common-portal-1.1.2.jar $loc/portal-common-portal-lib.jar