diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2007-07-31 22:34:12 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2007-07-31 22:34:12 +0000 |
| commit | c06860ce45b4f52be1ba934fd4d92da10c9cc25f (patch) | |
| tree | 116197a711525529c4d2b0228e0528ec405420b2 /qpid/java/pom.xml | |
| parent | ab82647c839e3aaa8b5c14d75d3e4a95c9075091 (diff) | |
| download | qpid-python-c06860ce45b4f52be1ba934fd4d92da10c9cc25f.tar.gz | |
Rolled back revision 561365 and commented out some broken code in ClientSession.java. The trunk should now build.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@561578 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/pom.xml')
| -rw-r--r-- | qpid/java/pom.xml | 62 |
1 files changed, 22 insertions, 40 deletions
diff --git a/qpid/java/pom.xml b/qpid/java/pom.xml index f6f719eb80..87ed34846f 100644 --- a/qpid/java/pom.xml +++ b/qpid/java/pom.xml @@ -155,26 +155,14 @@ 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> @@ -184,28 +172,26 @@ 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> @@ -214,6 +200,9 @@ under the License. </testResource> <testResource> <directory>src/test/resources</directory> + <includes> + <include>**</include> + </includes> </testResource> <testResource> <directory>src/test/java</directory> @@ -402,19 +391,7 @@ under the License. <version>0.5</version> </plugin> - - - - </plugins> - </pluginManagement> - - - <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> + <plugin> <artifactId>maven-remote-resources-plugin</artifactId> <version>1.0-alpha-5</version> <executions> @@ -434,8 +411,11 @@ under the License. </configuration> </execution> </executions> - </plugin--> - </plugins> + </plugin> + + + </plugins> + </pluginManagement> <defaultGoal>install</defaultGoal> @@ -606,6 +586,7 @@ under the License. --> <!-- Run the javadoc report. --> + <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> @@ -619,6 +600,7 @@ under the License. </tags> </configuration> </plugin> + --> <!-- Generate the clover coverage report. --> <!-- |