camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject camel git commit: CAMEL-9743: Apache Camel distro - Only keep camel JARs
Date Sun, 03 Apr 2016 09:14:38 GMT
Repository: camel
Updated Branches:
  refs/heads/master 0e0496f59 -> 431ee2bdb


CAMEL-9743: Apache Camel distro - Only keep camel JARs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/431ee2bd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/431ee2bd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/431ee2bd

Branch: refs/heads/master
Commit: 431ee2bdb1005618ea2e092566254dff3089ebef
Parents: 0e0496f
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sun Apr 3 11:14:23 2016 +0200
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sun Apr 3 11:14:23 2016 +0200

----------------------------------------------------------------------
 apache-camel/pom.xml                            | 80 ++++++++++----------
 .../src/main/descriptors/common-bin.xml         | 11 ---
 apache-camel/src/main/descriptors/src.xml       |  1 +
 apache-camel/src/main/descriptors/unix-bin.xml  |  1 +
 .../src/main/descriptors/windows-bin.xml        |  1 +
 5 files changed, 43 insertions(+), 51 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/431ee2bd/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 34d0f8e..f293809 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -38,7 +38,7 @@
   </properties>
 
   <dependencies>
-	<!-- camel components -->
+	   <!-- camel components -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
@@ -1028,44 +1028,44 @@
     </dependency>
   </dependencies>
 
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>bin</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <descriptors>
-                    <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
-                    <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
-                  </descriptors>
-                  <finalName>${project.artifactId}-${project.version}</finalName>
-                  <appendAssemblyId>false</appendAssemblyId>
-                  <tarLongFileMode>gnu</tarLongFileMode>
-                </configuration>
-              </execution>
-              <execution>
-                <id>src</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <descriptors>
-                    <descriptor>src/main/descriptors/src.xml</descriptor>
-	              </descriptors>
-                  <tarLongFileMode>gnu</tarLongFileMode>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>bin</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
+                <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
+              </descriptors>
+              <finalName>${project.artifactId}-${project.version}</finalName>
+              <appendAssemblyId>false</appendAssemblyId>
+              <tarLongFileMode>gnu</tarLongFileMode>
+            </configuration>
+          </execution>
+          <execution>
+            <id>src</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <descriptors>
+                <descriptor>src/main/descriptors/src.xml</descriptor>
+              </descriptors>
+              <tarLongFileMode>gnu</tarLongFileMode>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>

http://git-wip-us.apache.org/repos/asf/camel/blob/431ee2bd/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 40bff7c..162fedc 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -255,17 +255,6 @@
         <include>org.apache.camel:camel-commands-jolokia</include>
         <include>org.apache.camel:camel-commands-spring-boot</include>
         <include>org.apache.camel.karaf:camel-karaf-commands</include>
-        <!-- this jar is mandatory -->
-        <include>org.slf4j:slf4j-api</include>
-      </includes>
-    </dependencySet>
-    <!-- this is needed for the jasypt tooling -->
-    <dependencySet>
-      <outputDirectory>/lib/optional</outputDirectory>
-      <unpack>false</unpack>
-      <scope>runtime</scope>
-      <includes>
-        <include>org.jasypt:jasypt</include>
       </includes>
     </dependencySet>
   </dependencySets>

http://git-wip-us.apache.org/repos/asf/camel/blob/431ee2bd/apache-camel/src/main/descriptors/src.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/src.xml b/apache-camel/src/main/descriptors/src.xml
index beb9610..dec522a 100644
--- a/apache-camel/src/main/descriptors/src.xml
+++ b/apache-camel/src/main/descriptors/src.xml
@@ -44,6 +44,7 @@
         <exclude>**/surefire*</exclude>
         <exclude>**/svn-commit*</exclude>
 
+        <exclude>**/.idea/**</exclude>
         <exclude>**/*.iml</exclude>
         <exclude>**/*.ipr</exclude>
         <exclude>**/*.iws</exclude>

http://git-wip-us.apache.org/repos/asf/camel/blob/431ee2bd/apache-camel/src/main/descriptors/unix-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/unix-bin.xml b/apache-camel/src/main/descriptors/unix-bin.xml
index 67eb8a8..cb5e9c4 100644
--- a/apache-camel/src/main/descriptors/unix-bin.xml
+++ b/apache-camel/src/main/descriptors/unix-bin.xml
@@ -39,6 +39,7 @@
       <excludes>
         <!-- disable build, IDEA and Eclipse files -->
         <exclude>**/*.i??</exclude>
+        <exclude>**/.idea/**</exclude>
         <exclude>**/eclipse-classes/**</exclude>
         <exclude>**/.project</exclude>
         <exclude>**/.classpath</exclude>

http://git-wip-us.apache.org/repos/asf/camel/blob/431ee2bd/apache-camel/src/main/descriptors/windows-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/windows-bin.xml b/apache-camel/src/main/descriptors/windows-bin.xml
index 27627cc..90c88aa 100644
--- a/apache-camel/src/main/descriptors/windows-bin.xml
+++ b/apache-camel/src/main/descriptors/windows-bin.xml
@@ -39,6 +39,7 @@
       <excludes>
         <!-- disable build, IDEA and Eclipse files -->
         <exclude>**/*.i??</exclude>
+        <exclude>**/.idea/**</exclude>
         <exclude>**/eclipse-classes/**</exclude>
         <exclude>**/.project</exclude>
         <exclude>**/.classpath</exclude>


Mime
View raw message