Author: remy.maucherat(a)jboss.com
Date: 2008-04-29 11:56:22 -0400 (Tue, 29 Apr 2008)
New Revision: 601
Added:
trunk/res/jbossweb-pom.xml
Removed:
trunk/res/pom.xml
Modified:
trunk/dist.xml
Log:
- Fix support of the snapshots repository (the main repo doesn't work however).
Modified: trunk/dist.xml
===================================================================
--- trunk/dist.xml 2008-04-29 15:04:39 UTC (rev 600)
+++ trunk/dist.xml 2008-04-29 15:56:22 UTC (rev 601)
@@ -286,29 +286,27 @@
<target name="maven" description="Upload to Maven repository; if this
looks like a hack, it's because it's one">
<filter token="VERSION" value="${version}"/>
- <copy file="res/pom.xml" todir="${tomcat.jars}"
filtering="true"/>
+ <copy file="res/jbossweb-pom.xml" todir="${tomcat.jars}"
filtering="true"/>
- <property name="jbossweb.jar.location"
value="output/jars/jbossweb.jar"/>
+ <property name="jbossweb.jar"
value="${tomcat.jars}/jbossweb.jar"/>
+ <property name="jbossweb.pom"
value="${tomcat.jars}/jbossweb-pom.xml"/>
- <!-- Use this to deploy release versions. The url should point to a local
- - checkout of
repository.jboss.org. -->
- <!--<property name="maven.repository.url"
value="dav:https://repository.jboss.org/maven2"/>
+ <!--<property name="maven.repository.url"
value="file:///home/remm/.m2/repository/maven2"/>
+ <property name="maven.repository.url"
value="dav:https://repository.jboss.org/maven2"/>
<property name="maven.repository.id"
value="repository.jboss.org"/>-->
-
- <!-- Use this url to deploy to the snapshot repository -->
<property name="maven.repository.url"
value="dav:https://snapshots.jboss.org/maven2"/>
<property name="maven.repository.id"
value="snapshots.jboss.org"/>
<!-- Linux/Unix execs -->
<exec dir="." executable="/bin/sh" os="Linux">
<arg value="-c" />
- <arg value="mvn deploy:deploy-file -Dfile=${jbossweb.jar.location}
-DpomFile=${tomcat.jars}/pom.xml -Durl=${maven.repository.url} -Dpackaging=jar
-DrepositoryId=${maven.repository.id}"/>
+ <arg value="mvn deploy:deploy-file -Dfile=${jbossweb.jar}
-DpomFile=${jbossweb.pom} -Durl=${maven.repository.url} -Dpackaging=jar
-DrepositoryId=${maven.repository.id}"/>
</exec>
<!-- Windows exec -->
<exec dir="." executable="cmd" os="Windows NT">
<arg value="/c" />
- <arg value="mvn deploy:deploy-file -Dfile=${jbossweb.jar.location}
-DpomFile=${tomcat.jars}\\pom.xml -Durl=${maven.repository.url} -Dpackaging=jar
-DrepositoryId=${maven.repository.id}"/>
+ <arg value="mvn deploy:deploy-file -Dfile=${jbossweb.jar}
-DpomFile=${jbossweb.pom} -Durl=${maven.repository.url} -Dpackaging=jar
-DrepositoryId=${maven.repository.id}"/>
</exec>
</target>
Copied: trunk/res/jbossweb-pom.xml (from rev 600, trunk/res/pom.xml)
===================================================================
--- trunk/res/jbossweb-pom.xml (rev 0)
+++ trunk/res/jbossweb-pom.xml 2008-04-29 15:56:22 UTC (rev 601)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>jboss.web</groupId>
+ <artifactId>jbossweb</artifactId>
+ <version>@VERSION@</version>
+</project>
Deleted: trunk/res/pom.xml
===================================================================
--- trunk/res/pom.xml 2008-04-29 15:04:39 UTC (rev 600)
+++ trunk/res/pom.xml 2008-04-29 15:56:22 UTC (rev 601)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>3</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>jboss</groupId>
- <artifactId>jbossweb</artifactId>
- <version>@VERSION@</version>
- <description>JBoss Web</description>
-</project>