Update of /cvsroot/webmacro/webmacro/webmacro
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16638
Modified Files:
pom.xml
Log Message:
Get deployment to SF working without needing to create a shell
Index: pom.xml
===================================================================
RCS file: /cvsroot/webmacro/webmacro/webmacro/pom.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** pom.xml 24 Feb 2010 21:02:00 -0000 1.29
--- pom.xml 25 Feb 2010 01:49:08 -0000 1.30
***************
*** 222,233 ****
</includes>
</testResource>
- <!--
- <testResource>
- <directory>macros</directory>
- <includes>
- <include>**/*.wmm</include>
- </includes>
- </testResource>
- -->
</testResources>
<plugins>
--- 222,225 ----
***************
*** 313,322 ****
</build>
<dependencies>
! <dependency>
! <groupId>javax.servlet</groupId>
! <artifactId>servlet-api</artifactId>
! <version>2.5</version>
! <scope>provided</scope>
! </dependency>
<dependency>
<groupId>org.slf4j</groupId>
--- 305,309 ----
</build>
<dependencies>
! <!-- ONE compile-time dependency !!! -->
<dependency>
<groupId>org.slf4j</groupId>
***************
*** 325,342 ****
<scope>compile</scope>
</dependency>
<dependency>
! <groupId>org.slf4j</groupId>
! <artifactId>slf4j-simple</artifactId>
! <version>1.5.8</version>
! <scope>test</scope>
</dependency>
! <!--
<dependency>
! <groupId>commons-logging</groupId>
! <artifactId>commons-logging</artifactId>
! <version>1.1</version>
<scope>test</scope>
</dependency>
- -->
<dependency>
<groupId>jakarta-regexp</groupId>
--- 312,332 ----
<scope>compile</scope>
</dependency>
+
+
<dependency>
! <groupId>javax.servlet</groupId>
! <artifactId>servlet-api</artifactId>
! <version>2.5</version>
! <scope>provided</scope>
</dependency>
!
!
!
<dependency>
! <groupId>org.slf4j</groupId>
! <artifactId>slf4j-log4j12</artifactId>
! <version>1.5.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta-regexp</groupId>
***************
*** 431,444 ****
</plugins>
</reporting>
<distributionManagement>
<repository>
! <id>default</id>
! <name>Default Repository</name>
! <url>scp://shell.sourceforge.net/home/groups/w/we/webmacro/htdocs/maven2/</url>
</repository>
<site>
! <id>default</id>
! <name>Default Site</name>
! <url>scp://shell.sourceforge.net/home/groups/w/we/webmacro/htdocs/</url>
</site>
</distributionManagement>
--- 421,461 ----
</plugins>
</reporting>
+ <repositories>
+ <repository>
+ <id>sf</id>
+ <name>SourceForge</name>
+ <url>http://webmacro.sourceforge.net/maven2/</url>
+ </repository>
+ </repositories>
+ <!--
+ Note that you need to have created a shell to get scp to work with shell.sourceforge.net
+ I could not get scp to work with web.sourceforge.net
+
+ -->
+
+ <!--
+ ssh -t timp,web...@sh... create
+ -->
<distributionManagement>
+ <downloadUrl>http://webmacro.sourceforge.net/maven2/</downloadUrl>
<repository>
! <id>sf</id>
! <name>SourceForge</name>
! <!--
! <url>scp://timp,web...@sh...:/home/groups/w/we/webmacro/htdocs/maven2/</url>
! -->
! <url>sftp://timp,web...@we...:/home/groups/w/we/webmacro/htdocs/maven2</url>
! </repository>
! <!-- Need a separate release thingy to deploy to frs
! <repository>
! <id>sf</id>
! <name>SourceForge</name>
! <url>sftp://timp,web...@we...:/home/frs/project/w/we/webmacro/releases</url>
</repository>
+ -->
<site>
! <id>sf</id>
! <name>SourceForge</name>
! <url>sftp://timp,web...@we...:/home/groups/w/we/webmacro/htdocs/</url>
</site>
</distributionManagement>
|
