Author: ptahchiev Date: Sat Mar 29 07:35:56 2008 New Revision: 642538 URL: http://svn.apache.org/viewvc?rev=642538&view=rev Log: Added javac source and target version. Also remote-resource plugin for including the NOTICE and LICENSE files in the META-INF.
Modified:
jakarta/cactus/trunk/pom.xml
Modified: jakarta/cactus/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/jakarta/cactus/trunk/pom.xml?rev=642538&r1=642537&r2=642538&view=diff
==============================================================================
--- jakarta/cactus/trunk/pom.xml (original)
+++ jakarta/cactus/trunk/pom.xml Sat Mar 29 07:35:56 2008
@@ -25,6 +25,17 @@
<version>1.8.0-SNAPSHOT</version>
<packaging>pom</packaging>
<url>http://jakarta.apache.org/cactus/</url>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ </organization>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/jakarta/cactus/trunk/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/jakarta/cactus/trunk/</developerConnection>
@@ -39,17 +50,17 @@
<dependency>
<groupId>aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.2.1</version>
+ <version>1.5.2a</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>2.0.2</version>
+ <version>3.1</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>httpunit</groupId>
@@ -80,17 +91,21 @@
<groupId>jtidy</groupId>
<artifactId>jtidy</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+
<artifactId>servlet-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.4</version>
</dependency>
<dependency> <!-- used by httpunit -->
<groupId>nekohtml</groupId>
<artifactId>nekohtml</artifactId>
- <version>0.9.1</version>
+ <version>1.9.6</version>
<exclusions>
<exclusion>
<groupId>xerces</groupId>
@@ -219,9 +234,7 @@
</exclusions>
</dependency>
</dependencies>
-
</dependencyManagement>
-
<distributionManagement>
<repository>
<id>apache.releases</id>
@@ -261,7 +274,7 @@
</reporting>
<ciManagement>
- <system>continuum</system>
+ <system>gump</system>
<notifiers>
<notifier>
<type>mail</type>
@@ -272,6 +285,11 @@
</notifiers>
</ciManagement>
+ <properties>
+ <maven.compile.source>1.4</maven.compile.source>
+ <maven.compile.target>1.4</maven.compile.target>
+ </properties>
+
<build>
<pluginManagement>
<plugins>
@@ -301,6 +319,20 @@
</executions>
</plugin>
<plugin>
+ <executions>
+ <execution>
+ <goals>
+
<goal>process</goal>
+ </goals>
+ <configuration>
+
<resourceBundles>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle>
+
</resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clover-plugin</artifactId>
<configuration>
@@ -334,16 +366,30 @@
<artifactId>maven-site-plugin</artifactId>
<version>2.0-beta-6</version>
</plugin>
-
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+
<source>${maven.compile.source}</source>
+
<target>${maven.compile.target}</target>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
-
<mode>development</mode>
-
<url>${pom.url}</url>
- </manifestEntries>
+
<Specification-Title>${project.name}</Specification-Title>
+
<Specification-Version>${project.version}</Specification-Version>
+
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
+
<Implementation-Title>${project.name}</Implementation-Title>
+
<Implementation-Version>${project.version}</Implementation-Version>
+
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+
<X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
+
<X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
+ </manifestEntries>
</archive>
</configuration>
</plugin>
@@ -366,8 +412,32 @@
</execution>
</executions-->
</plugin>
+ <plugin>
+
<artifactId>maven-source-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+
<artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
+ </resourceBundles>
+ <!--properties>
+
<addLicense>true</addLicense>
+ </properties-->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<modules>
<module>build-tools</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
