Author: mbenson
Date: Mon Feb 10 14:54:06 2014
New Revision: 1566646
URL: http://svn.apache.org/r1566646
Log:
more pom cleanup
Modified:
commons/proper/weaver/trunk/ant/lib/pom.xml
commons/proper/weaver/trunk/ant/test/pom.xml
commons/proper/weaver/trunk/build-tools/pom.xml
commons/proper/weaver/trunk/modules/pom.xml
commons/proper/weaver/trunk/modules/privilizer/weaver/pom.xml
Modified: commons/proper/weaver/trunk/ant/lib/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/ant/lib/pom.xml?rev=1566646&r1=1566645&r2=1566646&view=diff
==============================================================================
--- commons/proper/weaver/trunk/ant/lib/pom.xml (original)
+++ commons/proper/weaver/trunk/ant/lib/pom.xml Mon Feb 10 14:54:06 2014
@@ -29,7 +29,7 @@ under the License.
<name>Apache Commons Weaver Antlib</name>
<description>Apache Commons Weaver Ant task library</description>
- <properties>
+ <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<ant.version>1.8.4</ant.version>
<commons.osgi.import />
Modified: commons/proper/weaver/trunk/ant/test/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/ant/test/pom.xml?rev=1566646&r1=1566645&r2=1566646&view=diff
==============================================================================
--- commons/proper/weaver/trunk/ant/test/pom.xml (original)
+++ commons/proper/weaver/trunk/ant/test/pom.xml Mon Feb 10 14:54:06 2014
@@ -157,15 +157,15 @@ under the License.
classpathref="cp" />
<cw:weave>
- <cw:settings
target="${project.build.outputDirectory}"
- classpathref="cp">
- <propertyset>
- <propertyref name="privilizer.policy" />
- </propertyset>
- <properties>
-
<privilizer.accessLevel>PRIVATE</privilizer.accessLevel>
- </properties>
- </cw:settings>
+ <cw:settings target="${project.build.outputDirectory}"
+ classpathref="cp">
+ <propertyset>
+ <propertyref name="privilizer.policy" />
+ </propertyset>
+ <properties>
+
<privilizer.accessLevel>PRIVATE</privilizer.accessLevel>
+ </properties>
+ </cw:settings>
</cw:weave>
</sequential>
</target>
Modified: commons/proper/weaver/trunk/build-tools/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/build-tools/pom.xml?rev=1566646&r1=1566645&r2=1566646&view=diff
==============================================================================
--- commons/proper/weaver/trunk/build-tools/pom.xml (original)
+++ commons/proper/weaver/trunk/build-tools/pom.xml Mon Feb 10 14:54:06 2014
@@ -18,13 +18,13 @@ specific language governing permissions
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-weaver-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>commons-weaver-build-tools</artifactId>
- <name>Apache Commons Weaver Build Tools</name>
- <description>Provide common setup, from
http://maven.apache.org/plugins/maven-checkstyle-plugin/examples/multi-module-config.html</description>
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-weaver-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>commons-weaver-build-tools</artifactId>
+ <name>Apache Commons Weaver Build Tools</name>
+ <description>Provide common setup, from
http://maven.apache.org/plugins/maven-checkstyle-plugin/examples/multi-module-config.html</description>
</project>
Modified: commons/proper/weaver/trunk/modules/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/pom.xml?rev=1566646&r1=1566645&r2=1566646&view=diff
==============================================================================
--- commons/proper/weaver/trunk/modules/pom.xml (original)
+++ commons/proper/weaver/trunk/modules/pom.xml Mon Feb 10 14:54:06 2014
@@ -35,12 +35,12 @@ under the License.
<module>normalizer</module>
</modules>
<dependencies>
- <dependency>
+ <dependency>
<!-- we need this dependency for the reactor to correctly resolve
the build order -->
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-weaver-maven-plugin</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-weaver-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: commons/proper/weaver/trunk/modules/privilizer/weaver/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/privilizer/weaver/pom.xml?rev=1566646&r1=1566645&r2=1566646&view=diff
==============================================================================
--- commons/proper/weaver/trunk/modules/privilizer/weaver/pom.xml (original)
+++ commons/proper/weaver/trunk/modules/privilizer/weaver/pom.xml Mon Feb 10
14:54:06 2014
@@ -50,34 +50,6 @@ under the License.
<artifactId>commons-io</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <configuration>
- <debug>true</debug>
- <projectsDirectory>src/it</projectsDirectory>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- <postBuildHookScript>verify</postBuildHookScript>
-
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
- <settingsFile>src/it/settings.xml</settingsFile>
- </configuration>
- <executions>
- <execution>
- <id>integration-test</id>
- <goals>
- <goal>install</goal>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
- </plugins>
- </build>
<profiles>
<profile>
<id>basic</id>
