You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2016/01/25 21:44:48 UTC
[10/26] servicemix git commit: SM-2803: Refactor the assembly creation
SM-2803: Refactor the assembly creation
- assembly definition structure simplified
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/13c9b818
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/13c9b818
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/13c9b818
Branch: refs/heads/master
Commit: 13c9b8184706116f885c2999896e149113b8f2a6
Parents: 4c070f8
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Thu Jan 14 23:35:52 2016 +0100
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Thu Jan 14 23:35:52 2016 +0100
----------------------------------------------------------------------
.../src/main/descriptors/unix-bin.xml | 1 -
.../src/main/resources/common-bin.xml | 31 --------------------
.../src/main/resources/common-unix-bin.xml | 12 ++++++++
3 files changed, 12 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/13c9b818/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml b/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
index 22ab142..1b478ef 100644
--- a/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
+++ b/assemblies/apache-servicemix/src/main/descriptors/unix-bin.xml
@@ -23,7 +23,6 @@
</formats>
<componentDescriptors>
- <componentDescriptor>${project.build.outputDirectory}/common-bin.xml</componentDescriptor>
<componentDescriptor>${project.build.outputDirectory}/common-unix-bin.xml</componentDescriptor>
<componentDescriptor>${project.build.outputDirectory}/examples-unix-bin.xml</componentDescriptor>
</componentDescriptors>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/13c9b818/assemblies/apache-servicemix/src/main/resources/common-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/common-bin.xml b/assemblies/apache-servicemix/src/main/resources/common-bin.xml
deleted file mode 100644
index f8a49f0..0000000
--- a/assemblies/apache-servicemix/src/main/resources/common-bin.xml
+++ /dev/null
@@ -1,31 +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.
--->
-<component>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <outputFileNameMapping>servicemix-version.jar</outputFileNameMapping>
- <fileMode>0644</fileMode>
- <includes>
- <include>org.apache.servicemix:org.apache.servicemix.branding</include>
- </includes>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- </dependencySet>
- </dependencySets>
-</component>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/13c9b818/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml b/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
index 6ce6513..236ba90 100644
--- a/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
+++ b/assemblies/apache-servicemix/src/main/resources/common-unix-bin.xml
@@ -135,4 +135,16 @@
</file>
</files>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <outputFileNameMapping>servicemix-version.jar</outputFileNameMapping>
+ <fileMode>0644</fileMode>
+ <includes>
+ <include>org.apache.servicemix:org.apache.servicemix.branding</include>
+ </includes>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
+ </dependencySets>
+
</component>
\ No newline at end of file