You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2015/11/09 12:05:58 UTC
[1/2] incubator-brooklyn git commit: Fix eclipse m2e problems
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master ae30539af -> 34142f939
Fix eclipse m2e problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/36a5c5bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/36a5c5bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/36a5c5bd
Branch: refs/heads/master
Commit: 36a5c5bd50f388de6b3e44f761c72b42cd63d937
Parents: ae30539
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Sat Nov 7 18:19:53 2015 -0500
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Sat Nov 7 18:19:53 2015 -0500
----------------------------------------------------------------------
karaf/features/src/main/resources/.gitignore | 4 ++++
karaf/pom.xml | 1 +
parent/pom.xml | 20 +++++---------------
3 files changed, 10 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/36a5c5bd/karaf/features/src/main/resources/.gitignore
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/resources/.gitignore b/karaf/features/src/main/resources/.gitignore
new file mode 100644
index 0000000..894ae26
--- /dev/null
+++ b/karaf/features/src/main/resources/.gitignore
@@ -0,0 +1,4 @@
+# We need a placeholder for src/main/resources to
+# prevent the m2e plugin to complain about missing folder
+!.gitignore
+
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/36a5c5bd/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 99ff41d..25f909f 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -112,6 +112,7 @@
<goals>
<goal>assembly</goal>
<goal>commands-generate-help</goal>
+ <goal>features-generate-descriptor</goal>
</goals>
</pluginExecutionFilter>
<action>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/36a5c5bd/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2c6d7bd..dfef68a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -804,12 +804,8 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
- <groupId>
- org.apache.maven.plugins
- </groupId>
- <artifactId>
- maven-checkstyle-plugin
- </artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
<versionRange>[2.13,)</versionRange>
<goals>
<goal>check</goal>
@@ -830,15 +826,9 @@
-->
<pluginExecution>
<pluginExecutionFilter>
- <groupId>
- org.apache.felix
- </groupId>
- <artifactId>
- maven-bundle-plugin
- </artifactId>
- <versionRange>
- [2.3.4,)
- </versionRange>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <versionRange>[2.3.4,)</versionRange>
<goals>
<goal>manifest</goal>
</goals>
[2/2] incubator-brooklyn git commit: This closes #1008
Posted by sv...@apache.org.
This closes #1008
Fix eclipse m2e problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/34142f93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/34142f93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/34142f93
Branch: refs/heads/master
Commit: 34142f939ca146c06877488550634aa1abd159e3
Parents: ae30539 36a5c5b
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Nov 9 13:05:44 2015 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Nov 9 13:05:44 2015 +0200
----------------------------------------------------------------------
karaf/features/src/main/resources/.gitignore | 4 ++++
karaf/pom.xml | 1 +
parent/pom.xml | 20 +++++---------------
3 files changed, 10 insertions(+), 15 deletions(-)
----------------------------------------------------------------------