Author: wsmoak
Date: Sun Nov 27 20:07:30 2005
New Revision: 349358
URL: http://svn.apache.org/viewcvs?rev=349358&view=rev
Log:
Include LICENSE.txt and NOTICE.txt in the jar file.
Added dependency scope hints for Maven 2.
Added siteAddress and siteDirectory for publishing the site with Maven.
Modified:
struts/el/trunk/project.properties
struts/el/trunk/project.xml
Modified: struts/el/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/struts/el/trunk/project.properties?rev=349358&r1=349357&r2=349358&view=diff
==============================================================================
--- struts/el/trunk/project.properties (original)
+++ struts/el/trunk/project.properties Sun Nov 27 20:07:30 2005
@@ -3,7 +3,7 @@
maven.war.src = web/exercise-taglib
# Include only the classes that should be in the .jar file
-maven.jar.includes = org/apache/strutsel/**,META-INF/**
+maven.jar.includes = org/apache/strutsel/**,META-INF/**,*.txt
# Include only the classes and properties for the webapp in the .war file
maven.war.classes.includes = org/apache/struts/webapp/exercise/**
Modified: struts/el/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/struts/el/trunk/project.xml?rev=349358&r1=349357&r2=349358&view=diff
==============================================================================
--- struts/el/trunk/project.xml (original)
+++ struts/el/trunk/project.xml Sun Nov 27 20:07:30 2005
@@ -54,6 +54,10 @@
for evaluating attribute values.
</description>
+
+ <siteAddress>people.apache.org</siteAddress>
+ <siteDirectory>/www/struts.apache.org/struts-el/</siteDirectory>
+
<repository>
<connection>scm|svn|http|//svn.apache.org/repos/asf/struts/el/trunk</connection>
<developerConnection>scm|svn|https|//svn.apache.org/repos/asf/struts/el/trunk</developerConnection>
@@ -127,6 +131,7 @@
<version>1.5.4</version>
<properties>
<cactus.bundle>true</cactus.bundle>
+ <scope>test</scope>
</properties>
<url>http://httpunit.org/</url>
</dependency>
@@ -137,6 +142,7 @@
<version>2.6.2</version>
<properties>
<cactus.bundle>true</cactus.bundle>
+ <scope>compile</scope>
</properties>
<url>http://xerces.apache.org/</url>
</dependency>
@@ -147,6 +153,7 @@
<version>2.6.2</version>
<properties>
<cactus.bundle>true</cactus.bundle>
+ <scope>compile</scope>
</properties>
<url>http://xerces.apache.org/</url>
</dependency>
@@ -157,6 +164,9 @@
<artifactId>cactus</artifactId>
<version>12-1.4.1</version>
<url>http://jakarta.apache.org/cactus</url>
+ <properties>
+ <scope>test</scope>
+ </properties>
</dependency>
<dependency>
@@ -164,6 +174,9 @@
<artifactId>cactus-ant</artifactId>
<version>1.4.1</version>
<url>http://jakarta.apache.org/cactus</url>
+ <properties>
+ <scope>test</scope>
+ </properties>
</dependency>
<dependency>
@@ -171,6 +184,9 @@
<artifactId>xalan</artifactId>
<version>2.5.1</version>
<url>http://xml.apache.org/xalan-j</url>
+ <properties>
+ <scope>compile</scope>
+ </properties>
</dependency>
<dependency>
@@ -204,6 +220,13 @@
<include>**/*.tld</include>
</includes>
<targetPath>META-INF/tlds</targetPath>
+ </resource>
+ <resource>
+ <directory>build</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
</resource>
</resources>
<!-- Integration unit test cases -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
