diff options
Diffstat (limited to 'qpid/java/pom.xml')
| -rw-r--r-- | qpid/java/pom.xml | 85 |
1 files changed, 49 insertions, 36 deletions
diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml index 707e68f23b..4bfb23dad6 100644 --- a/qpid/java/pom.xml +++ b/qpid/java/pom.xml @@ -154,7 +154,7 @@ under the License. <module>cluster</module> <module>systests</module> <module>perftests</module> - <!-- <module>integrationtests</module> --> + <module>integrationtests</module> <module>management/eclipse-plugin</module> <module>client/example</module> <module>client-java14</module> @@ -163,6 +163,18 @@ under the License. <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> @@ -391,29 +402,31 @@ under the License. <version>0.5</version> </plugin> - <plugin> - <artifactId>maven-remote-resources-plugin</artifactId> - <version>1.0-alpha-5</version> - <executions> - <execution> - <goals> - <goal>process</goal> - </goals> - <configuration> - <resourceBundles> - <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle> - <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle> - </resourceBundles> - <properties> - <addLicense>true</addLicense> - <projectName>Apache Qpid</projectName> - </properties> - </configuration> - </execution> - </executions> - </plugin> + <!-- 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. - </plugins> + <plugin> + <artifactId>maven-remote-resources-plugin</artifactId> + <version>1.0-alpha-5</version> + <executions> + <execution> + <goals> + <goal>process</goal> + </goals> + <configuration> + <resourceBundles> + <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle> + <resourceBundle>org.apache:apache-jar-resource-bundle:1.2</resourceBundle> + </resourceBundles> + <properties> + <addLicense>true</addLicense> + <projectName>Apache Qpid</projectName> + </properties> + </configuration> + </execution> + </executions> + </plugin--> + </plugins> </pluginManagement> <defaultGoal>install</defaultGoal> @@ -526,7 +539,7 @@ under the License. <dependency> <groupId>uk.co.thebadgerset</groupId> <artifactId>junit-toolkit</artifactId> - <version>0.6-20070718.144514-11</version> + <version>0.6-SNAPSHOT</version> <scope>compile</scope> </dependency> |