JBoss Portal SVN: r9437 - modules/web/trunk/build.
by portal-commits@lists.jboss.org
Author: bdaw
Date: 2008-01-04 05:16:59 -0500 (Fri, 04 Jan 2008)
New Revision: 9437
Modified:
modules/web/trunk/build/pom.xml
Log:
readd jboss repos
Modified: modules/web/trunk/build/pom.xml
===================================================================
--- modules/web/trunk/build/pom.xml 2008-01-04 10:16:19 UTC (rev 9436)
+++ modules/web/trunk/build/pom.xml 2008-01-04 10:16:59 UTC (rev 9437)
@@ -49,6 +49,29 @@
<version.ant>1.7.0</version.ant>
</properties>
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
<pluginRepositories/>
18 years, 3 months
JBoss Portal SVN: r9436 - modules/identity/trunk/build.
by portal-commits@lists.jboss.org
Author: bdaw
Date: 2008-01-04 05:16:19 -0500 (Fri, 04 Jan 2008)
New Revision: 9436
Modified:
modules/identity/trunk/build/pom.xml
Log:
readd jboss repos
Modified: modules/identity/trunk/build/pom.xml
===================================================================
--- modules/identity/trunk/build/pom.xml 2008-01-04 10:15:51 UTC (rev 9435)
+++ modules/identity/trunk/build/pom.xml 2008-01-04 10:16:19 UTC (rev 9436)
@@ -54,6 +54,31 @@
</properties>
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+
<build>
<plugins>
18 years, 3 months
JBoss Portal SVN: r9435 - modules/portlet/trunk/build.
by portal-commits@lists.jboss.org
Author: bdaw
Date: 2008-01-04 05:15:51 -0500 (Fri, 04 Jan 2008)
New Revision: 9435
Modified:
modules/portlet/trunk/build/pom.xml
Log:
readd jboss repos
Modified: modules/portlet/trunk/build/pom.xml
===================================================================
--- modules/portlet/trunk/build/pom.xml 2008-01-04 10:15:24 UTC (rev 9434)
+++ modules/portlet/trunk/build/pom.xml 2008-01-04 10:15:51 UTC (rev 9435)
@@ -52,7 +52,31 @@
<version.sun-jaxb>2.1.4</version.sun-jaxb>
</properties>
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
<build>
<plugins>
<plugin>
18 years, 3 months
JBoss Portal SVN: r9434 - modules/common/trunk/build.
by portal-commits@lists.jboss.org
Author: bdaw
Date: 2008-01-04 05:15:24 -0500 (Fri, 04 Jan 2008)
New Revision: 9434
Modified:
modules/common/trunk/build/pom.xml
Log:
readd jboss repos
Modified: modules/common/trunk/build/pom.xml
===================================================================
--- modules/common/trunk/build/pom.xml 2008-01-04 00:42:37 UTC (rev 9433)
+++ modules/common/trunk/build/pom.xml 2008-01-04 10:15:24 UTC (rev 9434)
@@ -30,6 +30,30 @@
<version.ant>1.6.5</version.ant>
</properties>
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
<build>
<plugins>
<plugin>
18 years, 3 months
JBoss Portal SVN: r9433 - in modules/common/trunk: build and 3 other directories.
by portal-commits@lists.jboss.org
Author: bdaw
Date: 2008-01-03 19:42:37 -0500 (Thu, 03 Jan 2008)
New Revision: 9433
Added:
modules/common/trunk/build/pom.xml
Removed:
modules/common/trunk/build/build.bat
Modified:
modules/common/trunk/common/pom.xml
modules/common/trunk/mc/pom.xml
modules/common/trunk/pom.xml
modules/common/trunk/portal/pom.xml
Log:
change module structure and use jboss-portal-parent pom
Deleted: modules/common/trunk/build/build.bat
===================================================================
--- modules/common/trunk/build/build.bat 2008-01-04 00:06:14 UTC (rev 9432)
+++ modules/common/trunk/build/build.bat 2008-01-04 00:42:37 UTC (rev 9433)
@@ -1,54 +0,0 @@
-@echo off
-rem
-rem Invokes a script of the same name in the 'tools' module.
-rem
-rem The 'tools' module is expected to be a peer directory of the directory
-rem in which this script lives.
-rem
-rem @author Jason Dillon <jason(a)planet57.com>
-rem
-
-rem $Id: build.bat 2 2005-01-14 23:01:32Z vietj $
-
-setlocal
-
-set PROGNAME=%~nx0
-set DIRNAME=%~dp0
-
-rem Legacy shell support
-if x%PROGNAME%==x set PROGNAME=build.bat
-if x%DIRNAME%==x set DIRNAME=.\
-
-set MODULE_ROOT=%DIRNAME%
-if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools
-set TARGET=%TOOLS_ROOT%\bin\build.bat
-set ARGS=%*
-
-rem Start'er up yo
-goto main
-
-:debug
-if not x%DEBUG%==x echo %PROGNAME%: %*
-goto :EOF
-
-:main
-call :debug PROGNAME=%PROGNAME%
-call :debug DIRNAME=%DIRNAME%
-call :debug TOOLS_ROOT=%TOOLS_ROOT%
-call :debug TARGET=%TARGET%
-
-if exist %TARGET% call :call-script & goto :EOF
-rem else fail, we can not go on
-
-echo %PROGNAME%: *ERROR* The target executable does not exist:
-echo %PROGNAME%:
-echo %PROGNAME%: %TARGET%
-echo %PROGNAME%:
-echo %PROGNAME%: Please make sure you have checked out the 'tools' module
-echo %PROGNAME%: and make sure it is up to date.
-goto :EOF
-
-:call-script
-call :debug Executing %TARGET% %ARGS%
-call %TARGET% %ARGS%
-goto :EOF
Copied: modules/common/trunk/build/pom.xml (from rev 9420, modules/common/trunk/pom.xml)
===================================================================
--- modules/common/trunk/build/pom.xml (rev 0)
+++ modules/common/trunk/build/pom.xml 2008-01-04 00:42:37 UTC (rev 9433)
@@ -0,0 +1,148 @@
+<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</groupId>
+ <artifactId>jboss-portal-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.portal.common</groupId>
+ <artifactId>jboss-portal-modules-common-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Portal Modules Common</name>
+ <version>1.1.0-SNAPSHOT</version>
+ <url>http://labs.jboss.com/jbossportal</url>
+
+ <properties>
+ <version.activation>1.1</version.activation>
+ <version.concurrent>1.3.4</version.concurrent>
+ <version.javax.servlet>2.4</version.javax.servlet>
+ <version.jboss-j2ee>4.2.0.GA</version.jboss-j2ee>
+ <version.jboss-jmx>4.2.0.GA</version.jboss-jmx>
+ <version.jboss-system>4.2.0.GA</version.jboss-system>
+ <version.jboss-backport-concurrent>2.1.0.GA</version.jboss-backport-concurrent>
+ <version.jboss-common-core>2.2.0.GA</version.jboss-common-core>
+ <version.log4j>1.2.14</version.log4j>
+ <version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
+ <version.jboss.microcontainer>2.0.0.Beta4</version.jboss.microcontainer>
+ <version.cargo>0.8</version.cargo>
+ <version.junit>3.8.1</version.junit>
+ <version.ant>1.6.5</version.ant>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${version.log4j}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>${version.concurrent}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${version.activation}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-j2ee</artifactId>
+ <version>${version.jboss-j2ee}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>${version.jboss-common-core}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${version.ant}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <version>${version.jboss-jmx}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ <version>${version.jboss-system}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${version.apache.commons-httpclient}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-backport-concurrent</artifactId>
+ <version>${version.jboss-backport-concurrent}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${version.javax.servlet}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>${version.ant}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>${version.cargo}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ <version>${version.ant}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-launcher</artifactId>
+ <version>${version.ant}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${version.jboss.microcontainer}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+</project>
Modified: modules/common/trunk/common/pom.xml
===================================================================
--- modules/common/trunk/common/pom.xml 2008-01-04 00:06:14 UTC (rev 9432)
+++ modules/common/trunk/common/pom.xml 2008-01-04 00:42:37 UTC (rev 9433)
@@ -2,8 +2,9 @@
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>jboss-portal-modules-common-root</artifactId>
+ <artifactId>jboss-portal-modules-common-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-portal-modules-common</artifactId>
@@ -15,97 +16,81 @@
<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>
@@ -131,22 +116,6 @@
<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
@@ -175,37 +144,5 @@
</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>
\ No newline at end of file
Modified: modules/common/trunk/mc/pom.xml
===================================================================
--- modules/common/trunk/mc/pom.xml 2008-01-04 00:06:14 UTC (rev 9432)
+++ modules/common/trunk/mc/pom.xml 2008-01-04 00:42:37 UTC (rev 9433)
@@ -2,8 +2,9 @@
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>jboss-portal-modules-common-root</artifactId>
+ <artifactId>jboss-portal-modules-common-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-portal-modules-common-mc</artifactId>
@@ -15,29 +16,22 @@
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>2.0.0.Beta4</version>
</dependency>
<dependency>
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
</dependency>
</dependencies>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- </plugins>
+
</build>
Modified: modules/common/trunk/pom.xml
===================================================================
--- modules/common/trunk/pom.xml 2008-01-04 00:06:14 UTC (rev 9432)
+++ modules/common/trunk/pom.xml 2008-01-04 00:42:37 UTC (rev 9433)
@@ -2,125 +2,11 @@
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.portal.common</groupId>
- <artifactId>jboss-portal-modules-common-root</artifactId>
+ <artifactId>jboss-portal-modules-common-aggregator</artifactId>
<packaging>pom</packaging>
- <name>JBoss Portal Modules Common</name>
+ <name>JBoss Portal Modules Common (aggregator)</name>
<version>1.1.0-SNAPSHOT</version>
- <url>http://labs.jboss.com/jbossportal</url>
- <dependencies/>
-
- <repositories>
- <repository>
- <id>repository.maven.org</id>
- <name>Maven Repository</name>
- <layout>default</layout>
- <url>http://repo1.maven.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- <version>1.0-beta-2</version>
- </extension>
- </extensions>
- <plugins>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-deploy-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <goals>
- <goal>jboss-deploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>true</optimize>
- </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>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-packaging-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
<distributionManagement>
<repository>
<!--Copy the distribution jar file to a local checkout of the maven repository
@@ -137,71 +23,13 @@
</distributionManagement>
<modules>
+ <module>build</module>
<module>common</module>
<module>mc</module>
<module>portal</module>
</modules>
- <issueManagement>
- <system>JIRA</system>
- <url>http://jira.jboss.com/jira/browse/JBPORTAL</url>
- </issueManagement>
- <ciManagement>
- <system>cruisecontrol</system>
- </ciManagement>
- <licenses>
- <license>
- <name>LGPL 2.1</name>
- <url>http://www.gnu.org/licenses/lgpl.html</url>
- <distribution>repo</distribution>
- <comments>
- GNU LESSER GENERAL PUBLIC LICENSE Version 2.1
- </comments>
- </license>
- </licenses>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/portal/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/portal/trunk</developerConnection>
- <url>https://svn.jboss.org/repos/portal/trunk</url>
- </scm>
- <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>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </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/trunk/portal/pom.xml
===================================================================
--- modules/common/trunk/portal/pom.xml 2008-01-04 00:06:14 UTC (rev 9432)
+++ modules/common/trunk/portal/pom.xml 2008-01-04 00:42:37 UTC (rev 9433)
@@ -2,8 +2,9 @@
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>jboss-portal-modules-common-root</artifactId>
+ <artifactId>jboss-portal-modules-common-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jboss-portal-modules-common-portal</artifactId>
@@ -12,14 +13,6 @@
<dependencies/>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
<properties>
</properties>
18 years, 3 months
JBoss Portal SVN: r9432 - in modules/portlet/trunk: test and 1 other directories.
by portal-commits@lists.jboss.org
Author: bdaw
Date: 2008-01-03 19:06:14 -0500 (Thu, 03 Jan 2008)
New Revision: 9432
Modified:
modules/portlet/trunk/build/pom.xml
modules/portlet/trunk/test/pom.xml
modules/portlet/trunk/test/src/test/build.xml
Log:
switch to use jboss-portal-parent pom and correct antrun issues
Modified: modules/portlet/trunk/build/pom.xml
===================================================================
--- modules/portlet/trunk/build/pom.xml 2008-01-04 00:05:59 UTC (rev 9431)
+++ modules/portlet/trunk/build/pom.xml 2008-01-04 00:06:14 UTC (rev 9432)
@@ -11,9 +11,9 @@
<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</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>3</version>
+ <groupId>org.jboss.portal</groupId>
+ <artifactId>jboss-portal-parent</artifactId>
+ <version>1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.portlet</groupId>
@@ -23,32 +23,7 @@
<name>JBoss Portal Portlet Module</name>
<url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Portal Portlet Module</description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/portal/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/portal/trunk</developerConnection>
- <url>https://svn.jboss.org/repos/portal/trunk</url>
- </scm>
- <licenses>
- <license>
- <name>LGPL 2.1</name>
- <url>http://www.gnu.org/licenses/lgpl.html</url>
- <distribution>repo</distribution>
- <comments>
- GNU LESSER GENERAL PUBLIC LICENSE Version 2.1
- </comments>
- </license>
- </licenses>
-
- <issueManagement>
- <system>JIRA</system>
- <url>http://jira.jboss.com/jira/browse/JBPORTAL</url>
- </issueManagement>
- <ciManagement>
- <system>cruisecontrol</system>
- </ciManagement>
-
-
<properties>
<version.apache.portals.bridges>1.0.3</version.apache.portals.bridges>
<version.activation>1.0.2</version.activation>
@@ -79,41 +54,8 @@
<build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- <version>1.0-beta-2</version>
- </extension>
- </extensions>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-deploy-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <goals>
- <goal>jboss-deploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3.1</version>
@@ -125,156 +67,28 @@
<pluginManagement>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-tooling-maven2</artifactId>
<version>1.1.0-SNAPSHOT</version>
</plugin>
- <plugin>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
</plugins>
</pluginManagement>
</build>
-
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>repository.maven.org</id>
- <name>Maven Repository</name>
- <layout>default</layout>
- <url>http://repo1.maven.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
<pluginRepositories>
<pluginRepository>
- <id>repository.maven.org</id>
- <name>Maven Repository</name>
- <layout>default</layout>
- <url>http://repo1.maven.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
+ <id>apache.org</id>
+ <name>Maven Plugin Snapshots</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
<releases>
<enabled>false</enabled>
</releases>
- </pluginRepository>
- <pluginRepository>
- <id>Codehaus Snapshots</id>
- <url>http://snapshots.repository.codehaus.org/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
- <pluginRepository>
- <id>java.net maven repository</id>
- <url>http://download.java.net/maven/2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>m2-snapshot-repository</id>
- <name>Maven snapshot repository</name>
- <layout>default</layout>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
</pluginRepositories>
-
- <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>
-
-
<dependencyManagement>
<!-- The parent pom manages the inter-dependencies of the modules. -->
<dependencies>
Modified: modules/portlet/trunk/test/pom.xml
===================================================================
--- modules/portlet/trunk/test/pom.xml 2008-01-04 00:05:59 UTC (rev 9431)
+++ modules/portlet/trunk/test/pom.xml 2008-01-04 00:06:14 UTC (rev 9432)
@@ -245,32 +245,16 @@
</dependency>
</dependencies>
- <properties>
- <simple.property>simple_value</simple.property>
- </properties>
-
<build>
-
<plugins>
<plugin>
- <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
+ <groupId>org.jboss.unit</groupId>
<artifactId>maven-antrun-extended-plugin</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.10-SNAPSHOT</version>
<dependencies>
- <!--Nessesary to force antrun plugin to support ant 1.7.0 features...-->
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>${version.ant}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>${version.ant}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-tooling-ant</artifactId>
<version>${version.jboss.unit}</version>
Modified: modules/portlet/trunk/test/src/test/build.xml
===================================================================
--- modules/portlet/trunk/test/src/test/build.xml 2008-01-04 00:05:59 UTC (rev 9431)
+++ modules/portlet/trunk/test/src/test/build.xml 2008-01-04 00:06:14 UTC (rev 9432)
@@ -32,7 +32,6 @@
<mkdir dir="${test.temp.lib}"/>
<mkdir dir="${test.temp.portlet}"/>
<mkdir dir="${target}/jboss-unit"/>
-
</target>
<!--Lets make the check in one place so the build fail in the beggining instead of end-->
@@ -400,7 +399,6 @@
</taskdef>
</target>
-
<target name="cargo.jboss-4.2.start" depends="cargo.setup">
<!-- The lib portal-test-lib.jar must be loaded at the shared level rather than in the war file
otherwise it is somehow inspected and produce a NoClassDefFoundError in the web service integration
@@ -417,6 +415,7 @@
output="${cargo.log.dir}/cargo.${test.id}.server.log"
action="start"
wait="${cargo.wait}">
+ <!--<sysproperty key="java.io.tmpdir" value="${target}/cargo-tmp"/>-->
<sharedClasspath>
<path location="${dependency.portal-common.jar}"/>
<path location="${dependency.portal-common-portal.jar}"/>
@@ -431,7 +430,7 @@
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
<deployable type="war" file="${test.temp.lib}/jboss-4.2/portlet-test.war"/>
- </configuration>
+ </configuration>
</cargo>
</target>
@@ -441,6 +440,7 @@
home="${test.jboss-4.2.home}"
log="${cargo.log.dir}/cargo.${test.id}.startup.log"
action="stop">
+ <!--<sysproperty key="java.io.tmpdir" value="${target}/cargo-tmp"/>-->
<configuration>
<property name="cargo.rmi.port" value="1099"/>
</configuration>
18 years, 3 months
JBoss Portal SVN: r9431 - in modules/web/trunk: web and 1 other directories.
by portal-commits@lists.jboss.org
Author: bdaw
Date: 2008-01-03 19:05:59 -0500 (Thu, 03 Jan 2008)
New Revision: 9431
Modified:
modules/web/trunk/build/pom.xml
modules/web/trunk/web/pom.xml
modules/web/trunk/web/src/test/build.xml
Log:
switch to use jboss-portal-parent pom and correct antrun issues
Modified: modules/web/trunk/build/pom.xml
===================================================================
--- modules/web/trunk/build/pom.xml 2008-01-04 00:03:07 UTC (rev 9430)
+++ modules/web/trunk/build/pom.xml 2008-01-04 00:05:59 UTC (rev 9431)
@@ -11,9 +11,9 @@
<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</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>3</version>
+ <groupId>org.jboss.portal</groupId>
+ <artifactId>jboss-portal-parent</artifactId>
+ <version>1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.web</groupId>
@@ -23,32 +23,7 @@
<name>JBoss Portal Test Module</name>
<url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Portal Web Module</description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/portal/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/portal/trunk</developerConnection>
- <url>https://svn.jboss.org/repos/portal/trunk</url>
- </scm>
- <licenses>
- <license>
- <name>LGPL 2.1</name>
- <url>http://www.gnu.org/licenses/lgpl.html</url>
- <distribution>repo</distribution>
- <comments>
- GNU LESSER GENERAL PUBLIC LICENSE Version 2.1
- </comments>
- </license>
- </licenses>
-
- <issueManagement>
- <system>JIRA</system>
- <url>http://jira.jboss.com/jira/browse/JBPORTAL</url>
- </issueManagement>
- <ciManagement>
- <system>cruisecontrol</system>
- </ciManagement>
-
-
<properties>
<version.activation>1.0.2</version.activation>
<version.concurrent>1.3.4</version.concurrent>
@@ -56,8 +31,8 @@
<version.apache.tomcat>5.5.12</version.apache.tomcat>
<version.jboss-common-core>2.2.1.GA</version.jboss-common-core>
<version.jboss-logging>2.0.3.GA</version.jboss-logging>
- <version.jboss-vfs>2.0.4.snapshot</version.jboss-vfs>
- <version.jboss.aop>2.0.0.alpha6</version.jboss.aop>
+ <version.jboss-vfs>2.0.0.Beta6</version.jboss-vfs>
+ <version.jboss.aop>2.0.0.CR1</version.jboss.aop>
<version.jbossxb>2.0.0.CR3</version.jbossxb>
<version.javassist>3.6-beta</version.javassist>
<version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
@@ -75,193 +50,12 @@
</properties>
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- <version>1.0-beta-2</version>
- </extension>
- </extensions>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-deploy-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <goals>
- <goal>jboss-deploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>repository.maven.org</id>
- <name>Maven Repository</name>
- <layout>default</layout>
- <url>http://repo1.maven.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>repository.maven.org</id>
- <name>Maven Repository</name>
- <layout>default</layout>
- <url>http://repo1.maven.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
- <id>Codehaus Snapshots</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>java.net maven repository</id>
- <url>http://download.java.net/maven/2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
-
- <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>
-
-
+ <pluginRepositories/>
+
<dependencyManagement>
<!-- The parent pom manages the inter-dependencies of the modules. -->
<dependencies>
-
<dependency>
<artifactId>junit</artifactId>
<groupId>junit</groupId>
@@ -359,7 +153,7 @@
<version>${version.jboss-remoting}</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
<version>${version.jboss-vfs}</version>
</dependency>
@@ -444,41 +238,46 @@
<version>${version.jboss.microcontainer}</version>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-aop-as4-deployer</artifactId>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
<version>${version.jboss.aop}</version>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jboss-aop-as4-deployer</artifactId>-->
+ <!--<version>${version.jboss.aop}</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jboss-aop-deployer-jdk50</artifactId>-->
+ <!--<version>${version.jboss.aop}</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jboss-aop-jdk50</artifactId>-->
+ <!--<version>${version.jboss.aop}</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jboss-aop-jdk50-client</artifactId>-->
+ <!--<version>${version.jboss.aop}</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jboss-standalone-aspect-library-jdk50</artifactId>-->
+ <!--<version>${version.jboss.aop}</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jrockit-pluggable-instrumentor</artifactId>-->
+ <!--<version>${version.jboss.aop}</version>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>pluggable-instrumentor</artifactId>-->
+ <!--<version>${version.jboss.aop}</version>-->
+ <!--</dependency>-->
<dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-aop-deployer-jdk50</artifactId>
- <version>${version.jboss.aop}</version>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-aop-jdk50</artifactId>
- <version>${version.jboss.aop}</version>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-aop-jdk50-client</artifactId>
- <version>${version.jboss.aop}</version>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-standalone-aspect-library-jdk50</artifactId>
- <version>${version.jboss.aop}</version>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jrockit-pluggable-instrumentor</artifactId>
- <version>${version.jboss.aop}</version>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>pluggable-instrumentor</artifactId>
- <version>${version.jboss.aop}</version>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${version.apache.commons-logging}</version>
@@ -494,6 +293,11 @@
<type>war</type>
<version>${version.cargo}</version>
</dependency>
+ <dependency>
+ <groupId>cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>${version.cargo}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: modules/web/trunk/web/pom.xml
===================================================================
--- modules/web/trunk/web/pom.xml 2008-01-04 00:03:07 UTC (rev 9430)
+++ modules/web/trunk/web/pom.xml 2008-01-04 00:05:59 UTC (rev 9431)
@@ -108,7 +108,7 @@
<artifactId>jboss-remoting</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
<scope>test</scope>
</dependency>
@@ -193,41 +193,46 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-aop-as4-deployer</artifactId>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
<scope>test</scope>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jboss-aop-as4-deployer</artifactId>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jboss-aop-deployer-jdk50</artifactId>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jboss-aop-jdk50</artifactId>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jboss-aop-jdk50-client</artifactId>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jboss-standalone-aspect-library-jdk50</artifactId>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>jrockit-pluggable-instrumentor</artifactId>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>jboss.aop</groupId>-->
+ <!--<artifactId>pluggable-instrumentor</artifactId>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
<dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-aop-deployer-jdk50</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-aop-jdk50</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-aop-jdk50-client</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-standalone-aspect-library-jdk50</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jrockit-pluggable-instrumentor</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>pluggable-instrumentor</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>test</scope>
@@ -243,35 +248,33 @@
<type>war</type>
<scope>test</scope>
</dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.jboss.unit</groupId>-->
+ <!--<artifactId>jboss-unit-tooling-ant</artifactId>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
+ <!--<dependency>-->
+ <!--<groupId>cargo</groupId>-->
+ <!--<artifactId>cargo-core-uberjar</artifactId>-->
+ <!--<scope>test</scope>-->
+ <!--</dependency>-->
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
+ <groupId>org.jboss.unit</groupId>
<artifactId>maven-antrun-extended-plugin</artifactId>
- <version>1.9-SNAPSHOT</version>
+ <version>1.10-SNAPSHOT</version>
<dependencies>
-
- <!--Nessesary to force antrun plugin to support ant 1.7.0 features...-->
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant-launcher</artifactId>
- <version>${version.ant}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>${version.ant}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-tooling-ant</artifactId>
<version>${version.jboss.unit}</version>
</dependency>
- <!-- stuff to run servers for tests -->
+ <!--stuff to run servers for tests-->
<dependency>
<groupId>cargo</groupId>
<artifactId>cargo-ant</artifactId>
@@ -304,7 +307,7 @@
<property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-logging-spi.jar.path}"/>
<property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-logging-jdk.jar.path}"/>
<property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-vfs.jar" value="${maven.dependency.jboss.jboss-vfs.jar.path}"/>
+ <property name="dependency.jboss-vfs.jar" value="${maven.dependency.org.jboss.jboss-vfs.jar.path}"/>
<property name="dependency.jboss-aop-mc-int.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-aop-mc-int.jar.path}"/>
<property name="dependency.jboss-classloader.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-classloader.jar.path}"/>
<property name="dependency.jboss-container.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-container.jar.path}"/>
@@ -321,13 +324,14 @@
<property name="dependency.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
<property name="dependency.jboss-managed.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-managed.jar.path}"/>
<property name="dependency.jboss-metatype.jar" value="${maven.dependency.org.jboss.microcontainer.jboss.metatype.jar.path}"/>
- <property name="dependency.jboss-aop-as4-deployer.jar" value="${maven.dependency.jboss.aop.jboss-aop-as4-deployer.jar.path}"/>
- <property name="dependency.jboss-aop-deployer-jdk50.jar" value="${maven.dependency.jboss.aop.jboss-aop-deployer-jdk50.jar.path}"/>
- <property name="dependency.jboss-aop-jdk50.jar" value="${maven.dependency.jboss.aop.jboss-aop-jdk50.jar.path}"/>
- <property name="dependency.jboss-aop-jdk50-client.jar" value="${maven.dependency.jboss.aop.jboss-aop-jdk50-client.jar.path}"/>
- <property name="dependency.jboss-standalone-aspect-library-jdk50.jar" value="${maven.dependency.jboss.aop.jboss-standalone-aspect-library-jdk50.jar.path}"/>
- <property name="dependency.jrockit-pluggable-instrumentor.jar" value="${maven.dependency.jboss.aop.jrockit-pluggable-instrumentor.jar.path}"/>
- <property name="dependency.pluggable-instrumentor.jar" value="${maven.dependency.jboss.aop.pluggable-instrumentor.jar.path}"/>
+ <property name="dependency.jboss-aop.jar" value="${maven.dependency.org.jboss.aop.jboss-aop.jar.path}"/>
+ <!--<property name="dependency.jboss-aop-as4-deployer.jar" value="${maven.dependency.jboss.aop.jboss-aop-as4-deployer.jar.path}"/>-->
+ <!--<property name="dependency.jboss-aop-deployer-jdk50.jar" value="${maven.dependency.jboss.aop.jboss-aop-deployer-jdk50.jar.path}"/>-->
+ <!--<property name="dependency.jboss-aop-jdk50.jar" value="${maven.dependency.jboss.aop.jboss-aop-jdk50.jar.path}"/>-->
+ <!--<property name="dependency.jboss-aop-jdk50-client.jar" value="${maven.dependency.jboss.aop.jboss-aop-jdk50-client.jar.path}"/>-->
+ <!--<property name="dependency.jboss-standalone-aspect-library-jdk50.jar" value="${maven.dependency.jboss.aop.jboss-standalone-aspect-library-jdk50.jar.path}"/>-->
+ <!--<property name="dependency.jrockit-pluggable-instrumentor.jar" value="${maven.dependency.jboss.aop.jrockit-pluggable-instrumentor.jar.path}"/>-->
+ <!--<property name="dependency.pluggable-instrumentor.jar" value="${maven.dependency.jboss.aop.pluggable-instrumentor.jar.path}"/>-->
<property name="dependency.javassist.jar" value="${maven.dependency.org.jboss.javassist.jar.path}"/>
<property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
<property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
Modified: modules/web/trunk/web/src/test/build.xml
===================================================================
--- modules/web/trunk/web/src/test/build.xml 2008-01-04 00:03:07 UTC (rev 9430)
+++ modules/web/trunk/web/src/test/build.xml 2008-01-04 00:05:59 UTC (rev 9431)
@@ -128,13 +128,14 @@
<pathelement path="${dependency.jbossxb.jar}"/>
</path>
<path id="mc.jboss_aop">
- <pathelement path="${dependency.jboss-aop-as4-deployer.jar}"/>
- <pathelement path="${dependency.jboss-aop-deployer-jdk50.jar}"/>
- <pathelement path="${dependency.jboss-aop-jdk50.jar}"/>
- <pathelement path="${dependency.jboss-aop-jdk50-client.jar}"/>
- <pathelement path="${dependency.jboss-standalone-aspect-library-jdk50.jar}"/>
- <pathelement path="${dependency.jrockit-pluggable-instrumentor.jar}"/>
- <pathelement path="${dependency.pluggable-instrumentor.jar}"/>
+ <pathelement path="${dependency.jboss-aop.jar}"/>
+ <!--<pathelement path="${dependency.jboss-aop-as4-deployer.jar}"/>-->
+ <!--<pathelement path="${dependency.jboss-aop-deployer-jdk50.jar}"/>-->
+ <!--<pathelement path="${dependency.jboss-aop-jdk50.jar}"/>-->
+ <!--<pathelement path="${dependency.jboss-aop-jdk50-client.jar}"/>-->
+ <!--<pathelement path="${dependency.jboss-standalone-aspect-library-jdk50.jar}"/>-->
+ <!--<pathelement path="${dependency.jrockit-pluggable-instrumentor.jar}"/>-->
+ <!--<pathelement path="${dependency.pluggable-instrumentor.jar}"/>-->
</path>
<path id="mc.jboss_microcontainer">
<pathelement path="${dependency.jboss-aop-mc-int.jar}"/>
@@ -623,6 +624,7 @@
<taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/>
+
<jboss-unit>
<tests config="${target}/test-classes/remote-jboss-unit.xml">
18 years, 3 months
JBoss Portal SVN: r9430 - modules/identity/trunk/build.
by portal-commits@lists.jboss.org
Author: bdaw
Date: 2008-01-03 19:03:07 -0500 (Thu, 03 Jan 2008)
New Revision: 9430
Modified:
modules/identity/trunk/build/pom.xml
Log:
switch to use jboss-portal-parent pom
Modified: modules/identity/trunk/build/pom.xml
===================================================================
--- modules/identity/trunk/build/pom.xml 2008-01-04 00:01:42 UTC (rev 9429)
+++ modules/identity/trunk/build/pom.xml 2008-01-04 00:03:07 UTC (rev 9430)
@@ -11,9 +11,9 @@
<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</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>3</version>
+ <groupId>org.jboss.portal</groupId>
+ <artifactId>jboss-portal-parent</artifactId>
+ <version>1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.identity</groupId>
@@ -23,32 +23,7 @@
<name>JBoss Portal Identity</name>
<url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Portal Identity Module</description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/portal/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/portal/trunk</developerConnection>
- <url>https://svn.jboss.org/repos/portal/trunk</url>
- </scm>
- <licenses>
- <license>
- <name>LGPL 2.1</name>
- <url>http://www.gnu.org/licenses/lgpl.html</url>
- <distribution>repo</distribution>
- <comments>
- GNU LESSER GENERAL PUBLIC LICENSE Version 2.1
- </comments>
- </license>
- </licenses>
-
- <issueManagement>
- <system>JIRA</system>
- <url>http://jira.jboss.com/jira/browse/JBPORTAL</url>
- </issueManagement>
- <ciManagement>
- <system>cruisecontrol</system>
- </ciManagement>
-
-
<properties>
<version.junit>3.8.1</version.junit>
<version.cargo>0.9-portal</version.cargo>
@@ -80,41 +55,9 @@
<build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- <version>1.0-beta-2</version>
- </extension>
- </extensions>
+
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-deploy-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <goals>
- <goal>jboss-deploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3.1</version>
@@ -123,140 +66,33 @@
</configuration>
</plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
</build>
<repositories>
- <repository>
- <id>repository.maven.org</id>
- <name>Maven Repository</name>
- <layout>default</layout>
- <url>http://repo1.maven.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- <repository>
- <id>repository.codehaus.org</id>
- <name>Codehaus Repository</name>
- <layout>default</layout>
- <url>http://repository.codehaus.org</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
+ <!--<repository>-->
+ <!--<id>repository.codehaus.org</id>-->
+ <!--<name>Codehaus Repository</name>-->
+ <!--<layout>default</layout>-->
+ <!--<url>http://repository.codehaus.org</url>-->
+ <!--<snapshots>-->
+ <!--<enabled>false</enabled>-->
+ <!--</snapshots>-->
+ <!--</repository>-->
+
</repositories>
<pluginRepositories>
<pluginRepository>
- <id>repository.maven.org</id>
- <name>Maven Repository</name>
- <layout>default</layout>
- <url>http://repo1.maven.org/maven2/</url>
+ <id>java.net maven repository</id>
+ <url>http://download.java.net/maven/2/</url>
<snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
<enabled>true</enabled>
</snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
</pluginRepository>
</pluginRepositories>
- <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>
-
<dependencyManagement>
<!-- The parent pom manages the inter-dependencies of the modules. -->
<dependencies>
18 years, 3 months
JBoss Portal SVN: r9429 - in modules/test/trunk: build and 1 other directory.
by portal-commits@lists.jboss.org
Author: bdaw
Date: 2008-01-03 19:01:42 -0500 (Thu, 03 Jan 2008)
New Revision: 9429
Modified:
modules/test/trunk/build/pom.xml
modules/test/trunk/pom.xml
Log:
switch to use jboss-portal-parent pom
Modified: modules/test/trunk/build/pom.xml
===================================================================
--- modules/test/trunk/build/pom.xml 2008-01-04 00:00:59 UTC (rev 9428)
+++ modules/test/trunk/build/pom.xml 2008-01-04 00:01:42 UTC (rev 9429)
@@ -9,46 +9,21 @@
the property
-->
<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</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>3</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.unit</groupId>
- <artifactId>jboss-portal-modules-test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>JBoss Portal Test Module</name>
- <url>http://www.jboss.com/products/jbossmc</url>
- <description>JBoss Portal Test Module</description>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/portal/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/portal/trunk</developerConnection>
- <url>https://svn.jboss.org/repos/portal/trunk</url>
- </scm>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.portal</groupId>
+ <artifactId>jboss-portal-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.unit</groupId>
+ <artifactId>jboss-portal-modules-test</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>JBoss Portal Test Module</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
+ <description>JBoss Portal Test Module</description>
- <licenses>
- <license>
- <name>LGPL 2.1</name>
- <url>http://www.gnu.org/licenses/lgpl.html</url>
- <distribution>repo</distribution>
- <comments>
- GNU LESSER GENERAL PUBLIC LICENSE Version 2.1
- </comments>
- </license>
- </licenses>
-
- <issueManagement>
- <system>JIRA</system>
- <url>http://jira.jboss.com/jira/browse/JBPORTAL</url>
- </issueManagement>
- <ciManagement>
- <system>cruisecontrol</system>
- </ciManagement>
-
-
<properties>
<version.portal.common>1.1.0-SNAPSHOT</version.portal.common>
<version.jboss.microcontainer>2.0.0.Beta4</version.jboss.microcontainer>
@@ -70,32 +45,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-deploy-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <goals>
- <goal>jboss-deploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3.1</version>
@@ -103,144 +52,27 @@
<skip>true</skip>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
- </plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
+
+ <pluginManagement/>
+
+
</build>
- <repositories>
- <repository>
- <id>repository.maven.org</id>
- <name>Maven Repository</name>
- <layout>default</layout>
- <url>http://repo1.maven.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
+ <repositories/>
+
<pluginRepositories>
<pluginRepository>
- <id>repository.maven.org</id>
- <name>Maven Repository</name>
- <layout>default</layout>
- <url>http://repo1.maven.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
<id>Codehaus Snapshots</id>
<url>http://snapshots.repository.codehaus.org/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
+
</pluginRepositories>
-
- <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>
-
-
<dependencyManagement>
<!-- The parent pom manages the inter-dependencies of the modules. -->
<dependencies>
Modified: modules/test/trunk/pom.xml
===================================================================
--- modules/test/trunk/pom.xml 2008-01-04 00:00:59 UTC (rev 9428)
+++ modules/test/trunk/pom.xml 2008-01-04 00:01:42 UTC (rev 9429)
@@ -12,10 +12,10 @@
<distributionManagement>
<repository>
- <!--Copy the distribution jar file to a local checkout of the maven repository-->
- <!--- This variable can be set in $MAVEN_HOME/conf/settings.xml-->
- <id>repository.jboss.org</id>
- <url>file://${jboss.repository.root}</url>
+ <!--Copy the distribution jar file to a local checkout of the maven repository-->
+ <!--- This variable can be set in $MAVEN_HOME/conf/settings.xml-->
+ <id>repository.jboss.org</id>
+ <url>file://${jboss.repository.root}</url>
</repository>
<snapshotRepository>
<id>snapshots.jboss.org</id>
18 years, 3 months
JBoss Portal SVN: r9428 - in maven: jboss-portal-parent and 1 other directories.
by portal-commits@lists.jboss.org
Author: bdaw
Date: 2008-01-03 19:00:59 -0500 (Thu, 03 Jan 2008)
New Revision: 9428
Added:
maven/jboss-portal-parent/
maven/jboss-portal-parent/branches/
maven/jboss-portal-parent/trunk/
maven/jboss-portal-parent/trunk/pom.xml
Removed:
maven/pom.xml
Log:
jboss-portal-parent pom
Copied: maven/jboss-portal-parent/trunk/pom.xml (from rev 9426, maven/pom.xml)
===================================================================
--- maven/jboss-portal-parent/trunk/pom.xml (rev 0)
+++ maven/jboss-portal-parent/trunk/pom.xml 2008-01-04 00:00:59 UTC (rev 9428)
@@ -0,0 +1,294 @@
+<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</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>3</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.portal</groupId>
+ <artifactId>jboss-portal-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>JBoss Portal Parent POM</name>
+ <version>1-SNAPSHOT</version>
+
+
+ <url>http://labs.jboss.com/jbossportal</url>
+
+ <repositories>
+ <repository>
+ <id>repository.maven.org</id>
+ <name>Maven Repository</name>
+ <layout>default</layout>
+ <url>http://repo1.maven.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>repository.maven.org</id>
+ <name>Maven Repository</name>
+ <layout>default</layout>
+ <url>http://repo1.maven.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav</artifactId>
+ <version>1.0-beta-2</version>
+ </extension>
+ </extensions>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jboss-deploy-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jboss-deploy</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
+ </configuration>
+ </plugin>
+
+
+
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3.1</version>
+ <!--<configuration>-->
+ <!--<skip>true</skip>-->
+ <!--</configuration>-->
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-packaging-maven-plugin</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-idea-plugin</artifactId>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+
+
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-1</version>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <!--<distributionManagement>-->
+ <!--<repository>-->
+ <!--Copy the distribution jar file to a local checkout of the maven repository-->
+ <!--- This variable can be set in $MAVEN_HOME/conf/settings.xml-->
+ <!--<id>repository.jboss.org</id>-->
+ <!--<url>file://${jboss.repository.root}</url>-->
+ <!--</repository>-->
+ <!--<snapshotRepository>-->
+ <!--<id>snapshots.jboss.org</id>-->
+ <!--<name>JBoss Snapshot Repository</name>-->
+ <!--<url>dav:https://snapshots.jboss.org/maven2</url>-->
+ <!--<uniqueVersion>true</uniqueVersion>-->
+ <!--</snapshotRepository>-->
+ <!--</distributionManagement>-->
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://jira.jboss.com/jira/browse/JBPORTAL</url>
+ </issueManagement>
+ <ciManagement>
+ <system>cruisecontrol</system>
+ </ciManagement>
+ <developers>
+ <developer>
+ <id>jviet</id>
+ <name>Julien Viet</name>
+ <email>jviet(a)redhat.com</email>
+ <organization>JBoss a division of Red Hat</organization>
+ <organizationUrl>http://www.jboss.org</organizationUrl>
+ <roles>
+ <role>lead</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>whales</id>
+ <name>Wesley Hales</name>
+ <email>whales(a)redhat.com</email>
+ <organization>JBoss a division of Red Hat</organization>
+ <organizationUrl>http://www.jboss.org</organizationUrl>
+ <roles>
+ <role>ui</role>
+ <role>developer</role>
+ </roles>
+ <timezone>-4</timezone>
+ </developer>
+ <!--TODO: Add rest of team-->
+ <!--developer>
+ <id></id>
+ <name></name>
+ <email></email>
+ <organization>JBoss a division of Red Hat</organization>
+ <organizationUrl>http://www.jboss.org</organizationUrl>
+ <roles>
+ <role></role>
+ </roles>
+ <timezone></timezone>
+ </developer-->
+ </developers>
+ <licenses>
+ <license>
+ <name>LGPL 2.1</name>
+ <url>http://www.gnu.org/licenses/lgpl.html</url>
+ <distribution>repo</distribution>
+ <comments>
+ GNU LESSER GENERAL PUBLIC LICENSE Version 2.1
+ </comments>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/portal/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/portal/</developerConnection>
+ <url>https://svn.jboss.org/repos/portal/</url>
+ </scm>
+
+ <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: maven/pom.xml
===================================================================
--- maven/pom.xml 2008-01-03 16:49:45 UTC (rev 9427)
+++ maven/pom.xml 2008-01-04 00:00:59 UTC (rev 9428)
@@ -1,225 +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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.portal</groupId>
- <artifactId>jboss-portal</artifactId>
- <packaging>pom</packaging>
- <name>JBoss Portal</name>
- <version>1.1.0-SNAPSHOT</version>
- <url>http://labs.jboss.com/jbossportal</url>
-
- <dependencies/>
-
- <repositories>
- <repository>
- <id>repository.maven.org</id>
- <name>Maven Repository</name>
- <layout>default</layout>
- <url>http://repo1.maven.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- <version>1.0-beta-2</version>
- </extension>
- </extensions>
- <pluginManagement>
- <plugins>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>true</optimize>
- </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>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-packaging-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- <extensions>true</extensions>
- </plugin>
- <plugin>
- <artifactId>maven-idea-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jboss-deploy-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <goals>
- <goal>jboss-deploy</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <distributionManagement>
- <!--<repository>-->
- <!--Copy the distribution jar file to a local checkout of the maven repository
- - This variable can be set in $MAVEN_HOME/conf/settings.xml-->
- <!--<id>repository.jboss.org</id>-->
- <!--<url>file://${jboss.repository.root}</url>-->
- <!--</repository>-->
- <snapshotRepository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshot Repository</name>
- <url>dav:https://snapshots.jboss.org/maven2</url>
- <uniqueVersion>true</uniqueVersion>
- </snapshotRepository>
- </distributionManagement>
-
-
- <modules>
- <module>../modules/common/trunk</module>
- </modules>
-
-
- <issueManagement>
- <system>JIRA</system>
- <url>http://jira.jboss.com/jira/browse/JBPORTAL</url>
- </issueManagement>
- <ciManagement>
- <system>cruisecontrol</system>
- </ciManagement>
- <developers>
- <developer>
- <id>jviet</id>
- <name>Julien Viet</name>
- <email>jviet(a)redhat.com</email>
- <organization>JBoss a division of Red Hat</organization>
- <organizationUrl>http://www.jboss.org</organizationUrl>
- <roles>
- <role>lead</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>whales</id>
- <name>Wesley Hales</name>
- <email>whales(a)redhat.com</email>
- <organization>JBoss a division of Red Hat</organization>
- <organizationUrl>http://www.jboss.org</organizationUrl>
- <roles>
- <role>ui</role>
- <role>developer</role>
- </roles>
- <timezone>-4</timezone>
- </developer>
- <!--TODO: Add rest of team-->
- <!--developer>
- <id></id>
- <name></name>
- <email></email>
- <organization>JBoss a division of Red Hat</organization>
- <organizationUrl>http://www.jboss.org</organizationUrl>
- <roles>
- <role></role>
- </roles>
- <timezone></timezone>
- </developer-->
- </developers>
- <licenses>
- <license>
- <name>LGPL 2.1</name>
- <url>http://www.gnu.org/licenses/lgpl.html</url>
- <distribution>repo</distribution>
- <comments>
- GNU LESSER GENERAL PUBLIC LICENSE Version 2.1
- </comments>
- </license>
- </licenses>
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/portal/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/portal/trunk</developerConnection>
- <url>https://svn.jboss.org/repos/portal/trunk</url>
- </scm>
-
- <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>
18 years, 3 months