Author: mwringe Date: 2009-02-08 23:01:50 -0500 (Sun, 08 Feb 2009) New Revision: 12797 Modified: modules/deployer/trunk/pom.xml Log: Fix accidental overwrite that happened with the last commit. Modified: modules/deployer/trunk/pom.xml =================================================================== --- modules/deployer/trunk/pom.xml 2009-02-09 03:49:06 UTC (rev 12796) +++ modules/deployer/trunk/pom.xml 2009-02-09 04:01:50 UTC (rev 12797) @@ -1,159 +1,41 @@ <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.deployer</groupId> - <artifactId>module-parent</artifactId> + <artifactId>module-aggregator</artifactId> <packaging>pom</packaging> <name>JBoss Portal Deployer</name> <version>trunk-SNAPSHOT</version> - <url>http://labs.jboss.com/jbossportal</url> - <properties> - <version.assembly>2.2-beta-2</version.assembly> - <version.jboss.aop>1.0.0.GA</version.jboss.aop> - <version.jboss.aspects>1.0.0.GA</version.jboss.aspects> - <version.jboss-deployers>2.2.0-SNAPSHOT</version.jboss-deployers> - <version.jboss-metadata>1.0.0.CR1</version.jboss-metadata> - <version.jboss.portal>2.8-SNAPSHOT</version.jboss.portal> - <version.jboss.portal.metadata>trunk-SNAPSHOT</version.jboss.portal.metadata> - <version.jboss.portal.web>1.2.0-SNAPSHOT</version.jboss.portal.web> - <version.jboss.portal.portlet>2.1.0-SNAPSHOT</version.jboss.portal.portlet> - <version.jboss.portal.server>2.7.0.GA</version.jboss.portal.server> - <version.jboss.portlet.server>2.7.0</version.jboss.portlet.server> - <version.jboss-as>5.0.0.CR2</version.jboss-as> - <version.saxon>6.5.3</version.saxon> - </properties> - - <repositories> + <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> - <name>JBoss Repository</name> - <layout>default</layout> - <url>http://repository.jboss.org/maven2/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> + <url>file://${jboss.repository.root}</url> </repository> - <repository> + <snapshotRepository> <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>maven.jboss.org</id> - <name>JBoss Maven Repository</name> - <url>http://repository.jboss.com/maven2</url> - </pluginRepository> - </pluginRepositories> --> + <name>JBoss Snapshot Repository</name> + <url>dav:https://snapshots.jboss.org/maven2</url> + <uniqueVersion>true</uniqueVersion> + </snapshotRepository> + </distributionManagement> + <modules> + <module>build</module> + <module>deployer</module> + </modules> - <build> + <reporting> <plugins> <plugin> - <artifactId>maven-source-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <aggregate>true</aggregate> + </configuration> </plugin> </plugins> - </build> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-spi</artifactId> - <version>${version.jboss-deployers}</version> - </dependency> - <dependency> - <groupId>org.jboss.deployers</groupId> - <artifactId>jboss-deployers-vfs</artifactId> - <version>${version.jboss-deployers}</version> - </dependency> - <dependency> - <groupId>org.jboss.metadata</groupId> - <artifactId>jboss-metadata</artifactId> - <version>${version.jboss-metadata}</version> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-server</artifactId> - <version>${version.jboss-as}</version> - </dependency> - <dependency> - <groupId>saxon</groupId> - <artifactId>saxon</artifactId> - <version>${version.saxon}</version> - </dependency> - <dependency> - <groupId>org.jboss.portal.metadata</groupId> - <artifactId>metadata-metadata</artifactId> - <version>${version.jboss.portal.metadata}</version> - </dependency> - <dependency> - <groupId>org.jboss.portal.web</groupId> - <artifactId>web-web</artifactId> - <version>${version.jboss.portal.web}</version> - </dependency> - <dependency> - <groupId>org.jboss.portal.portlet</groupId> - <artifactId>portlet-portlet</artifactId> - <version>${version.jboss.portal.portlet}</version> - </dependency> - <dependency> - <groupId>org.jboss.portal.portlet</groupId> - <artifactId>portlet-mc</artifactId> - <version>${version.jboss.portal.portlet}</version> - </dependency> - <dependency> - <groupId>org.jboss.portal.core</groupId> - <artifactId>server</artifactId> - <version>${version.jboss.portal.server}</version> - </dependency> - <dependency> - <groupId>org.jboss.portal.server</groupId> - <artifactId>portlet-server</artifactId> - <version>${version.jboss.portlet.server}</version> - </dependency> - <dependency> - <groupId>org.jboss.portal.core</groupId> - <artifactId>core</artifactId> - <version>${version.jboss.portal.server}</version> - </dependency> - <dependency> - <groupId>org.jboss.portal.core</groupId> - <artifactId>security</artifactId> - <version>${version.jboss.portal.server}</version> - </dependency> - - <dependency> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jbossaop-plugin</artifactId> - <version>${version.jboss.aop}</version> - </dependency> - <dependency> - <groupId>org.jboss.aspects</groupId> - <artifactId>jboss-transaction-aspects</artifactId> - <version>${version.jboss.aspects}</version> - </dependency> - <dependency> - <groupId>org.jboss.aspects</groupId> - <artifactId>jboss-security-aspects</artifactId> - <version>${version.jboss.aspects}</version> - </dependency> - - </dependencies> - </dependencyManagement> - + </reporting> </project>