diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-07-18 14:36:11 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-07-18 14:36:11 +0000 |
| commit | 0827d643ce33d021d621aade4757008252e9009c (patch) | |
| tree | 580854d120b3081d7ece404a4900b16d5a0f34eb /java/pom.xml | |
| parent | 12893c188fb12fb9295214ffbc2c4de9f48de965 (diff) | |
| download | qpid-python-0827d643ce33d021d621aade4757008252e9009c.tar.gz | |
Updates to pom files and Licensing/Notice files for M2 release.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@557276 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/pom.xml')
| -rw-r--r-- | java/pom.xml | 53 |
1 files changed, 33 insertions, 20 deletions
diff --git a/java/pom.xml b/java/pom.xml index 114abfab1b..547b5d12ec 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -155,14 +155,26 @@ under the License. <module>perftests</module> <module>integrationtests</module> <module>management/eclipse-plugin</module> - <module>client/example</module> - <module>client-java14</module> + <module>client/example</module> + <module>client-java14</module> </modules> <build> <resources> + + <resource> + <targetPath>META-INF/</targetPath> + <filtering>false</filtering> + <directory>../resources</directory> + <includes> + <include>DISCLAIMER</include> + <include>LICENSE</include> + <include>NOTICE</include> + </includes> + </resource> + <resource> <directory>src/main/java</directory> <excludes> @@ -172,26 +184,28 @@ under the License. </resource> <resource> <directory>src/main/resources</directory> - <includes> - <include>**</include> - </includes> </resource> <resource> <directory>src/main/resources-filtered</directory> - <includes> - <include>**</include> - </includes> <filtering>true</filtering> </resource> <resource> <directory>target/generated/src/main/resources</directory> - <includes> - <include>**</include> - </includes> </resource> </resources> <testResources> + <testResource> + <targetPath>META-INF/</targetPath> + <filtering>false</filtering> + <directory>../resources</directory> + <includes> + <include>DISCLAIMER</include> + <include>LICENSE</include> + <include>NOTICE</include> + </includes> + </testResource> + <testResource> <directory>src/test/java</directory> <excludes> @@ -200,9 +214,6 @@ under the License. </testResource> <testResource> <directory>src/test/resources</directory> - <includes> - <include>**</include> - </includes> </testResource> <testResource> <directory>src/test/java</directory> @@ -398,8 +409,12 @@ under the License. </pluginManagement> - <!--plugins> - <plugin> + <plugins> + + <!-- Disabled as plugin crashes on the systest module. + Also, the resulting NOTICE file doesn't include all license info due to missing data in dependant poms. + + <plugin> <artifactId>maven-remote-resources-plugin</artifactId> <version>1.0-alpha-5</version> <executions> @@ -419,8 +434,8 @@ under the License. </configuration> </execution> </executions> - </plugin> - </plugins--> + </plugin--> + </plugins> <defaultGoal>install</defaultGoal> @@ -591,7 +606,6 @@ under the License. --> <!-- Run the javadoc report. --> - <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> @@ -605,7 +619,6 @@ under the License. </tags> </configuration> </plugin> - --> <!-- Generate the clover coverage report. --> <!-- |