Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed core-jar-with-dependencies-descriptor -> jar-with-dependencies-descriptor 

Renamed jar-with-dependencies-descriptor -> jar-with-dependencies-no-core-no-apis-descriptor
Added a provided-dependencies-descriptor to the default assemblies run with -Pdistribution
This commit is contained in:
Andrew Phillips 2011-02-01 03:06:49 +01:00
parent 38a04f671d
commit af16b30b45
5 changed files with 127 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
assemblies/src/main/resources/assemblies/jar-with-dependencies-descriptor.xml
View File

@ -29,13 +29,6 @@
<dependencySet> <dependencySet>
<unpack>true</unpack> <unpack>true</unpack>
<scope>runtime</scope> <scope>runtime</scope>
<excludes>
<exclude>org.jclouds:jclouds-core</exclude>
<exclude>org.jclouds:jclouds-blobstore</exclude>
<exclude>org.jclouds:jclouds-compute</exclude>
</excludes>
<!-- exclude all transitive dependencies of core too -->
<useTransitiveFiltering>true</useTransitiveFiltering>
</dependencySet> </dependencySet>
</dependencySets> </dependencySets>
<fileSets> <fileSets>
@ -43,13 +36,5 @@
<directory>${project.build.outputDirectory}</directory> <directory>${project.build.outputDirectory}</directory>
<outputDirectory /> <outputDirectory />
</fileSet> </fileSet>
<!-- Hack to get Maven assembly to build even if there are no files to include.
See http://jira.codehaus.org/browse/MASSEMBLY-457. -->
<fileSet>
<includes>
<include>pom.xml</include>
</includes>
<outputDirectory>META-INF/maven/${project.groupId}/${project.artifactId}</outputDirectory>
</fileSet>
</fileSets> </fileSets>
</assembly> </assembly>

60
assemblies/src/main/resources/assemblies/jar-with-dependencies-no-core-no-apis-descriptor.xml Normal file
View File

@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2009 Cloud Conscious, LLC. <info@cloudconscious.com>
====================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
====================================================================
-->
<assembly>
<id>jar-with-dependencies</id>
<formats>
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<unpack>true</unpack>
<scope>runtime</scope>
<excludes>
<exclude>org.jclouds:jclouds-core</exclude>
<exclude>org.jclouds:jclouds-blobstore</exclude>
<exclude>org.jclouds:jclouds-compute</exclude>
<exclude>org.jclouds:jclouds-loadbalancer</exclude>
<exclude>org.jclouds.api:*</exclude>
<!-- excluding optional Clojure dependencies -->
<exclude>org.clojure:clojure*</exclude>
</excludes>
<!-- exclude all transitive dependencies of core too -->
<useTransitiveFiltering>true</useTransitiveFiltering>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>
<fileSets>
<fileSet>
<directory>${project.build.outputDirectory}</directory>
<outputDirectory />
</fileSet>
<!-- Hack to get Maven assembly to build even if there are no files to include.
See http://jira.codehaus.org/browse/MASSEMBLY-457. -->
<fileSet>
<includes>
<include>pom.xml</include>
</includes>
<outputDirectory>META-INF/maven/${project.groupId}/${project.artifactId}</outputDirectory>
</fileSet>
</fileSets>
</assembly>

16
assemblies/src/main/resources/assemblies/core-jar-with-dependencies-descriptor.xml → assemblies/src/main/resources/assemblies/provided-dependencies-descriptor.xml
View File

@ -20,21 +20,25 @@
--> -->
<assembly> <assembly>
<id>jar-with-dependencies</id> <id>provided-dependencies</id>
<formats> <formats>
<format>jar</format> <format>dir</format>
</formats> </formats>
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>
<unpack>true</unpack> <scope>provided</scope>
<scope>runtime</scope> <useProjectArtifact>false</useProjectArtifact>
</dependencySet> </dependencySet>
</dependencySets> </dependencySets>
<fileSets> <fileSets>
<!-- Hack to get Maven assembly to build even if there are no files to include.
See http://jira.codehaus.org/browse/MASSEMBLY-457. -->
<fileSet> <fileSet>
<directory>${project.build.outputDirectory}</directory> <includes>
<outputDirectory /> <include>pom.xml</include>
</includes>
<outputDirectory>META-INF/maven/${project.groupId}/${project.artifactId}</outputDirectory>
</fileSet> </fileSet>
</fileSets> </fileSets>
</assembly> </assembly>

4
core/pom.xml
View File

@ -128,7 +128,7 @@
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<executions> <executions>
<!-- override the default execution inherited from project --> <!-- overrides the default execution inherited from project -->
<execution> <execution>
<id>jar-with-dependencies</id> <id>jar-with-dependencies</id>
<phase>package</phase> <phase>package</phase>
@ -137,7 +137,7 @@
</goals> </goals>
<configuration> <configuration>
<descriptors> <descriptors>
<descriptor>core-jar-with-dependencies-descriptor.xml</descriptor> <descriptor>jar-with-dependencies-descriptor.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>
</execution> </execution>

39
project/pom.xml
View File

@ -251,23 +251,23 @@
<version>2.4</version> <version>2.4</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
<version>1.2.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure-contrib</artifactId>
<version>1.2.0</version>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>swank-clojure</groupId> <groupId>org.clojure</groupId>
<artifactId>swank-clojure</artifactId> <artifactId>clojure</artifactId>
<version>1.2.1</version> <version>1.2.0</version>
<scope>test</scope> <optional>true</optional>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure-contrib</artifactId>
<version>1.2.0</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>swank-clojure</groupId>
<artifactId>swank-clojure</artifactId>
<version>1.2.1</version>
<scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@ -409,7 +409,7 @@
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<additionalJOption>-J-Xmx128m</additionalJOption> <additionalJOption>-J-Xmx256m</additionalJOption>
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
<quiet>true</quiet> <quiet>true</quiet>
<links> <links>
@ -628,14 +628,15 @@ pageTracker._trackPageview();
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
<descriptors> <descriptors>
<descriptor>src-descriptor.xml</descriptor> <descriptor>src-descriptor.xml</descriptor>
<descriptor>jar-with-dependencies-descriptor.xml</descriptor> <descriptor>provided-dependencies-descriptor.xml</descriptor>
<descriptor>jar-with-dependencies-no-core-no-apis-descriptor.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>org.jclouds</groupId>
<artifactId>jclouds-assemblies</artifactId> <artifactId>jclouds-assemblies</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>