[2/2] brooklyn-ui git commit: This closes #80
This closes #80 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/edf16c3c Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/edf16c3c Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/edf16c3c Branch: refs/heads/master Commit: edf16c3c39db9f05be3a13014e20db918c1768dc Parents: 536a6eb b7b6665 Author: Thomas Bouron Authored: Wed Oct 10 06:21:38 2018 +0100 Committer: Thomas Bouron Committed: Wed Oct 10 06:21:38 2018 +0100 -- README.md | 21 - 1 file changed, 20 insertions(+), 1 deletion(-) --
[1/2] brooklyn-ui git commit: Add binary requirement to README
Repository: brooklyn-ui
Updated Branches:
refs/heads/master 536a6eb65 -> edf16c3c3
Add binary requirement to README
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/b7b6665f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/b7b6665f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/b7b6665f
Branch: refs/heads/master
Commit: b7b6665f18f101a7f18764365a9306c5812a9fcd
Parents: c4eb263
Author: Thomas Bouron
Authored: Tue Oct 9 12:55:43 2018 +0100
Committer: Thomas Bouron
Committed: Wed Oct 10 06:14:23 2018 +0100
--
README.md | 21 -
1 file changed, 20 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/b7b6665f/README.md
--
diff --git a/README.md b/README.md
index 2b5dc56..960bfb2 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,26 @@ docker run -i --rm --name brooklyn-ui -v
${HOME}/.m2:/root/.m2 -v ${PWD}:/usr/bu
### Using maven
-This requires maven 3.5.0 or later. With this, simply run:
+You will need the following binaries installed first:
+* `java`
+* `maven` (please note, you will need version 3.5.2 or later)
+* `git`
+* `bzip2`
+* `libpng`. This has different package names based on the distribution:
+ * `libpng-devel` for centos
+ * `libpng-dev` for debian/ubuntu (also requires `libpng12`)
+ * `libpng` for MacOS
+
+_Optional, only if the `libpng` cannot be found_
+* _`automake (opt)`_
+* _`autoconf`_
+* _`libtool`_
+* _`dpkg`_
+* _`pkgconfig`_
+* _`nasm`_
+* _`gcc`_
+
+With this, simply run:
```bash
mvn clean install
[2/2] brooklyn-ui git commit: This closes #81
This closes #81 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/536a6eb6 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/536a6eb6 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/536a6eb6 Branch: refs/heads/master Commit: 536a6eb65e48c21880a3e65a7f0b033e24b83367 Parents: c4eb263 df6b98d Author: Thomas Bouron Authored: Wed Oct 10 06:17:05 2018 +0100 Committer: Thomas Bouron Committed: Wed Oct 10 06:17:05 2018 +0100 -- .../app/components/spec-editor/spec-editor.less | 2 +- ui-modules/utils/autogrow/index.js | 8 ++-- ui-modules/utils/on-enter/index.js | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) --
[1/2] brooklyn-ui git commit: Correct firefox multi-lines issue on configuration text-area in the blueprint composer
Repository: brooklyn-ui
Updated Branches:
refs/heads/master c4eb263fa -> 536a6eb65
Correct firefox multi-lines issue on configuration text-area in the blueprint
composer
- replace white-space "nowrap" by "pre" otherwise firefox doesn't display new
lines
- handle shift+enter (in addition to ctrl+enter and option+enter) to create a
new line
- avoid javascript error when the input is empty and new line is inserted
Signed-off-by: Ludovic Plantin
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/df6b98dd
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/df6b98dd
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/df6b98dd
Branch: refs/heads/master
Commit: df6b98ddc954cc41a31aad4f513c950a31530b79
Parents: c4eb263
Author: Ludovic Plantin
Authored: Tue Oct 9 16:02:19 2018 +0200
Committer: Ludovic Plantin
Committed: Tue Oct 9 16:17:35 2018 +0200
--
.../app/components/spec-editor/spec-editor.less | 2 +-
ui-modules/utils/autogrow/index.js | 8 ++--
ui-modules/utils/on-enter/index.js | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/df6b98dd/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.less
--
diff --git
a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.less
b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.less
index 29bb911..4d8660a 100644
--- a/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.less
+++ b/ui-modules/blueprint-composer/app/components/spec-editor/spec-editor.less
@@ -601,7 +601,7 @@ spec-editor {
}
textarea.auto-grow-multi-row {
// multi-line entries shouldn't wrap
-white-space: nowrap;
+white-space: pre;
}
.collapsing { transition: height 0.15s; }
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/df6b98dd/ui-modules/utils/autogrow/index.js
--
diff --git a/ui-modules/utils/autogrow/index.js
b/ui-modules/utils/autogrow/index.js
index dfe3949..b95d800 100644
--- a/ui-modules/utils/autogrow/index.js
+++ b/ui-modules/utils/autogrow/index.js
@@ -54,11 +54,15 @@ export function autoGrowDirective() {
};
element.bind('keydown keypress', e => {
-if (e.which === 13 && (e.ctrlKey || e.metaKey)) {
+if (e.which === 13 && (e.ctrlKey || e.shiftKey || e.metaKey)) {
e.preventDefault();
e.stopPropagation();
let cursorPosition = element[0].selectionStart;
-ctrl.$setViewValue(ctrl.$modelValue.substring(0,
cursorPosition) + "\n" + ctrl.$modelValue.substring(cursorPosition));
+if (ctrl.$modelValue === undefined) {
+ctrl.$setViewValue("\n");
+} else {
+ctrl.$setViewValue(ctrl.$modelValue.substring(0,
cursorPosition) + "\n" + ctrl.$modelValue.substring(cursorPosition));
+}
ctrl.$render();
scope.$apply(() => {
element[0].selectionEnd = cursorPosition + 1;
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/df6b98dd/ui-modules/utils/on-enter/index.js
--
diff --git a/ui-modules/utils/on-enter/index.js
b/ui-modules/utils/on-enter/index.js
index d146af9..26f787a 100644
--- a/ui-modules/utils/on-enter/index.js
+++ b/ui-modules/utils/on-enter/index.js
@@ -36,7 +36,7 @@ export function onEnterDirective() {
function link(scope, element, attrs) {
element.bind("keydown keypress", event => {
-if (event.which === 13 && !event.ctrlKey && !event.metaKey) {
+if (event.which === 13 && !event.ctrlKey && !event.metaKey &&
!event.shiftKey) {
scope.onEnter(element, event);
}
});
[14/14] brooklyn-server git commit: This closes #1002
This closes #1002 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c7ce1d28 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c7ce1d28 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c7ce1d28 Branch: refs/heads/master Commit: c7ce1d280be31735697b15bca747fcca456b5b69 Parents: 187a9a0 5f13273 Author: Aled Sage Authored: Tue Oct 9 11:34:10 2018 -0700 Committer: Aled Sage Committed: Tue Oct 9 11:34:10 2018 -0700 -- api/pom.xml | 4 +++ camp/camp-server/pom.xml| 8 + .../core/sensor/http/HttpRequestSensor.java | 2 -- .../util/core/flags/MethodCoercions.java| 1 - karaf/features/src/main/feature/feature.xml | 8 + parent/pom.xml | 31 pom.xml | 8 +++-- 7 files changed, 57 insertions(+), 5 deletions(-) --
[04/14] brooklyn-server git commit: Remove unused import
Remove unused import
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/65116a48
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/65116a48
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/65116a48
Branch: refs/heads/master
Commit: 65116a48f26c3b24ef870fe4e6e17a8ed35ab9bd
Parents: 92ef305
Author: Paul Campbell
Authored: Tue Sep 25 14:51:43 2018 +0100
Committer: Paul Campbell
Committed: Tue Sep 25 14:51:43 2018 +0100
--
.../org/apache/brooklyn/core/sensor/http/HttpRequestSensor.java| 2 --
1 file changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/65116a48/core/src/main/java/org/apache/brooklyn/core/sensor/http/HttpRequestSensor.java
--
diff --git
a/core/src/main/java/org/apache/brooklyn/core/sensor/http/HttpRequestSensor.java
b/core/src/main/java/org/apache/brooklyn/core/sensor/http/HttpRequestSensor.java
index a6c73e4..532d6a4 100644
---
a/core/src/main/java/org/apache/brooklyn/core/sensor/http/HttpRequestSensor.java
+++
b/core/src/main/java/org/apache/brooklyn/core/sensor/http/HttpRequestSensor.java
@@ -43,8 +43,6 @@ import com.google.common.base.Function;
import com.google.common.base.Functions;
import com.google.common.base.Supplier;
-import net.minidev.json.JSONObject;
-
/**
* Configurable {@link org.apache.brooklyn.api.entity.EntityInitializer} which
adds an HTTP sensor feed to retrieve the
* {@link JSONObject} from a JSON response in order to populate the sensor
with the data at the {@code jsonPath}.
[02/14] brooklyn-server git commit: Remove unused import
Remove unused import Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/1c0bf3b6 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/1c0bf3b6 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/1c0bf3b6 Branch: refs/heads/master Commit: 1c0bf3b6c5467346fb0cc2a82e9c8675b9755cf8 Parents: 72fb6d7 Author: Paul Campbell Authored: Wed Sep 19 10:35:33 2018 +0100 Committer: Paul Campbell Committed: Thu Sep 20 17:08:50 2018 +0100 -- .../java/org/apache/brooklyn/util/core/flags/MethodCoercions.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/1c0bf3b6/core/src/main/java/org/apache/brooklyn/util/core/flags/MethodCoercions.java -- diff --git a/core/src/main/java/org/apache/brooklyn/util/core/flags/MethodCoercions.java b/core/src/main/java/org/apache/brooklyn/util/core/flags/MethodCoercions.java index a11ef69..e5053e6 100644 --- a/core/src/main/java/org/apache/brooklyn/util/core/flags/MethodCoercions.java +++ b/core/src/main/java/org/apache/brooklyn/util/core/flags/MethodCoercions.java @@ -32,7 +32,6 @@ import org.apache.brooklyn.util.exceptions.Exceptions; import org.apache.brooklyn.util.guava.Maybe; import org.apache.brooklyn.util.javalang.Boxing; import org.apache.brooklyn.util.javalang.Reflections; -import org.omg.CORBA.portable.BoxedValueHelper; import com.google.common.base.Optional; import com.google.common.base.Predicate;
[12/14] brooklyn-server git commit: Revert "Bump jetty from 9.3.24 to 9.4.11 to match karaf 4.2.1"
Revert "Bump jetty from 9.3.24 to 9.4.11 to match karaf 4.2.1"
This reverts commit 84df4c582f95e37115280ed90fd0191107f5480c.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/278f286c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/278f286c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/278f286c
Branch: refs/heads/master
Commit: 278f286cdda4aaa9f6eb7f6d12124260fc023beb
Parents: dbe3a50
Author: Paul Campbell
Authored: Mon Oct 8 13:35:25 2018 +0100
Committer: Paul Campbell
Committed: Mon Oct 8 13:35:25 2018 +0100
--
.../apache/brooklyn/core/test/HttpService.java | 31 +++-
.../launcher/WebAppContextProvider.java | 5 ++--
pom.xml | 2 +-
3 files changed, 14 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/278f286c/core/src/test/java/org/apache/brooklyn/core/test/HttpService.java
--
diff --git a/core/src/test/java/org/apache/brooklyn/core/test/HttpService.java
b/core/src/test/java/org/apache/brooklyn/core/test/HttpService.java
index 2cb53e8..b2ff422 100644
--- a/core/src/test/java/org/apache/brooklyn/core/test/HttpService.java
+++ b/core/src/test/java/org/apache/brooklyn/core/test/HttpService.java
@@ -28,7 +28,10 @@ import java.io.InputStream;
import java.net.InetAddress;
import java.security.KeyStore;
-import org.eclipse.jetty.security.*;
+import org.eclipse.jetty.security.ConstraintMapping;
+import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.security.SecurityHandler;
import org.eclipse.jetty.security.authentication.BasicAuthenticator;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
@@ -89,8 +92,11 @@ public class HttpService {
* Enables basic HTTP authentication on the server.
*/
public HttpService basicAuthentication(String username, String password) {
-final String userRole = "user";
-Constraint constraint = new Constraint(Constraint.__BASIC_AUTH,
userRole);
+HashLoginService l = new HashLoginService();
+l.putUser(username, Credential.getCredential(password), new
String[]{"user"});
+l.setName("test-realm");
+
+Constraint constraint = new Constraint(Constraint.__BASIC_AUTH,
"user");
constraint.setAuthenticate(true);
ConstraintMapping constraintMapping = new ConstraintMapping();
@@ -99,30 +105,15 @@ public class HttpService {
ConstraintSecurityHandler csh = new ConstraintSecurityHandler();
csh.setAuthenticator(new BasicAuthenticator());
-final String realmName = "test-realm";
-csh.setRealmName(realmName);
+csh.setRealmName("test-realm");
csh.addConstraintMapping(constraintMapping);
-csh.setLoginService(createLoginService(realmName, username, password,
new String[]{userRole}));
+csh.setLoginService(l);
this.securityHandler = Optional.of(csh);
return this;
}
-private LoginService createLoginService(
-final String serviceName, final String username, final String
password, final String[] roles) {
-final HashLoginService loginService = new HashLoginService();
-loginService.setName(serviceName);
-loginService.setUserStore(createUserStore(username, password, roles));
-return loginService;
-}
-
-private UserStore createUserStore(final String username, final String
password, final String[] roles) {
-final UserStore userStore = new UserStore();
-userStore.addUser(username, Credential.getCredential(password), roles);
-return userStore;
-}
-
public HttpService start() throws Exception {
TestResourceUnavailableException.throwIfResourceUnavailable(getClass(),
ROOT_WAR_PATH);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/278f286c/launcher/src/main/java/org/apache/brooklyn/launcher/WebAppContextProvider.java
--
diff --git
a/launcher/src/main/java/org/apache/brooklyn/launcher/WebAppContextProvider.java
b/launcher/src/main/java/org/apache/brooklyn/launcher/WebAppContextProvider.java
index 236bf75..840e541 100644
---
a/launcher/src/main/java/org/apache/brooklyn/launcher/WebAppContextProvider.java
+++
b/launcher/src/main/java/org/apache/brooklyn/launcher/WebAppContextProvider.java
@@ -31,6 +31,7 @@ import org.apache.brooklyn.util.core.ResourceUtils;
import org.apache.brooklyn.util.exceptions.Exceptions;
import org.apache.brooklyn.util.os.Os;
import
[08/14] brooklyn-server git commit: Bump jetty from 9.3.24 to 9.4.11 to match karaf 4.2.1
Bump jetty from 9.3.24 to 9.4.11 to match karaf 4.2.1
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/84df4c58
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/84df4c58
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/84df4c58
Branch: refs/heads/master
Commit: 84df4c582f95e37115280ed90fd0191107f5480c
Parents: e009248
Author: Paul Campbell
Authored: Thu Sep 27 13:18:22 2018 +0100
Committer: Paul Campbell
Committed: Thu Sep 27 13:18:22 2018 +0100
--
.../apache/brooklyn/core/test/HttpService.java | 31 +---
.../launcher/WebAppContextProvider.java | 5 ++--
pom.xml | 2 +-
3 files changed, 24 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/84df4c58/core/src/test/java/org/apache/brooklyn/core/test/HttpService.java
--
diff --git a/core/src/test/java/org/apache/brooklyn/core/test/HttpService.java
b/core/src/test/java/org/apache/brooklyn/core/test/HttpService.java
index b2ff422..2cb53e8 100644
--- a/core/src/test/java/org/apache/brooklyn/core/test/HttpService.java
+++ b/core/src/test/java/org/apache/brooklyn/core/test/HttpService.java
@@ -28,10 +28,7 @@ import java.io.InputStream;
import java.net.InetAddress;
import java.security.KeyStore;
-import org.eclipse.jetty.security.ConstraintMapping;
-import org.eclipse.jetty.security.ConstraintSecurityHandler;
-import org.eclipse.jetty.security.HashLoginService;
-import org.eclipse.jetty.security.SecurityHandler;
+import org.eclipse.jetty.security.*;
import org.eclipse.jetty.security.authentication.BasicAuthenticator;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
@@ -92,11 +89,8 @@ public class HttpService {
* Enables basic HTTP authentication on the server.
*/
public HttpService basicAuthentication(String username, String password) {
-HashLoginService l = new HashLoginService();
-l.putUser(username, Credential.getCredential(password), new
String[]{"user"});
-l.setName("test-realm");
-
-Constraint constraint = new Constraint(Constraint.__BASIC_AUTH,
"user");
+final String userRole = "user";
+Constraint constraint = new Constraint(Constraint.__BASIC_AUTH,
userRole);
constraint.setAuthenticate(true);
ConstraintMapping constraintMapping = new ConstraintMapping();
@@ -105,15 +99,30 @@ public class HttpService {
ConstraintSecurityHandler csh = new ConstraintSecurityHandler();
csh.setAuthenticator(new BasicAuthenticator());
-csh.setRealmName("test-realm");
+final String realmName = "test-realm";
+csh.setRealmName(realmName);
csh.addConstraintMapping(constraintMapping);
-csh.setLoginService(l);
+csh.setLoginService(createLoginService(realmName, username, password,
new String[]{userRole}));
this.securityHandler = Optional.of(csh);
return this;
}
+private LoginService createLoginService(
+final String serviceName, final String username, final String
password, final String[] roles) {
+final HashLoginService loginService = new HashLoginService();
+loginService.setName(serviceName);
+loginService.setUserStore(createUserStore(username, password, roles));
+return loginService;
+}
+
+private UserStore createUserStore(final String username, final String
password, final String[] roles) {
+final UserStore userStore = new UserStore();
+userStore.addUser(username, Credential.getCredential(password), roles);
+return userStore;
+}
+
public HttpService start() throws Exception {
TestResourceUnavailableException.throwIfResourceUnavailable(getClass(),
ROOT_WAR_PATH);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/84df4c58/launcher/src/main/java/org/apache/brooklyn/launcher/WebAppContextProvider.java
--
diff --git
a/launcher/src/main/java/org/apache/brooklyn/launcher/WebAppContextProvider.java
b/launcher/src/main/java/org/apache/brooklyn/launcher/WebAppContextProvider.java
index 840e541..236bf75 100644
---
a/launcher/src/main/java/org/apache/brooklyn/launcher/WebAppContextProvider.java
+++
b/launcher/src/main/java/org/apache/brooklyn/launcher/WebAppContextProvider.java
@@ -31,7 +31,6 @@ import org.apache.brooklyn.util.core.ResourceUtils;
import org.apache.brooklyn.util.exceptions.Exceptions;
import org.apache.brooklyn.util.os.Os;
import org.apache.brooklyn.util.text.Identifiers;
-import org.eclipse.jetty.server.SessionManager;
import
[10/14] brooklyn-server git commit: Bump fasterxml, cxf and snakeyaml to work with karaf 4.2.1
Bump fasterxml, cxf and snakeyaml to work with karaf 4.2.1
* fasterxml.jackson from 2.9.6 to 2.9.7
* cxf from 3.1.10 to 3.2.6
* snakeyaml from 1.22.23
Updating cxf required adding exclusions to winrm4j as it has a dependency upon
cxf 3.1.10.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4ddffae3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/4ddffae3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/4ddffae3
Branch: refs/heads/master
Commit: 4ddffae358cdbd7282778ac0ae95f63f9de94579
Parents: f5cb5d9
Author: Paul Campbell
Authored: Mon Oct 1 15:43:44 2018 +0100
Committer: Paul Campbell
Committed: Mon Oct 1 15:43:44 2018 +0100
--
parent/pom.xml | 10 ++
pom.xml | 6 +++---
.../brooklyn/rest/testing/BrooklynRestResourceTest.java | 2 +-
software/base/pom.xml | 5 +
software/winrm/pom.xml | 12
5 files changed, 31 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ddffae3/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index ac90a4a..f9a026b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -235,6 +235,16 @@
com.fasterxml.jackson.dataformat
jackson-dataformat-xml
${fasterxml.jackson.version}
+
+
+com.fasterxml.woodstox
+woodstox-core
+
+
+org.codehaus.woodstox
+stax2-api
+
+
com.fasterxml.jackson.dataformat
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ddffae3/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0aa847f..26dfbb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,8 +116,8 @@
1.1.4c_7
2.3.0_3
-2.9.6
-3.1.10
+2.9.7
+3.2.6
4.5.2
4.4.4
@@ -125,7 +125,7 @@
3.3.2
2.4.15
2.0.1
-1.22
+1.23
1.5.6
2.5
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ddffae3/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java
--
diff --git
a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java
b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java
index 183f3de..49e35c4 100644
---
a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java
+++
b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java
@@ -89,7 +89,7 @@ public abstract class BrooklynRestResourceTest extends
BrooklynRestApiTest {
protected synchronized void startServer() throws Exception {
if (server == null) {
setUpResources();
-JAXRSServerFactoryBean sf =
ResourceUtils.createApplication(createRestApp(), true);
+JAXRSServerFactoryBean sf =
ResourceUtils.createApplication(createRestApp(), true, false, false, null);
if (clientProviders == null) {
clientProviders = sf.getProviders();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ddffae3/software/base/pom.xml
--
diff --git a/software/base/pom.xml b/software/base/pom.xml
index 4260120..6e51e22 100644
--- a/software/base/pom.xml
+++ b/software/base/pom.xml
@@ -104,6 +104,11 @@
org.apache.httpcomponents
httpclient
+
+org.apache.cxf
+cxf-core
+${cxf.version}
+
org.testng
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4ddffae3/software/winrm/pom.xml
--
diff --git a/software/winrm/pom.xml b/software/winrm/pom.xml
index b4a3f7e..a77a9a6 100644
--- a/software/winrm/pom.xml
+++ b/software/winrm/pom.xml
@@ -52,6 +52,18 @@
org.slf4j
slf4j-api
+
+org.apache.cxf
+cxf-rt-transports-http
+
+
+
[06/14] brooklyn-server git commit: Add dependency on Apache geronimo-ws-metadata_2.0_spec in API
Add dependency on Apache geronimo-ws-metadata_2.0_spec in API
Required for the brooklyn-core feature
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/79d0c37d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/79d0c37d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/79d0c37d
Branch: refs/heads/master
Commit: 79d0c37d9e50f95da28235d7e862334326504caa
Parents: c643a50
Author: Paul Campbell
Authored: Thu Sep 27 10:45:49 2018 +0100
Committer: Paul Campbell
Committed: Thu Sep 27 10:48:03 2018 +0100
--
api/pom.xml | 4
karaf/features/src/main/feature/feature.xml | 2 +-
parent/pom.xml | 5 +
pom.xml | 1 +
4 files changed, 11 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/79d0c37d/api/pom.xml
--
diff --git a/api/pom.xml b/api/pom.xml
index c2ad2d6..380176e 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -59,6 +59,10 @@
test
${project.version}
+
+org.apache.geronimo.specs
+geronimo-ws-metadata_2.0_spec
+
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/79d0c37d/karaf/features/src/main/feature/feature.xml
--
diff --git a/karaf/features/src/main/feature/feature.xml
b/karaf/features/src/main/feature/feature.xml
index 3a65c29..996965d 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -150,7 +150,7 @@
mvn:org.eclipse.jetty/jetty-io/${jetty.version}
mvn:org.eclipse.jetty/jetty-server/${jetty.version}
mvn:org.ops4j.pax.web/pax-web-spi/${pax-web.version}
-mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/1.1.3
+mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata_2.0_spec.version}
mvn:com.thoughtworks.xstream/xstream/${xstream.version}
mvn:org.freemarker/freemarker/${freemarker.version}
mvn:com.hierynomus/sshj/${sshj.version}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/79d0c37d/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 226a822..ac90a4a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -75,6 +75,11 @@
${javax.activation.version}
+org.apache.geronimo.specs
+geronimo-ws-metadata_2.0_spec
+${geronimo-ws-metadata_2.0_spec.version}
+
+
ch.qos.logback
logback-classic
${logback.version}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/79d0c37d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5d829fa..443b22d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,6 +220,7 @@
2.2.11
1.1.1
6.0.6
+
1.1.3
[07/14] brooklyn-server git commit: Bump pax-web from 6.0.6 to 7.2.3 to match karaf 4.2.1
Bump pax-web from 6.0.6 to 7.2.3 to match karaf 4.2.1 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e009248f Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e009248f Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e009248f Branch: refs/heads/master Commit: e009248f1231b34d06720f749699df4e83607b92 Parents: 79d0c37 Author: Paul Campbell Authored: Thu Sep 27 12:06:58 2018 +0100 Committer: Paul Campbell Committed: Thu Sep 27 12:06:58 2018 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e009248f/pom.xml -- diff --git a/pom.xml b/pom.xml index 443b22d..706030d 100644 --- a/pom.xml +++ b/pom.xml @@ -219,7 +219,7 @@ 2.2.11 1.1.1 -6.0.6 +7.2.3 1.1.3
[13/14] brooklyn-server git commit: Revert "Bump fasterxml, cxf and snakeyaml to work with karaf 4.2.1"
Revert "Bump fasterxml, cxf and snakeyaml to work with karaf 4.2.1"
This reverts commit 4ddffae358cdbd7282778ac0ae95f63f9de94579.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/5f132735
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/5f132735
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/5f132735
Branch: refs/heads/master
Commit: 5f132735950675cca8a00112c84fe69041ba53bc
Parents: 278f286
Author: Paul Campbell
Authored: Mon Oct 8 13:35:39 2018 +0100
Committer: Paul Campbell
Committed: Mon Oct 8 13:35:39 2018 +0100
--
parent/pom.xml | 10 --
pom.xml | 6 +++---
.../brooklyn/rest/testing/BrooklynRestResourceTest.java | 2 +-
software/base/pom.xml | 5 -
software/winrm/pom.xml | 12
5 files changed, 4 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5f132735/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 9f6f1f8..e1b3737 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -235,16 +235,6 @@
com.fasterxml.jackson.dataformat
jackson-dataformat-xml
${fasterxml.jackson.version}
-
-
-com.fasterxml.woodstox
-woodstox-core
-
-
-org.codehaus.woodstox
-stax2-api
-
-
com.fasterxml.jackson.dataformat
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5f132735/pom.xml
--
diff --git a/pom.xml b/pom.xml
index df69f6f..eb92edb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,8 +116,8 @@
1.1.4c_7
2.3.0_3
-2.9.7
-3.2.6
+2.9.6
+3.1.10
4.5.2
4.4.4
@@ -125,7 +125,7 @@
3.3.2
2.4.15
2.0.1
-1.23
+1.22
1.5.6
2.5
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5f132735/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java
--
diff --git
a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java
b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java
index 49e35c4..183f3de 100644
---
a/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java
+++
b/rest/rest-resources/src/test/java/org/apache/brooklyn/rest/testing/BrooklynRestResourceTest.java
@@ -89,7 +89,7 @@ public abstract class BrooklynRestResourceTest extends
BrooklynRestApiTest {
protected synchronized void startServer() throws Exception {
if (server == null) {
setUpResources();
-JAXRSServerFactoryBean sf =
ResourceUtils.createApplication(createRestApp(), true, false, false, null);
+JAXRSServerFactoryBean sf =
ResourceUtils.createApplication(createRestApp(), true);
if (clientProviders == null) {
clientProviders = sf.getProviders();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5f132735/software/base/pom.xml
--
diff --git a/software/base/pom.xml b/software/base/pom.xml
index 6e51e22..4260120 100644
--- a/software/base/pom.xml
+++ b/software/base/pom.xml
@@ -104,11 +104,6 @@
org.apache.httpcomponents
httpclient
-
-org.apache.cxf
-cxf-core
-${cxf.version}
-
org.testng
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5f132735/software/winrm/pom.xml
--
diff --git a/software/winrm/pom.xml b/software/winrm/pom.xml
index a77a9a6..b4a3f7e 100644
--- a/software/winrm/pom.xml
+++ b/software/winrm/pom.xml
@@ -52,18 +52,6 @@
org.slf4j
slf4j-api
-
-org.apache.cxf
-cxf-rt-transports-http
-
-
-org.apache.cxf
-cxf-rt-transports-http-hc
-
-
-
[09/14] brooklyn-server git commit: Keep karaf-maven-plugin on 4.1.4
Keep karaf-maven-plugin on 4.1.4
https://issues.apache.org/jira/browse/KARAF-5932
Bug introduced in 4.1.5 and not fixed until 4.2.2.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f5cb5d99
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f5cb5d99
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f5cb5d99
Branch: refs/heads/master
Commit: f5cb5d999068799cce0eba6bc8a9a6fac0eb1090
Parents: 84df4c5
Author: Paul Campbell
Authored: Mon Oct 1 09:41:12 2018 +0100
Committer: Paul Campbell
Committed: Mon Oct 1 09:44:01 2018 +0100
--
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f5cb5d99/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 4496e0d..0aa847f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,7 +163,7 @@
4.2.1
-${karaf.version}
+4.1.4
5.6.10
9.4.11.v20180605
[11/14] brooklyn-server git commit: Allow apache-rat-pluin to work when building single modules
Allow apache-rat-pluin to work when building single modules
The configuration for apache-rat-plugin excludes the '**/target/**' path.
However, when building a single module, the basedir that the plugin uses by
default is the modules' target directory. The exclude signature for target
doesn't match, as it would be attempting to match a target directory under the
target directory itself. This works when building from a multi-module directory,
e.g. brooklyn or brooklyn-server, as the basedir in this case is not the target
directory.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/dbe3a50d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/dbe3a50d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/dbe3a50d
Branch: refs/heads/master
Commit: dbe3a50dda1868fd92ea84b70cecde65e2b23dd8
Parents: 4ddffae
Author: Paul Campbell
Authored: Wed Oct 3 14:21:56 2018 +0100
Committer: Paul Campbell
Committed: Wed Oct 3 14:21:56 2018 +0100
--
parent/pom.xml | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/dbe3a50d/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index f9a026b..9f6f1f8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1090,6 +1090,7 @@
so that the child pom entries replace the parent entries
-->
+${project.basedir}
sandbox/**
[05/14] brooklyn-server git commit: Add required dependencies to karaf feature.xml
Add required dependencies to karaf feature.xml
With Karaf 4.2.x, these dependencies are not included automatically for some
reason, so need to be explicitly defined.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c643a501
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c643a501
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c643a501
Branch: refs/heads/master
Commit: c643a5010885db59aeca7dca82eedc3254b51f45
Parents: 65116a4
Author: Paul Campbell
Authored: Wed Sep 26 11:13:20 2018 +0100
Committer: Paul Campbell
Committed: Wed Sep 26 11:45:22 2018 +0100
--
karaf/features/src/main/feature/feature.xml | 8
parent/pom.xml | 5 +
pom.xml | 1 +
3 files changed, 14 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c643a501/karaf/features/src/main/feature/feature.xml
--
diff --git a/karaf/features/src/main/feature/feature.xml
b/karaf/features/src/main/feature/feature.xml
index ca60ad8..3a65c29 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -143,6 +143,14 @@
mvn:com.fasterxml.jackson.core/jackson-annotations/${fasterxml.jackson.version}
mvn:net.minidev/json-smart/${jsonSmart.version}
mvn:net.minidev/accessors-smart/${minidev.accessors-smart.version}
+mvn:org.ow2.asm/asm/${ow2.asm.version}
+mvn:org.eclipse.jetty/jetty-client/${jetty.version}
+mvn:org.eclipse.jetty/jetty-http/${jetty.version}
+mvn:org.eclipse.jetty/jetty-util/${jetty.version}
+mvn:org.eclipse.jetty/jetty-io/${jetty.version}
+mvn:org.eclipse.jetty/jetty-server/${jetty.version}
+mvn:org.ops4j.pax.web/pax-web-spi/${pax-web.version}
+mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/1.1.3
mvn:com.thoughtworks.xstream/xstream/${xstream.version}
mvn:org.freemarker/freemarker/${freemarker.version}
mvn:com.hierynomus/sshj/${sshj.version}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c643a501/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 683e2fe..226a822 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -572,6 +572,11 @@
openshift-client
${kubernetes-client.version}
+
+org.ops4j.pax.web
+pax-web-spi
+${pax-web.version}
+
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c643a501/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 8f93924..5d829fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -219,6 +219,7 @@
2.2.11
1.1.1
+6.0.6
[01/14] brooklyn-server git commit: Use non-jdk versions of JAXB and JAva Activation
Repository: brooklyn-server
Updated Branches:
refs/heads/master 187a9a03b -> c7ce1d280
Use non-jdk versions of JAXB and JAva Activation
JAXB and Java Activation are no longer bundled as part of JDK 9.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/72fb6d70
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/72fb6d70
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/72fb6d70
Branch: refs/heads/master
Commit: 72fb6d70961876b7ba74716260ac54bc552ebbf0
Parents: e27cc7b
Author: Paul Campbell
Authored: Tue Sep 18 10:49:28 2018 +0100
Committer: Paul Campbell
Committed: Thu Sep 20 16:42:34 2018 +0100
--
camp/camp-server/pom.xml | 8
parent/pom.xml | 20
pom.xml | 2 ++
3 files changed, 30 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/72fb6d70/camp/camp-server/pom.xml
--
diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml
index 175eb57..bc97c84 100644
--- a/camp/camp-server/pom.xml
+++ b/camp/camp-server/pom.xml
@@ -38,6 +38,14 @@
+javax.xml.bind
+jaxb-api
+
+
+javax.activation
+activation
+
+
org.apache.brooklyn.camp
camp-base
${project.version}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/72fb6d70/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index cf6e105..683e2fe 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -55,6 +55,26 @@
+javax.xml.bind
+jaxb-api
+${jaxb.version}
+
+
+com.sun.xml.bind
+jaxb-core
+${jaxb.version}
+
+
+com.sun.xml.bind
+jaxb-impl
+${jaxb.version}
+
+
+javax.activation
+activation
+${javax.activation.version}
+
+
ch.qos.logback
logback-classic
${logback.version}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/72fb6d70/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 30eeaf7..c4161a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -217,6 +217,8 @@
1.7
1.8.4
+2.2.11
+1.1.1
[03/14] brooklyn-server git commit: Bump karaf from 4.1.6 to 4.2.1
Bump karaf from 4.1.6 to 4.2.1
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/92ef3053
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/92ef3053
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/92ef3053
Branch: refs/heads/master
Commit: 92ef30532bd3cd91b73c8f1667c19a0b078eeceb
Parents: 1c0bf3b
Author: Paul Campbell
Authored: Wed Sep 19 17:31:17 2018 +0100
Committer: Paul Campbell
Committed: Fri Sep 21 11:47:07 2018 +0100
--
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/92ef3053/pom.xml
--
diff --git a/pom.xml b/pom.xml
index c4161a1..8f93924 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,8 +162,8 @@
1.4.27
-4.1.6
-4.1.6
+4.2.1
+${karaf.version}
5.6.10
9.3.24.v20180605
[2/2] brooklyn-server git commit: This closes #1007
This closes #1007 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/187a9a03 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/187a9a03 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/187a9a03 Branch: refs/heads/master Commit: 187a9a03beea820c36fae1474e8f6657490fff47 Parents: c3d71a2 83a6332 Author: Thomas Bouron Authored: Tue Oct 9 15:09:33 2018 +0100 Committer: Thomas Bouron Committed: Tue Oct 9 15:09:33 2018 +0100 -- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[1/2] brooklyn-server git commit: Fix a bad-formatted title in readme
Repository: brooklyn-server
Updated Branches:
refs/heads/master c3d71a2e9 -> 187a9a03b
Fix a bad-formatted title in readme
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/83a63328
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/83a63328
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/83a63328
Branch: refs/heads/master
Commit: 83a63328ea1937b0f985afdabce88a6322828ab8
Parents: c3d71a2
Author: Clément Collin
Authored: Mon Oct 8 16:59:19 2018 +0200
Committer: GitHub
Committed: Mon Oct 8 16:59:19 2018 +0200
--
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/83a63328/README.md
--
diff --git a/README.md b/README.md
index 4613948..c2b610d 100644
--- a/README.md
+++ b/README.md
@@ -25,10 +25,10 @@ Then run the build:
docker run -i --rm --name brooklyn-server -v ${HOME}/.m2:/root/.m2 -v
${PWD}:/usr/build -w /usr/build brooklyn:server mvn clean install
```
-### Using maven
+ Using maven
Simply run:
```bash
mvn clean install
-```
\ No newline at end of file
+```
