Author: mbenson
Date: Wed Dec 16 22:15:58 2015
New Revision: 1720470
URL: http://svn.apache.org/viewvc?rev=1720470&view=rev
Log:
restore L&N search to base pom
Modified:
commons/proper/weaver/trunk/parent/pom.xml
commons/proper/weaver/trunk/pom.xml
Modified: commons/proper/weaver/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/parent/pom.xml?rev=1720470&r1=1720469&r2=1720470&view=diff
==============================================================================
--- commons/proper/weaver/trunk/parent/pom.xml (original)
+++ commons/proper/weaver/trunk/parent/pom.xml Wed Dec 16 22:15:58 2015
@@ -35,7 +35,6 @@ under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <ant.version>1.9.4</ant.version>
<checkstyle.version>2.15</checkstyle.version>
<hamcrest.version>1.3</hamcrest.version>
</properties>
@@ -226,11 +225,6 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.8</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
</plugin>
@@ -241,11 +235,6 @@ under the License.
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.10</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.3</version>
</plugin>
@@ -254,104 +243,6 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-notices</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target xmlns:if="ant:if" xmlns:unless="ant:unless">
- <presetdef name="truth">
- <condition value="true" else="false" />
- </presetdef>
-
- <macrodef name="seek">
- <attribute name="name" />
- <attribute name="addto" />
- <sequential>
- <union id="@{name}-ws" />
- <step dir="${user.dir}" name="@{name}" addto="@{addto}"
ws="@{name}-ws" />
- </sequential>
- </macrodef>
-
- <macrodef name="step">
- <attribute name="name" />
- <attribute name="dir" />
- <attribute name="addto" />
- <attribute name="ws" />
- <sequential>
- <local name="seenDir" />
- <truth property="seenDir">
- <resourcecount when="gt" count="0">
- <intersect id="intersection">
- <resources refid="@{ws}" />
- <file name="@{dir}" />
- </intersect>
- </resourcecount>
- </truth>
- <sequential unless:true="${seenDir}">
- <augment id="@{ws}">
- <file file="@{dir}" />
- </augment>
- <local name="exists" />
- <truth property="exists">
- <available file="@{dir}/@{name}" />
- </truth>
-
- <sequential if:true="${exists}">
- <augment id="@{addto}">
- <file file="@{dir}/@{name}" />
- </augment>
- </sequential>
- <sequential unless:true="${exists}">
- <local name="parent.dir" />
- <dirname property="parent.dir" file="@{dir}" />
- <step dir="${parent.dir}" name="@{name}"
addto="@{addto}" ws="@{ws}" />
- </sequential>
- </sequential>
- </sequential>
- </macrodef>
-
- <truth property="pom-only">
- <equals arg1="${project.packaging}" arg2="pom" />
- </truth>
- <sequential unless:true="${pom-only}">
- <union id="notices" />
- <seek name="LICENSE.txt" addto="notices" />
- <seek name="NOTICE.txt" addto="notices" />
-
- <mkdir
dir="${project.build.directory}/generated-resources/notices/META-INF" />
- <copy verbose="true"
todir="${project.build.directory}/generated-resources/notices/META-INF">
- <resources refid="notices" />
- </copy>
-
- <mkdir
dir="${project.build.directory}/generated-test-resources/notices/META-INF" />
- <copy verbose="true"
todir="${project.build.directory}/generated-test-resources/notices/META-INF">
- <resources refid="notices" />
- </copy>
-
- <mkdir dir="${project.build.directory}/apidocs/META-INF" />
- <copy verbose="true"
todir="${project.build.directory}/apidocs/META-INF">
- <resources refid="notices" />
- </copy>
- </sequential>
- </target>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>${ant.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
@@ -406,20 +297,6 @@ under the License.
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
- <id>add-source-notices</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>add-resource</goal>
- </goals>
- <configuration>
- <resources>
- <resource>
-
<directory>${project.build.directory}/generated-resources/notices</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
<id>add-test-notices</id>
<phase>generate-test-resources</phase>
<goals>
Modified: commons/proper/weaver/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/pom.xml?rev=1720470&r1=1720469&r2=1720470&view=diff
==============================================================================
--- commons/proper/weaver/trunk/pom.xml (original)
+++ commons/proper/weaver/trunk/pom.xml Wed Dec 16 22:15:58 2015
@@ -62,6 +62,7 @@ under the License.
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
+ <ant.version>1.9.4</ant.version>
</properties>
<developers>
@@ -100,9 +101,121 @@ under the License.
</distributionManagement>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.8</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.10</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-notices</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target xmlns:if="ant:if" xmlns:unless="ant:unless">
+ <presetdef name="truth">
+ <condition value="true" else="false" />
+ </presetdef>
+
+ <macrodef name="seek">
+ <attribute name="name" />
+ <attribute name="addto" />
+ <sequential>
+ <union id="@{name}-ws" />
+ <step dir="${user.dir}" name="@{name}" addto="@{addto}"
ws="@{name}-ws" />
+ </sequential>
+ </macrodef>
+
+ <macrodef name="step">
+ <attribute name="name" />
+ <attribute name="dir" />
+ <attribute name="addto" />
+ <attribute name="ws" />
+ <sequential>
+ <local name="seenDir" />
+ <truth property="seenDir">
+ <resourcecount when="gt" count="0">
+ <intersect id="intersection">
+ <resources refid="@{ws}" />
+ <file name="@{dir}" />
+ </intersect>
+ </resourcecount>
+ </truth>
+ <sequential unless:true="${seenDir}">
+ <augment id="@{ws}">
+ <file file="@{dir}" />
+ </augment>
+ <local name="exists" />
+ <truth property="exists">
+ <available file="@{dir}/@{name}" />
+ </truth>
+
+ <sequential if:true="${exists}">
+ <augment id="@{addto}">
+ <file file="@{dir}/@{name}" />
+ </augment>
+ </sequential>
+ <sequential unless:true="${exists}">
+ <local name="parent.dir" />
+ <dirname property="parent.dir" file="@{dir}" />
+ <step dir="${parent.dir}" name="@{name}"
addto="@{addto}" ws="@{ws}" />
+ </sequential>
+ </sequential>
+ </sequential>
+ </macrodef>
+
+ <truth property="pom-only">
+ <equals arg1="${project.packaging}" arg2="pom" />
+ </truth>
+ <sequential unless:true="${pom-only}">
+ <union id="notices" />
+ <seek name="LICENSE.txt" addto="notices" />
+ <seek name="NOTICE.txt" addto="notices" />
+
+ <mkdir
dir="${project.build.directory}/generated-resources/notices/META-INF" />
+ <copy verbose="true"
todir="${project.build.directory}/generated-resources/notices/META-INF">
+ <resources refid="notices" />
+ </copy>
+
+ <mkdir
dir="${project.build.directory}/generated-test-resources/notices/META-INF" />
+ <copy verbose="true"
todir="${project.build.directory}/generated-test-resources/notices/META-INF">
+ <resources refid="notices" />
+ </copy>
+
+ <mkdir dir="${project.build.directory}/apidocs/META-INF" />
+ <copy verbose="true"
todir="${project.build.directory}/apidocs/META-INF">
+ <resources refid="notices" />
+ </copy>
+ </sequential>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
@@ -146,6 +259,26 @@ under the License.
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-source-notices</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>add-resource</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+
<directory>${project.build.directory}/generated-resources/notices</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
