Repository: camel Updated Branches: refs/heads/master 2427eb336 -> 3098d57fa
Reduce memory while building assembly Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3098d57f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3098d57f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3098d57f Branch: refs/heads/master Commit: 3098d57fae7b5c80288d02b33885025229c8e98c Parents: 2427eb3 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Sep 22 11:37:36 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Sep 22 11:42:19 2016 +0200 ---------------------------------------------------------------------- apache-camel/pom.xml | 35 ++++++++++++++++++++------ apache-camel/src/main/descriptors/src.xml | 2 ++ parent/pom.xml | 2 +- 3 files changed, 30 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3098d57f/apache-camel/pom.xml ---------------------------------------------------------------------- diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml index 5bb8f50..72ecf0c 100644 --- a/apache-camel/pom.xml +++ b/apache-camel/pom.xml @@ -35,6 +35,8 @@ <maven.test.skip>true</maven.test.skip> <createSourcesJar>false</createSourcesJar> <shade.version>1.0.1</shade.version> + <!-- we do not need remote resources in assembly --> + <remoteresources.skip>true</remoteresources.skip> </properties> <dependencies> @@ -832,10 +834,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-spring-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-spring-dm</artifactId> </dependency> <dependency> @@ -1004,10 +1002,6 @@ </dependency> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-zipkin-starter</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-zookeeper</artifactId> </dependency> @@ -2184,6 +2178,30 @@ <build> <plugins> <plugin> + <!-- skip remote resources in assembly is a bit cumbersome to turn off --> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-remote-resources-plugin</artifactId> + <version>${maven-remote-resources-plugin-version}</version> + <executions> + <execution> + <id>process-remote-resources</id> + <goals> + <goal>process</goal> + </goals> + <configuration> + <skip>true</skip> + <attachToTest>false</attachToTest> + <excludeTransitive>true</excludeTransitive> + <includeGroupIds>org.apache.camel</includeGroupIds> + <includeScope>compile</includeScope> + <resourceBundles> + <resourceBundle>org.apache.camel:*:${project.version}</resourceBundle> + </resourceBundles> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> <executions> @@ -2201,6 +2219,7 @@ <finalName>${project.artifactId}-${project.version}</finalName> <appendAssemblyId>false</appendAssemblyId> <tarLongFileMode>gnu</tarLongFileMode> + <recompressZippedFiles>false</recompressZippedFiles> </configuration> </execution> <execution> http://git-wip-us.apache.org/repos/asf/camel/blob/3098d57f/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 dec522a..3201dd8 100644 --- a/apache-camel/src/main/descriptors/src.xml +++ b/apache-camel/src/main/descriptors/src.xml @@ -50,6 +50,8 @@ <exclude>**/*.iws</exclude> <exclude>**/cobertura.ser</exclude> + + <exclude>**/node_modules/**</exclude> </excludes> </fileSet> http://git-wip-us.apache.org/repos/asf/camel/blob/3098d57f/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 1662921..6577f8b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -416,7 +416,7 @@ <maven-jar-plugin-version>2.6</maven-jar-plugin-version> <maven-javadoc-plugin-version>2.9.1</maven-javadoc-plugin-version> <maven-jboss-as-maven-plugin-version>7.7.Final</maven-jboss-as-maven-plugin-version> - <maven-remote-resources-plugin-version>1.4</maven-remote-resources-plugin-version> + <maven-remote-resources-plugin-version>1.5</maven-remote-resources-plugin-version> <!-- resources plugin needed by Camel maven archetypes --> <maven-resources-plugin-version>3.0.1</maven-resources-plugin-version> <maven-reporting-api-version>2.2.1</maven-reporting-api-version>
