Updated pom.xml and bin.xml files to fix assembly id being mandatory after updating maven-assembly-plugin version to 2.2.1
Signed-off-by: Imesh Gunaratne <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ace6d562 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ace6d562 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ace6d562 Branch: refs/heads/master Commit: ace6d562d195856cc95b559e7d91379c6331317a Parents: 50536fc Author: Imesh Gunaratne <[email protected]> Authored: Fri May 2 10:48:02 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Fri May 2 10:56:36 2014 +0530 ---------------------------------------------------------------------- components/org.apache.stratos.cli/pom.xml | 1 + components/org.apache.stratos.cli/src/main/assembly/src.xml | 2 +- extensions/load-balancer/haproxy-extension/pom.xml | 2 +- pom.xml | 1 + products/cartridge-agent/modules/distribution/pom.xml | 2 +- products/load-balancer/modules/distribution/pom.xml | 1 + .../load-balancer/modules/distribution/src/main/assembly/bin.xml | 1 + products/stratos-cli/distribution/pom.xml | 1 + products/stratos-cli/distribution/src/main/assembly/bin.xml | 1 + products/stratos/modules/distribution/pom.xml | 2 ++ 10 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ace6d562/components/org.apache.stratos.cli/pom.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/pom.xml b/components/org.apache.stratos.cli/pom.xml index 119db71..18d01d2 100644 --- a/components/org.apache.stratos.cli/pom.xml +++ b/components/org.apache.stratos.cli/pom.xml @@ -119,6 +119,7 @@ <descriptors> <descriptor>src/main/assembly/src.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ace6d562/components/org.apache.stratos.cli/src/main/assembly/src.xml ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/assembly/src.xml b/components/org.apache.stratos.cli/src/main/assembly/src.xml index ec41ef1..cfaa4da 100644 --- a/components/org.apache.stratos.cli/src/main/assembly/src.xml +++ b/components/org.apache.stratos.cli/src/main/assembly/src.xml @@ -20,7 +20,7 @@ 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>Tool</id> + <id>bin</id> <formats> <format>jar</format> </formats> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ace6d562/extensions/load-balancer/haproxy-extension/pom.xml ---------------------------------------------------------------------- diff --git a/extensions/load-balancer/haproxy-extension/pom.xml b/extensions/load-balancer/haproxy-extension/pom.xml index 3ec1f0f..65d0265 100644 --- a/extensions/load-balancer/haproxy-extension/pom.xml +++ b/extensions/load-balancer/haproxy-extension/pom.xml @@ -85,7 +85,6 @@ </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2.1</version> <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> @@ -95,6 +94,7 @@ <directoryMode>493</directoryMode> <defaultDirectoryMode>493</defaultDirectoryMode> </archiverConfig> + <appendAssemblyId>false</appendAssemblyId> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ace6d562/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c75e237..4ee0938 100644 --- a/pom.xml +++ b/pom.xml @@ -503,6 +503,7 @@ </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> + <version>2.2.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ace6d562/products/cartridge-agent/modules/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/cartridge-agent/modules/distribution/pom.xml b/products/cartridge-agent/modules/distribution/pom.xml index 4ea3289..9c01d6c 100644 --- a/products/cartridge-agent/modules/distribution/pom.xml +++ b/products/cartridge-agent/modules/distribution/pom.xml @@ -68,7 +68,6 @@ </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2.1</version> <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> @@ -78,6 +77,7 @@ <directoryMode>493</directoryMode> <defaultDirectoryMode>493</defaultDirectoryMode> </archiverConfig> + <appendAssemblyId>false</appendAssemblyId> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ace6d562/products/load-balancer/modules/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/load-balancer/modules/distribution/pom.xml b/products/load-balancer/modules/distribution/pom.xml index 14c20e5..05fbd20 100755 --- a/products/load-balancer/modules/distribution/pom.xml +++ b/products/load-balancer/modules/distribution/pom.xml @@ -518,6 +518,7 @@ <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ace6d562/products/load-balancer/modules/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml index ffa2670..dbe5d0b 100755 --- a/products/load-balancer/modules/distribution/src/main/assembly/bin.xml +++ b/products/load-balancer/modules/distribution/src/main/assembly/bin.xml @@ -18,6 +18,7 @@ ~ under the License. --> <assembly> + <id>bin</id> <formats> <format>zip</format> </formats> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ace6d562/products/stratos-cli/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos-cli/distribution/pom.xml b/products/stratos-cli/distribution/pom.xml index 13f9c86..9671f95 100644 --- a/products/stratos-cli/distribution/pom.xml +++ b/products/stratos-cli/distribution/pom.xml @@ -55,6 +55,7 @@ <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ace6d562/products/stratos-cli/distribution/src/main/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/products/stratos-cli/distribution/src/main/assembly/bin.xml b/products/stratos-cli/distribution/src/main/assembly/bin.xml index dc44379..273273a 100644 --- a/products/stratos-cli/distribution/src/main/assembly/bin.xml +++ b/products/stratos-cli/distribution/src/main/assembly/bin.xml @@ -18,6 +18,7 @@ ~ under the License. --> <assembly> + <id>bin</id> <formats> <format>zip</format> </formats> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ace6d562/products/stratos/modules/distribution/pom.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/pom.xml b/products/stratos/modules/distribution/pom.xml index 77d2b7b..f9c7444 100755 --- a/products/stratos/modules/distribution/pom.xml +++ b/products/stratos/modules/distribution/pom.xml @@ -637,6 +637,7 @@ <descriptors> <descriptor>${basedir}/src/assembly/bin.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> </executions> @@ -671,6 +672,7 @@ <descriptors> <descriptor>${basedir}/src/assembly/dist.xml</descriptor> </descriptors> + <appendAssemblyId>false</appendAssemblyId> </configuration> </execution> <execution>
