1
0

Upgrade to commons-parent:26.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/logging/trunk@1389016 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dennis Lundberg
2012-09-23 11:14:37 +00:00
parent 0e6e8aa66e
commit 3b78985b1f

23
pom.xml
View File

@@ -26,7 +26,7 @@ under the License.
<parent> <parent>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId> <artifactId>commons-parent</artifactId>
<version>15</version> <version>26</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
@@ -35,7 +35,7 @@ under the License.
<version>1.1.2-SNAPSHOT</version> <version>1.1.2-SNAPSHOT</version>
<description>Commons Logging is a thin adapter allowing configurable bridging to other, <description>Commons Logging is a thin adapter allowing configurable bridging to other,
well known logging systems.</description> well known logging systems.</description>
<url>http://commons.apache.org/logging</url> <url>http://commons.apache.org/logging/</url>
<issueManagement> <issueManagement>
<system>JIRA</system> <system>JIRA</system>
@@ -141,15 +141,6 @@ under the License.
</testResource> </testResource>
</testResources> </testResources>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.9</version>
</plugin>
</plugins>
</pluginManagement>
<plugins> <plugins>
<!-- <!--
@@ -232,19 +223,18 @@ under the License.
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<version>1.1</version>
<executions> <executions>
<execution> <execution>
<id>site.resources</id> <id>site.resources</id>
<phase>site</phase> <phase>site</phase>
<configuration> <configuration>
<tasks> <target>
<copy todir="${project.reporting.outputDirectory}"> <copy todir="${project.reporting.outputDirectory}">
<fileset dir="${basedir}"> <fileset dir="${basedir}">
<include name="RELEASE-NOTES.txt" /> <include name="RELEASE-NOTES.txt" />
</fileset> </fileset>
</copy> </copy>
</tasks> </target>
</configuration> </configuration>
<goals> <goals>
<goal>run</goal> <goal>run</goal>
@@ -289,15 +279,12 @@ under the License.
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>2.0-beta-6</version>
<configuration> <configuration>
<!-- <!--
- The site needs to be built prior to deploy, - The site needs to be built prior to deploy,
- because it is included in the assembly. - because it is included in the assembly.
--> -->
<goals>site deploy</goals> <goals>site deploy</goals>
<!-- Pass these arguments to the deploy plugin. -->
<arguments>-Prelease</arguments>
</configuration> </configuration>
</plugin> </plugin>
@@ -363,7 +350,6 @@ under the License.
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-1</version>
<configuration> <configuration>
<!-- Do not deploy the assemblies to the repository. --> <!-- Do not deploy the assemblies to the repository. -->
<attach>false</attach> <attach>false</attach>
@@ -412,7 +398,6 @@ under the License.
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId> <artifactId>maven-deploy-plugin</artifactId>
<version>2.3</version>
<configuration> <configuration>
<!-- Pick up this configuration from settings.xml. --> <!-- Pick up this configuration from settings.xml. -->
<altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository> <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>