From 3b2784aee10dedd3fa61337b939b163349fc1453 Mon Sep 17 00:00:00 2001
From: Kiuby88 <kiuby88.programming@gmail.com>
Date: Fri, 4 Sep 2015 12:50:44 +0200
Subject: [PATCH] Fix the jar-with-dependencies building.

The assembly descriptor is deleted and the jar is built using a
predefined descriptor.
---
 compute-basics/pom.xml                        | 13 +++---
 .../main/assembly/jar-with-dependencies.xml   | 42 -------------------
 2 files changed, 5 insertions(+), 50 deletions(-)
 delete mode 100644 compute-basics/src/main/assembly/jar-with-dependencies.xml

diff --git a/compute-basics/pom.xml b/compute-basics/pom.xml
index 7355ccb1..b1429f93 100644
--- a/compute-basics/pom.xml
+++ b/compute-basics/pom.xml
@@ -125,23 +125,20 @@
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2.1</version>
         <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/jar-with-dependencies.xml</descriptor>
-          </descriptors>
           <archive>
             <manifest>
+              <addClasspath>true</addClasspath>
               <mainClass>org.jclouds.examples.compute.basics.MainApp</mainClass>
             </manifest>
-            <manifestEntries>
-              <Class-Path>bcprov-jdk16.jar</Class-Path>
-            </manifestEntries>
           </archive>
+            <descriptorRefs>
+              <descriptorRef>jar-with-dependencies</descriptorRef>
+            </descriptorRefs>
         </configuration>
         <executions>
           <execution>
-            <id>make-assembly</id>
+            <id>make-my-jar-with-dependencies</id>
             <phase>package</phase>
             <goals>
               <goal>single</goal>
diff --git a/compute-basics/src/main/assembly/jar-with-dependencies.xml b/compute-basics/src/main/assembly/jar-with-dependencies.xml
deleted file mode 100644
index aaa208c1..00000000
--- a/compute-basics/src/main/assembly/jar-with-dependencies.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You 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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-  <!-- copied from jar-with-dependencies (http://maven.apache.org/plugins/maven-assembly-plugin/descriptor-refs.html#jar-with-dependencies) -->
-  <id>jar-with-dependencies</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <containerDescriptorHandlers>
-    <containerDescriptorHandler>
-      <handlerName>metaInf-services</handlerName>
-    </containerDescriptorHandler>
-  </containerDescriptorHandlers>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/</outputDirectory>
-      <useProjectArtifact>true</useProjectArtifact>
-      <unpack>true</unpack>
-      <scope>runtime</scope>
-    </dependencySet>
-  </dependencySets>
-</assembly>
\ No newline at end of file