You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2018/01/30 23:44:29 UTC

[17/50] guacamole-client git commit: GUACAMOLE-197: Remove the .tar.gz bundling bits from the source tree, since we won't be distributing binaries.

GUACAMOLE-197: Remove the .tar.gz bundling bits from the source tree, since we won't be distributing binaries.


Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/fd84e761
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/fd84e761
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/fd84e761

Branch: refs/heads/master
Commit: fd84e761b104040ed4f8eb7b3a6afff67050c5ca
Parents: ba837cb
Author: Nick Couchman <ni...@yahoo.com>
Authored: Tue Apr 11 10:30:38 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Mon Jan 29 17:08:10 2018 -0500

----------------------------------------------------------------------
 extensions/guacamole-auth-radius/pom.xml        | 22 --------
 .../src/main/assembly/dist.xml                  | 53 --------------------
 2 files changed, 75 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/fd84e761/extensions/guacamole-auth-radius/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-radius/pom.xml b/extensions/guacamole-auth-radius/pom.xml
index bc373db..921087d 100644
--- a/extensions/guacamole-auth-radius/pom.xml
+++ b/extensions/guacamole-auth-radius/pom.xml
@@ -133,28 +133,6 @@
             </plugin>
 
 
-            <!-- Assembly plugin - for easy distribution -->
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.5.3</version>
-                <configuration>
-                    <finalName>${project.artifactId}-${project.version}</finalName>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <descriptors>
-                        <descriptor>src/main/assembly/dist.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-dist-archive</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <!-- Copy dependencies prior to packaging -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/fd84e761/extensions/guacamole-auth-radius/src/main/assembly/dist.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-radius/src/main/assembly/dist.xml b/extensions/guacamole-auth-radius/src/main/assembly/dist.xml
deleted file mode 100644
index b89fd53..0000000
--- a/extensions/guacamole-auth-radius/src/main/assembly/dist.xml
+++ /dev/null
@@ -1,53 +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">
-    
-    <id>dist</id>
-    <baseDirectory>${project.artifactId}-${project.version}</baseDirectory>
-
-    <!-- Output tar.gz -->
-    <formats>
-        <format>tar.gz</format>
-    </formats>
-
-    <!-- Include licenses and extension .jar -->
-    <fileSets>
-
-        <!-- Include licenses -->
-        <fileSet>
-            <outputDirectory></outputDirectory>
-            <directory>src/licenses</directory>
-        </fileSet>
-
-        <!-- Include extension .jar -->
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-        </fileSet>
-
-    </fileSets>
-
-</assembly>