Merge branch 'master' of https://github.com/buddycloud/buddycloud-server-java into issues/243

Conflicts:
	pom.xml

Author: garethf

.travis.yml

@@ -3,12 +3,4 @@ jdk:
   - oraclejdk7
   - openjdk6
   - openjdk7
-  
-  
-env: 
-  global: 
-    - MAVEN_URL=http://apache.mirrors.pair.com/maven/maven-3/3.0.5/binaries/apache-maven-3.0.5-bin.tar.gz 
-install:
-  - wget -O - $MAVEN_URL | sudo tar xvz -C /usr/local 
-  - sudo rm /usr/local/maven
-  - sudo ln -s /usr/local/apache-maven-3.0.5 /usr/local/maven
+

pom.xml

@@ -155,13 +155,6 @@
             <url>file:${project.basedir}/repo</url>
         </repository>
     </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>evgenyg</id>
-            <name>Evgeny Goldin repo</name>
-            <url>http://evgenyg.artifactoryonline.com/evgenyg/repo/com/github/goldin/</url>
-        </pluginRepository>
-    </pluginRepositories>
     <build>
         <pluginManagement>
             <plugins>
@@ -229,56 +222,28 @@
                         <target>1.6</target>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <configuration>
-                        <archive>
-                            <manifest>
-                                <mainClass>org.buddycloud.channelserver.Main</mainClass>
-                            </manifest>
-                        </archive>
-                        <descriptorRefs>
-                            <descriptorRef>${project.build.withDependencies}</descriptorRef>
-                        </descriptorRefs>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>jar-with-dependencies</id>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>single</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>com.github.goldin</groupId>
-                    <artifactId>copy-maven-plugin</artifactId>
-                    <version>0.2.5</version>
-                    <executions>
-                        <execution>
-                            <id>create-archive</id>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>copy</goal>
-                            </goals>
-                            <configuration>
-                                <resources>
-                                    <resource>
-                                        <targetPath>${project.build.directory}</targetPath>
-                                        <file>target/${project.build.finalName}.jar</file>
-                                        <destFileName>${project.artifactId}.jar</destFileName>
-                                    </resource>
-                                    <resource>
-                                        <targetPath>${project.build.directory}</targetPath>
-                                        <file>${project.build.directory}/${project.build.finalName}-${project.build.withDependencies}.jar</file>
-                                        <destFileName>${project.artifactId}-${project.build.withDependencies}.jar</destFileName>
-                                    </resource>
-                                </resources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <outputFile>${project.build.directory}/${project.build.finalName}-${project.build.withDependencies}.jar</outputFile>
+                    <transformers>
+                        <transformer
+                            implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                            <mainClass>org.buddycloud.channelserver.Main</mainClass>
+                        </transformer>
+                    </transformers>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>