You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2016/03/09 14:27:19 UTC
directory-fortress-realm git commit: remove the custom assembly
Repository: directory-fortress-realm
Updated Branches:
refs/heads/master 97a6a768e -> 79547ca7c
remove the custom assembly
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/commit/79547ca7
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/tree/79547ca7
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/diff/79547ca7
Branch: refs/heads/master
Commit: 79547ca7c6e92a2f2b8e449ba6cc5cc8c73261d3
Parents: 97a6a76
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Mar 8 11:48:25 2016 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Mar 8 11:48:25 2016 -0600
----------------------------------------------------------------------
pom.xml | 20 ------------
src/main/assembly/distsrc.xml | 65 --------------------------------------
2 files changed, 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/blob/79547ca7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a4e689e..84b3adf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -245,25 +245,6 @@
</pluginManagement>
<plugins>
- <!-- Assemble a realm distro archive -->
- <!-- plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/distsrc.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin-->
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -557,7 +538,6 @@
<execution>
<id>source-release-assembly</id>
<configuration>
- <!-- we have a dedicated distribution module -->
<skipAssembly>false</skipAssembly>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/directory-fortress-realm/blob/79547ca7/src/main/assembly/distsrc.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/distsrc.xml b/src/main/assembly/distsrc.xml
deleted file mode 100644
index de942d9..0000000
--- a/src/main/assembly/distsrc.xml
+++ /dev/null
@@ -1,65 +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/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/xsd/assembly-1.1.1.xsd">
- <id>dist</id>
- <formats>
- <format>jar</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>.</directory>
- <includes>
- <include>pom.xml</include>
- <include>TOMCAT-SETUP-NOTES.txt</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- <excludes>
- <exclude>**/target/</exclude>
- <exclude>**/*.log</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>conf</directory>
- <outputDirectory>conf</outputDirectory>
- <excludes>
- <exclude>*.properties</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>impl</directory>
- <outputDirectory>impl</outputDirectory>
- <excludes>
- <exclude>**/target/</exclude>
- <exclude>**/*.log</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>proxy</directory>
- <outputDirectory>proxy</outputDirectory>
- <excludes>
- <exclude>**/target/</exclude>
- <exclude>**/*.log</exclude>
- </excludes>
- </fileSet>
- </fileSets>
-</assembly>
\ No newline at end of file