mirror of https://github.com/apache/jclouds.git
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
parent
38a04f671d
commit
af16b30b45
|
|
@ -29,13 +29,6 @@
|
|||
<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>
|
||||
</excludes>
|
||||
<!-- exclude all transitive dependencies of core too -->
|
||||
<useTransitiveFiltering>true</useTransitiveFiltering>
|
||||
</dependencySet>
|
||||
</dependencySets>
|
||||
<fileSets>
|
||||
|
|
@ -43,13 +36,5 @@
|
|||
<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>
|
||||
</assembly>
|
||||
|
|
@ -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>
|
||||
|
|
@ -1,40 +1,44 @@
|
|||
<?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>
|
||||
</dependencySet>
|
||||
</dependencySets>
|
||||
<fileSets>
|
||||
<fileSet>
|
||||
<directory>${project.build.outputDirectory}</directory>
|
||||
<outputDirectory />
|
||||
</fileSet>
|
||||
</fileSets>
|
||||
</assembly>
|
||||
<?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>provided-dependencies</id>
|
||||
<formats>
|
||||
<format>dir</format>
|
||||
</formats>
|
||||
<includeBaseDirectory>false</includeBaseDirectory>
|
||||
<dependencySets>
|
||||
<dependencySet>
|
||||
<scope>provided</scope>
|
||||
<useProjectArtifact>false</useProjectArtifact>
|
||||
</dependencySet>
|
||||
</dependencySets>
|
||||
<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>
|
||||
<includes>
|
||||
<include>pom.xml</include>
|
||||
</includes>
|
||||
<outputDirectory>META-INF/maven/${project.groupId}/${project.artifactId}</outputDirectory>
|
||||
</fileSet>
|
||||
</fileSets>
|
||||
</assembly>
|
||||
|
|
@ -128,7 +128,7 @@
|
|||
<plugin>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<executions>
|
||||
<!-- override the default execution inherited from project -->
|
||||
<!-- overrides the default execution inherited from project -->
|
||||
<execution>
|
||||
<id>jar-with-dependencies</id>
|
||||
<phase>package</phase>
|
||||
|
|
@ -137,7 +137,7 @@
|
|||
</goals>
|
||||
<configuration>
|
||||
<descriptors>
|
||||
<descriptor>core-jar-with-dependencies-descriptor.xml</descriptor>
|
||||
<descriptor>jar-with-dependencies-descriptor.xml</descriptor>
|
||||
</descriptors>
|
||||
</configuration>
|
||||
</execution>
|
||||
|
|
|
|||
|
|
@ -251,23 +251,23 @@
|
|||
<version>2.4</version>
|
||||
<scope>test</scope>
|
||||
</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>
|
||||
<groupId>swank-clojure</groupId>
|
||||
<artifactId>swank-clojure</artifactId>
|
||||
<version>1.2.1</version>
|
||||
<scope>test</scope>
|
||||
<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>
|
||||
<groupId>swank-clojure</groupId>
|
||||
<artifactId>swank-clojure</artifactId>
|
||||
<version>1.2.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
|
@ -409,7 +409,7 @@
|
|||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<additionalJOption>-J-Xmx128m</additionalJOption>
|
||||
<additionalJOption>-J-Xmx256m</additionalJOption>
|
||||
<encoding>${project.build.sourceEncoding}</encoding>
|
||||
<quiet>true</quiet>
|
||||
<links>
|
||||
|
|
@ -628,14 +628,15 @@ pageTracker._trackPageview();
|
|||
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
|
||||
<descriptors>
|
||||
<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>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>${project.groupId}</groupId>
|
||||
<groupId>org.jclouds</groupId>
|
||||
<artifactId>jclouds-assemblies</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
|
|
|
|||
Loading…
Reference in New Issue