diff options
| author | Robert Gemmell <robbie@apache.org> | 2013-10-06 11:04:56 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2013-10-06 11:04:56 +0000 |
| commit | 6b49962c50e5ebbe810ddbb562dc2b55a3c4de06 (patch) | |
| tree | e4c7e1227ec4214094cded08b4a8effe9c9dc024 /qpid/java/broker-plugins/management-http/pom.xml | |
| parent | 9e1128eed479d269cd9700675a46dd979f26d40a (diff) | |
| download | qpid-python-6b49962c50e5ebbe810ddbb562dc2b55a3c4de06.tar.gz | |
QPID-5207, QPID-5048: use the dojo release zip instead of extracting files from the war
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1529610 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/management-http/pom.xml')
| -rw-r--r-- | qpid/java/broker-plugins/management-http/pom.xml | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/qpid/java/broker-plugins/management-http/pom.xml b/qpid/java/broker-plugins/management-http/pom.xml index f7942f85fa..dfc56ff3f1 100644 --- a/qpid/java/broker-plugins/management-http/pom.xml +++ b/qpid/java/broker-plugins/management-http/pom.xml @@ -150,6 +150,13 @@ </exclusions> </dependency> + <dependency> + <groupId>org.dojotoolkit</groupId> + <artifactId>dojo</artifactId> + <version>${dojo-version}</version> + <type>zip</type> + </dependency> + <!-- test dependencies --> <dependency> <groupId>org.apache.qpid</groupId> @@ -170,36 +177,28 @@ <include>resources/</include> </includes> </resource> + <resource> + <directory>src/main/resources-maven</directory> + <filtering>true</filtering> + </resource> </resources> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <!--version specified in parent pluginManagement --> - <executions> - <execution> - <id>unpack-dojo</id> - <phase>generate-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.dojotoolkit</groupId> - <artifactId>dojo-war</artifactId> - <version>1.8.3</version> - <type>war</type> - <overWrite>false</overWrite> - <outputDirectory>${project.build.directory}/classes/resources/dojo</outputDirectory> - <excludes>META-INF/**,WEB-INF/**,**/*.uncompressed.js</excludes> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <!--version specified in parent pluginManagement --> + <configuration> + <archive> + <!-- add the dojo zip to the manifest Class-Path so that + it gets picked up when using classpath wildcard + expansion, which only collects .jar files --> + <manifestEntries> + <Class-Path>dojo-${dojo-version}.zip</Class-Path> + </manifestEntries> + </archive> + </configuration> + </plugin> </plugins> </build> |