You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2016/11/16 12:17:59 UTC
[1/3] brooklyn-server git commit: Set default JVM memory settings for
the build
Repository: brooklyn-server
Updated Branches:
refs/heads/master 37986c725 -> 8735a0a56
Set default JVM memory settings for the build
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3fae3630
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3fae3630
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3fae3630
Branch: refs/heads/master
Commit: 3fae36300e4b606ee1c9a60982c1d1d4687cce48
Parents: 9b24f7d
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Nov 15 09:17:07 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Nov 15 09:17:07 2016 +0200
----------------------------------------------------------------------
.mvn/jvm.config | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3fae3630/.mvn/jvm.config
----------------------------------------------------------------------
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
new file mode 100644
index 0000000..af5fbd1
--- /dev/null
+++ b/.mvn/jvm.config
@@ -0,0 +1 @@
+-Xmx1024m -Xms512m -XX:MaxPermSize=256m
[3/3] brooklyn-server git commit: This closes #436
Posted by sj...@apache.org.
This closes #436
Set default JVM memory settings for the build
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/8735a0a5
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/8735a0a5
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/8735a0a5
Branch: refs/heads/master
Commit: 8735a0a56c49f6408584f3fc37606ce49d744a75
Parents: 37986c7 83e9e75
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Wed Nov 16 12:16:42 2016 +0000
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed Nov 16 12:16:42 2016 +0000
----------------------------------------------------------------------
.mvn/jvm.config | 1 +
parent/pom.xml | 21 +++++++++------------
2 files changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[2/3] brooklyn-server git commit: Exclude .mvn/jvm.config from rat
checks
Posted by sj...@apache.org.
Exclude .mvn/jvm.config from rat checks
Also merge pluginManagement in the project configuration for rat-plugin
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/83e9e755
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/83e9e755
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/83e9e755
Branch: refs/heads/master
Commit: 83e9e755c259a9166d800bfa19ad600867467472
Parents: 3fae363
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Nov 15 14:07:10 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Nov 15 14:07:10 2016 +0200
----------------------------------------------------------------------
parent/pom.xml | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/83e9e755/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index defb676..c19d44e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -728,18 +728,6 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.11</version>
- <configuration>
- <excludes combine.children="append">
- <!-- Exclude sandbox because not part of distribution: not in tgz, and not uploaded to maven-central -->
- <exclude>sandbox/**</exclude>
- <!-- Exclude release because not part of distribution: not in tgz, and not uploaded to maven-central -->
- <exclude>release/**</exclude>
- <exclude>README.md</exclude>
- <!-- Exclude netbeans config files (not part of the project, but often on users' drives -->
- <exclude>**/nbactions.xml</exclude>
- <exclude>**/nb-configuration.xml</exclude>
- </excludes>
- </configuration>
</plugin>
<!-- This is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
@@ -1043,6 +1031,11 @@
so that the child pom entries replace the parent entries
-->
<excludes combine.children="append">
+ <!-- Exclude sandbox because not part of distribution: not in tgz, and not uploaded to maven-central -->
+ <exclude>sandbox/**</exclude>
+ <!-- Exclude release because not part of distribution: not in tgz, and not uploaded to maven-central -->
+ <exclude>release/**</exclude>
+ <exclude>README.md</exclude>
<!-- git and IDE project files -->
<!-- see https://issues.apache.org/jira/browse/RAT-107 -->
<exclude>**/.git/**</exclude>
@@ -1056,9 +1049,13 @@
<exclude>**/*.log</exclude>
<exclude>**/brooklyn*.log.*</exclude>
<exclude>**/target/**</exclude>
+ <!-- Exclude netbeans config files (not part of the project, but often on users' drives -->
+ <exclude>**/nbactions.xml</exclude>
+ <exclude>**/nb-configuration.xml</exclude>
<!-- files not requiring licence -->
<exclude>ignored/**</exclude>
<exclude>LICENSE.md</exclude>
+ <exclude>.mvn/jvm.config</exclude>
<exclude>**/src/main/license/**</exclude>
<exclude>**/src/test/license/**</exclude>
<exclude>**/MANIFEST.MF</exclude>