- Add an antrun execution to copy site resources.
- Set the scope of servlet-api to provided. - Add the jdepend-maven-plugin report. - Set maven.compile.target to 1.1 to match the value used in the Ant build. - Remove the bogus repository from distributionManagement. - Fix the site url in distributionManagement. git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/logging/trunk@558567 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
45
pom.xml
45
pom.xml
@@ -25,7 +25,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.apache.commons</groupId>
|
<groupId>org.apache.commons</groupId>
|
||||||
<artifactId>commons-parent</artifactId>
|
<artifactId>commons-parent</artifactId>
|
||||||
<version>3-SNAPSHOT</version>
|
<version>3</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>commons-logging</groupId>
|
<groupId>commons-logging</groupId>
|
||||||
@@ -235,6 +235,31 @@
|
|||||||
<goal>run</goal>
|
<goal>run</goal>
|
||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
|
<execution>
|
||||||
|
<id>site.resources</id>
|
||||||
|
<phase>site</phase>
|
||||||
|
<configuration>
|
||||||
|
<tasks>
|
||||||
|
<copy todir="${project.reporting.outputDirectory}">
|
||||||
|
<fileset dir="${basedir}">
|
||||||
|
<include name="RELEASE-NOTES.txt" />
|
||||||
|
</fileset>
|
||||||
|
<!--
|
||||||
|
- The logo should be moved to
|
||||||
|
- ${basedir}/src/site/resources/images
|
||||||
|
- once we can drop support for the Maven 1 site.
|
||||||
|
- When that is done this section can be removed.
|
||||||
|
-->
|
||||||
|
<fileset dir="${basedir}/xdocs">
|
||||||
|
<include name="images/logo.png" />
|
||||||
|
</fileset>
|
||||||
|
</copy>
|
||||||
|
</tasks>
|
||||||
|
</configuration>
|
||||||
|
<goals>
|
||||||
|
<goal>run</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
@@ -335,6 +360,7 @@
|
|||||||
<groupId>javax.servlet</groupId>
|
<groupId>javax.servlet</groupId>
|
||||||
<artifactId>servlet-api</artifactId>
|
<artifactId>servlet-api</artifactId>
|
||||||
<version>2.3</version>
|
<version>2.3</version>
|
||||||
|
<scope>provided</scope>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
@@ -350,23 +376,22 @@
|
|||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
-->
|
-->
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
|
<artifactId>jdepend-maven-plugin</artifactId>
|
||||||
|
<version>2.0-beta-1</version>
|
||||||
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</reporting>
|
</reporting>
|
||||||
|
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
<repository>
|
|
||||||
<id>default</id>
|
|
||||||
<name>Default Repository</name>
|
|
||||||
<url>file:///www/jakarta.apache.org/builds/jakarta-commons/logging/</url>
|
|
||||||
</repository>
|
|
||||||
<site>
|
<site>
|
||||||
<id>default</id>
|
<id>apache.website</id>
|
||||||
<name>Default Site</name>
|
<url>${commons.deployment.protocol}://people.apache.org//www/jakarta.apache.org/commons/logging/</url>
|
||||||
<url>scp://cvs.apache.org//www/jakarta.apache.org/commons/logging/</url>
|
|
||||||
</site>
|
</site>
|
||||||
</distributionManagement>
|
</distributionManagement>
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compile.source>1.2</maven.compile.source>
|
<maven.compile.source>1.2</maven.compile.source>
|
||||||
<maven.compile.target>1.2</maven.compile.target>
|
<maven.compile.target>1.1</maven.compile.target>
|
||||||
</properties>
|
</properties>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
Reference in New Issue
Block a user