merge the two assembly xml files in the dist (DRY)
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b12ebb40 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b12ebb40 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b12ebb40 Branch: refs/heads/master Commit: b12ebb40fa0d3c580489c4e0fd93d1537b3c401f Parents: 1744fbf Author: Alex Heneveld <[email protected]> Authored: Mon Jun 15 11:48:59 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Wed Jun 24 00:40:32 2015 -0700 ---------------------------------------------------------------------- usage/dist/pom.xml | 12 ++- .../main/config/build-distribution-archive.xml | 90 -------------------- .../src/main/config/build-distribution-dir.xml | 90 -------------------- .../dist/src/main/config/build-distribution.xml | 87 +++++++++++++++++++ 4 files changed, 97 insertions(+), 182 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b12ebb40/usage/dist/pom.xml ---------------------------------------------------------------------- diff --git a/usage/dist/pom.xml b/usage/dist/pom.xml index 2fc5268..173dda4 100644 --- a/usage/dist/pom.xml +++ b/usage/dist/pom.xml @@ -84,9 +84,13 @@ <configuration> <appendAssemblyId>true</appendAssemblyId> <descriptors> - <descriptor>src/main/config/build-distribution-dir.xml</descriptor> + <descriptor>src/main/config/build-distribution.xml</descriptor> </descriptors> <finalName>brooklyn</finalName> + <includeBaseDirectory>false</includeBaseDirectory> + <formats> + <format>dir</format> + </formats> </configuration> </execution> <execution> @@ -98,9 +102,13 @@ <configuration> <appendAssemblyId>true</appendAssemblyId> <descriptors> - <descriptor>src/main/config/build-distribution-archive.xml</descriptor> + <descriptor>src/main/config/build-distribution.xml</descriptor> </descriptors> <finalName>brooklyn-${project.version}</finalName> + <formats> + <format>tar.gz</format> + <format>zip</format> + </formats> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b12ebb40/usage/dist/src/main/config/build-distribution-archive.xml ---------------------------------------------------------------------- diff --git a/usage/dist/src/main/config/build-distribution-archive.xml b/usage/dist/src/main/config/build-distribution-archive.xml deleted file mode 100644 index e02cc44..0000000 --- a/usage/dist/src/main/config/build-distribution-archive.xml +++ /dev/null @@ -1,90 +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.2"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> - <id>dist</id> - <formats> - <format>tar.gz</format> - <format>zip</format> - </formats> - <fileSets> - <fileSet> - <directory>${project.basedir}/../..</directory> - <outputDirectory>/</outputDirectory> - <fileMode>0644</fileMode> - <directoryMode>0755</directoryMode> - <includes> - <include>README*</include> - <include>DISCLAIMER*</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.basedir}/src/main/license</directory> - <outputDirectory>/</outputDirectory> - <fileMode>0644</fileMode> - <directoryMode>0755</directoryMode> - </fileSet> - <fileSet> - <directory>${project.basedir}/src/main/dist/bin</directory> - <outputDirectory>/bin</outputDirectory> - <fileMode>0755</fileMode> - <directoryMode>0755</directoryMode> - </fileSet> - <fileSet> - <!-- Add an empty dropins folder (so need to reference an existing dir, and exclude everything) --> - <directory>${project.basedir}/src/main/dist</directory> - <outputDirectory>/lib/dropins</outputDirectory> - <directoryMode>0755</directoryMode> - <excludes> - <exclude>**/*</exclude> - </excludes> - </fileSet> - <fileSet> - <!-- Add an empty patch folder (so need to reference an existing dir, and exclude everything) --> - <directory>${project.basedir}/src/main/dist</directory> - <outputDirectory>/lib/patch</outputDirectory> - <directoryMode>0755</directoryMode> - <excludes> - <exclude>**/*</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>${project.basedir}/src/main/dist</directory> - <outputDirectory>/</outputDirectory> - <fileMode>0644</fileMode> - <directoryMode>0755</directoryMode> - <excludes> - <exclude>bin/*</exclude> - </excludes> - </fileSet> - </fileSets> - <!-- TODO include documentation --> - <!-- TODO include examples --> - <dependencySets> - <dependencySet> - <useProjectArtifact>false</useProjectArtifact> - <outputDirectory>/lib/brooklyn</outputDirectory> - <fileMode>0644</fileMode> - <directoryMode>0755</directoryMode> - <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - </dependencySets> -</assembly> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b12ebb40/usage/dist/src/main/config/build-distribution-dir.xml ---------------------------------------------------------------------- diff --git a/usage/dist/src/main/config/build-distribution-dir.xml b/usage/dist/src/main/config/build-distribution-dir.xml deleted file mode 100644 index c8c238f..0000000 --- a/usage/dist/src/main/config/build-distribution-dir.xml +++ /dev/null @@ -1,90 +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.2"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> - <id>dist</id> - <includeBaseDirectory>false</includeBaseDirectory> - <formats> - <format>dir</format> - </formats> - <fileSets> - <fileSet> - <directory>${project.basedir}/../..</directory> - <outputDirectory>/</outputDirectory> - <fileMode>0644</fileMode> - <directoryMode>0755</directoryMode> - <includes> - <include>README*</include> - <include>DISCLAIMER*</include> - </includes> - </fileSet> - <fileSet> - <directory>${project.basedir}/src/main/license</directory> - <outputDirectory>/</outputDirectory> - <fileMode>0644</fileMode> - <directoryMode>0755</directoryMode> - </fileSet> - <fileSet> - <directory>${project.basedir}/src/main/dist/bin</directory> - <outputDirectory>/bin</outputDirectory> - <fileMode>0755</fileMode> - <directoryMode>0755</directoryMode> - </fileSet> - <fileSet> - <!-- Add an empty dropins folder (so need to reference an existing dir, and exclude everything) --> - <directory>${project.basedir}/src/main/dist</directory> - <outputDirectory>/lib/dropins</outputDirectory> - <directoryMode>0755</directoryMode> - <excludes> - <exclude>**/*</exclude> - </excludes> - </fileSet> - <fileSet> - <!-- Add an empty patch folder (so need to reference an existing dir, and exclude everything) --> - <directory>${project.basedir}/src/main/dist</directory> - <outputDirectory>/lib/patch</outputDirectory> - <directoryMode>0755</directoryMode> - <excludes> - <exclude>**/*</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>${project.basedir}/src/main/dist</directory> - <outputDirectory>/</outputDirectory> - <fileMode>0644</fileMode> - <directoryMode>0755</directoryMode> - <excludes> - <exclude>bin/*</exclude> - </excludes> - </fileSet> - </fileSets> - <!-- TODO include documentation --> - <!-- TODO include examples --> - <dependencySets> - <dependencySet> - <useProjectArtifact>false</useProjectArtifact> - <outputDirectory>/lib/brooklyn</outputDirectory> - <fileMode>0644</fileMode> - <directoryMode>0755</directoryMode> - <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - </dependencySet> - </dependencySets> -</assembly> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b12ebb40/usage/dist/src/main/config/build-distribution.xml ---------------------------------------------------------------------- diff --git a/usage/dist/src/main/config/build-distribution.xml b/usage/dist/src/main/config/build-distribution.xml new file mode 100644 index 0000000..9398150 --- /dev/null +++ b/usage/dist/src/main/config/build-distribution.xml @@ -0,0 +1,87 @@ +<?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.2"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd";> + <id>dist</id> + <formats><!-- empty, intended for caller to specify --></formats> + <fileSets> + <fileSet> + <directory>${project.basedir}/../..</directory> + <outputDirectory>/</outputDirectory> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + <includes> + <include>README*</include> + <include>DISCLAIMER*</include> + </includes> + </fileSet> + <fileSet> + <directory>${project.basedir}/src/main/license</directory> + <outputDirectory>/</outputDirectory> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + <fileSet> + <directory>${project.basedir}/src/main/dist/bin</directory> + <outputDirectory>/bin</outputDirectory> + <fileMode>0755</fileMode> + <directoryMode>0755</directoryMode> + </fileSet> + <fileSet> + <!-- Add an empty dropins folder (so need to reference an existing dir, and exclude everything) --> + <directory>${project.basedir}/src/main/dist</directory> + <outputDirectory>/lib/dropins</outputDirectory> + <directoryMode>0755</directoryMode> + <excludes> + <exclude>**/*</exclude> + </excludes> + </fileSet> + <fileSet> + <!-- Add an empty patch folder (so need to reference an existing dir, and exclude everything) --> + <directory>${project.basedir}/src/main/dist</directory> + <outputDirectory>/lib/patch</outputDirectory> + <directoryMode>0755</directoryMode> + <excludes> + <exclude>**/*</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/src/main/dist</directory> + <outputDirectory>/</outputDirectory> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + <excludes> + <exclude>bin/*</exclude> + </excludes> + </fileSet> + </fileSets> + <!-- TODO include documentation --> + <!-- TODO include examples --> + <dependencySets> + <dependencySet> + <useProjectArtifact>false</useProjectArtifact> + <outputDirectory>/lib/brooklyn</outputDirectory> + <fileMode>0644</fileMode> + <directoryMode>0755</directoryMode> + <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + </dependencySet> + </dependencySets> +</assembly>
