[brooklyn-server] 04/04: This closes #1034
This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git commit 4f7a1228494436f2a05f9275f74c0603ace12fa4 Merge: 0aed8ba f48722c Author: Alex Heneveld AuthorDate: Thu Jan 31 10:08:23 2019 + This closes #1034 pom.xml| 16 software/winrm/pom.xml | 28 2 files changed, 8 insertions(+), 36 deletions(-)
[brooklyn-server] 02/04: winrm4j: remove exclusions
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 96b0c048103e67518cb9e7d9ee781532d485bbaa
Author: Aled Sage
AuthorDate: Wed Jan 30 18:59:38 2019 +
winrm4j: remove exclusions
These are no longer needed - versions now match with winrm4j 0.6.1
(with cxf 3.2.7).
---
software/winrm/pom.xml | 28
1 file changed, 28 deletions(-)
diff --git a/software/winrm/pom.xml b/software/winrm/pom.xml
index 8882c03..63f3418 100644
--- a/software/winrm/pom.xml
+++ b/software/winrm/pom.xml
@@ -43,34 +43,6 @@
io.cloudsoft.windows
winrm4j
${winrm4j.version}
-
-
-org.slf4j
-jcl-over-slf4j
-
-
-org.slf4j
-slf4j-api
-
-
-org.apache.cxf
-cxf-core
-
-
-org.apache.cxf
-cxf-rt-transports-http
-
-
-
-
-
-org.slf4j
-jcl-over-slf4j
-${slf4j.version}
[brooklyn-server] branch master updated (0aed8ba -> 4f7a122)
This is an automated email from the ASF dual-hosted git repository. heneveld pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from 0aed8ba Merge pull request #1031 from aledsage/fix-karaf-startup new 2f6ea13 Bump jetty version to match Karaf 4.2.2 new 96b0c04 winrm4j: remove exclusions new f48722c Bump versions to match karaf 4.2.2 and cxf 3.2.7 new 4f7a122 This closes #1034 The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml| 16 software/winrm/pom.xml | 28 2 files changed, 8 insertions(+), 36 deletions(-)
[brooklyn-server] 03/04: Bump versions to match karaf 4.2.2 and cxf 3.2.7
This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git commit f48722cd1163890cc97dae7817298de4ad14 Author: Aled Sage AuthorDate: Wed Jan 30 19:44:05 2019 + Bump versions to match karaf 4.2.2 and cxf 3.2.7 --- pom.xml | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index a659317..49aec73 100644 --- a/pom.xml +++ b/pom.xml @@ -116,16 +116,16 @@ 1.1.4c_7 2.3.0_3 -2.9.6 +2.9.7 3.2.7 - 4.5.2 - 4.4.4 + 4.5.6 + 4.4.9 -4.5.2 +4.5.6 3.3.2 2.4.15 2.0.1 -1.22 +1.23 1.5.6 2.5 @@ -170,7 +170,7 @@ 1.4.0 0.4.1 -1.9 +1.10 1.2.17 1.2 2.3 @@ -220,7 +220,7 @@ 2.2.11 1.1.1 -7.2.3 +7.2.5 1.1.3
[brooklyn-server] 01/04: Bump jetty version to match Karaf 4.2.2
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 2f6ea136ecf6cfae8667061ffd33216017074356
Author: Aled Sage
AuthorDate: Wed Jan 30 12:23:02 2019 +
Bump jetty version to match Karaf 4.2.2
See https://github.com/apache/karaf/blob/karaf-4.2.2/pom.xml#L265
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d70f617..a659317 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,7 +165,7 @@
4.2.2
${karaf.version}
5.6.10
-9.4.11.v20180605
+9.4.12.v20180830
1.4.0
[brooklyn-server] branch master updated (4f7a122 -> f54c1e2)
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git. from 4f7a122 This closes #1034 new 4f24a93 share sessions among all BrooklynSecurityProviderFilter-using bundles new c21bdc8 fix security provider delegation new b1d1b11 make /logout just log out new c30d4c9 Merge branch 'make-logout-just-logout' into misc8 new 39cd453 simplify logout api new bb9a38f reinstall shared session handler if it has stopped new cb576a8 CSRF should return "forbidden" not "unauthorized" as we don't need authorization, we need the client to correctly encode the CSRF header. new 7cbf124 lots of debugging for case where session invalidation hangs on logout new b356e52 tidy, removing debug code, just having a clean-ish solution new 1518c1c make double-check/initialized field volatile new 6417a79 reinstall shared session handler if it has stopped new 3be6eac make double-check/initialized field volatile new c4e245b Merge branch 'fix-sessions-4' into make-logout-just-logout new 11d6f14 fix test for csrf mismatch now returns forbidden new 1a15c36 use adapter to access a shared session when required new 1d6f63a don't create new session until request is authorized, change SecurityProvider API new f6df273 better error-handling for bad auth strings new dc30572 comments addressing PR questions new f54c1e2 Merge pull request #1032 from ahgittin/make-logout-just-logout The 12325 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: karaf/jetty-config/src/main/resources/jetty.xml| 43 -- parent/pom.xml | 5 + .../org/apache/brooklyn/rest/api/LogoutApi.java| 26 +- rest/rest-resources/pom.xml| 8 +- .../BrooklynSecurityProviderFilterHelper.java | 96 ++--- .../brooklyn/rest/filter/CsrfTokenFilter.java | 33 +- .../rest/filter/EntitlementContextFilter.java | 4 +- .../brooklyn/rest/resources/LogoutResource.java| 105 +++-- .../brooklyn/rest/resources/ScriptResource.java| 19 +- .../brooklyn/rest/resources/ServerResource.java| 9 +- .../provider/AbstractSecurityProvider.java | 5 +- .../security/provider/AnyoneSecurityProvider.java | 5 +- .../provider/BlackholeSecurityProvider.java| 5 +- ...klynUserWithRandomPasswordSecurityProvider.java | 21 +- .../provider/DelegatingSecurityProvider.java | 38 +- .../provider/ExplicitUsersSecurityProvider.java| 15 +- .../security/provider/LdapSecurityProvider.java| 23 +- .../rest/security/provider/SecurityProvider.java | 38 +- .../rest/util/MultiSessionAttributeAdapter.java| 477 + .../main/resources/OSGI-INF/blueprint/service.xml | 6 +- .../brooklyn/rest/CsrfTokenFilterLauncherTest.java | 4 +- .../AuthenticateAnyoneSecurityProvider.java| 5 +- .../security/provider/TestSecurityProvider.java| 7 +- 23 files changed, 777 insertions(+), 220 deletions(-) create mode 100644 rest/rest-resources/src/main/java/org/apache/brooklyn/rest/util/MultiSessionAttributeAdapter.java
[brooklyn-ui] branch master updated (40b1e1e -> 76c5290)
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-ui.git.
from 40b1e1e This closes #117
new 7c4eb4c add jetty-web using sharing session manager
new 7c5e5a7 Revert "add jetty-web using sharing session manager"
new a65ac90 add makefile to logout project
new dbd1057 enhance web pages for flow where we request the user first
new d6ab218 make logout page modal to confirm logout and give options
new cc9601b fix path to ui-module-registry endpoint
new cef7fcc change providers to match rest api
new 91513f4 tidy logout app
new 9a77329 fix blueprint.xml for ui module server, and unproxy beans
from osgi in rest api
new 76c5290 Merge pull request #120 from ahgittin/fix-sessions
The 1618 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../resources/OSGI-INF/blueprint/blueprint.xml | 59 +++--
.../ui/modularity/module/api/UiModule.java | 8 ++
.../module/api/internal/UiModuleImpl.java | 14 +++
.../module/registry/RestUiModuleRegistry.java | 17 ++-
.../resources/OSGI-INF/blueprint/blueprint.xml | 63 --
.../main/inspect/summary/summary.controller.js | 2 +-
ui-modules/{rest-api-docs => logout}/Makefile | 0
ui-modules/logout/app/index.js | 3 +-
ui-modules/logout/app/index.less | 2 +-
.../logout/app/views/main/main.controller.js | 132 -
.../logout/app/views/main/main.template.html | 69 ++-
ui-modules/logout/src/main/webapp/WEB-INF/web.xml | 42 ++-
12 files changed, 352 insertions(+), 59 deletions(-)
copy ui-modules/{rest-api-docs => logout}/Makefile (100%)
mode change 100755 => 100644
[brooklyn-dist] branch master updated: Set up min and max memory for Windows env
This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git The following commit(s) were added to refs/heads/master by this push: new 733454c Set up min and max memory for Windows env new 90134c2 This closes #140 733454c is described below commit 733454c44d33f8e09663c76b2308e790d018822b Author: Juan Cabrerizo AuthorDate: Thu Jan 31 09:48:22 2019 + Set up min and max memory for Windows env --- .../src/main/resources/bin/setenv.bat | 67 ++ 1 file changed, 67 insertions(+) diff --git a/karaf/apache-brooklyn/src/main/resources/bin/setenv.bat b/karaf/apache-brooklyn/src/main/resources/bin/setenv.bat new file mode 100644 index 000..a1ed3c4 --- /dev/null +++ b/karaf/apache-brooklyn/src/main/resources/bin/setenv.bat @@ -0,0 +1,67 @@ +@echo off +rem +rem +remLicensed to the Apache Software Foundation (ASF) under one or more +remcontributor license agreements. See the NOTICE file distributed with +remthis work for additional information regarding copyright ownership. +remThe ASF licenses this file to You under the Apache License, Version 2.0 +rem(the "License"); you may not use this file except in compliance with +remthe License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +remUnless required by applicable law or agreed to in writing, software +remdistributed under the License is distributed on an "AS IS" BASIS, +remWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +remSee the License for the specific language governing permissions and +remlimitations under the License. +rem + +rem +rem handle specific scripts; the SCRIPT_NAME is exactly the name of the Karaf +rem script; for example karaf.bat, start.bat, stop.bat, admin.bat, client.bat, ... +rem +rem if "%KARAF_SCRIPT%" == "SCRIPT_NAME" ( +rem Actions go here... +rem ) + +rem +rem general settings which should be applied for all scripts go here; please keep +rem in mind that it is possible that scripts might be executed more than once, e.g. +rem in example of the start script where the start script is executed first and the +rem karaf script afterwards. +rem + +rem +rem The following section shows the possible configuration options for the default +rem karaf scripts +rem +rem Window name of the windows console +rem SET KARAF_TITLE +rem Location of Java installation +rem SET JAVA_HOME +rem Minimum memory for the JVM +SET JAVA_MIN_MEM=1024M +rem Maximum memory for the JVM +SET JAVA_MAX_MEM=4096M +rem Minimum perm memory for the JVM +rem SET JAVA_PERM_MEM +rem Maximum perm memory for the JVM +rem SET JAVA_MAX_PERM_MEM +rem Additional JVM options +rem SET EXTRA_JAVA_OPTS +rem Karaf home folder +rem SET KARAF_HOME +rem Karaf data folder +rem SET KARAF_DATA +rem Karaf base folder +rem SET KARAF_BASE +rem Karaf etc folder +rem SET KARAF_ETC +rem First citizen Karaf options +rem SET KARAF_SYSTEM_OPTS +rem Additional available Karaf options +rem SET KARAF_OPTS +rem Enable debug mode +rem SET KARAF_DEBUG +
[brooklyn-docs] branch master updated: Add note about including parameters when using 'wrap:' prefix
This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git The following commit(s) were added to refs/heads/master by this push: new b04b297 Add note about including parameters when using 'wrap:' prefix new 0b52038 This closes #276 b04b297 is described below commit b04b297032976ae23206492144fc959cb23409ed Author: Paul Campbell AuthorDate: Wed Jan 30 15:06:28 2019 + Add note about including parameters when using 'wrap:' prefix The Bundle-SymbolicName and Bundle-Version parameters need to be specified to avoid default values being generated that can cause problems when rebinding persisted state. --- guide/blueprints/java/bundle-dependencies.md | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guide/blueprints/java/bundle-dependencies.md b/guide/blueprints/java/bundle-dependencies.md index ba3d23a..f18c8ef 100644 --- a/guide/blueprints/java/bundle-dependencies.md +++ b/guide/blueprints/java/bundle-dependencies.md @@ -127,8 +127,10 @@ there are a few options for getting an equivalent OSGi bundle: * Use the `wrap:` prefix. The [PAX URL Wrap protocol](https://ops4j1.jira.com/wiki/display/paxurl/Wrap+Protocol) is an OSGi URL handler that can process your legacy jar at runtime and transform it into an OSGi bundle. - This can be used when declaring a dependency in your feature.xml, and when using the Karaf console's - `bundle:install`. Note that it is not yet supported in Brooklyn's `brooklyn.libraries` catalog items. + This can be used when declaring a dependency in your feature.xml, and when using the Karaf console's + `bundle:install`. Note that it is not yet supported in Brooklyn's `brooklyn.libraries` catalog items.__ + When using `wrap:` include the `Bundle-SymbolicName` and `Bundle-Version` headers as parameters. (e.g. + `wrap:mvn:javax.xml.ws/jaxws-api/2.3.0$Bundle-Symbolic-Name=javax.xml.ws.api&Bundle-Version=2.3.0`) * Re-package the bundle yourself, offline, to produce a valid OSGi bundle.
[brooklyn-docs] branch master updated: Replace underscores with spaces to produce hard line break
This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-docs.git The following commit(s) were added to refs/heads/master by this push: new 6aeea54 Replace underscores with spaces to produce hard line break new 8d7b942 This closes #277 6aeea54 is described below commit 6aeea549a3e6d3c3f7aa72235aa947f069ec5a69 Author: Paul Campbell AuthorDate: Thu Jan 31 11:02:29 2019 + Replace underscores with spaces to produce hard line break --- guide/blueprints/java/bundle-dependencies.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guide/blueprints/java/bundle-dependencies.md b/guide/blueprints/java/bundle-dependencies.md index f18c8ef..c90600e 100644 --- a/guide/blueprints/java/bundle-dependencies.md +++ b/guide/blueprints/java/bundle-dependencies.md @@ -128,7 +128,7 @@ there are a few options for getting an equivalent OSGi bundle: * Use the `wrap:` prefix. The [PAX URL Wrap protocol](https://ops4j1.jira.com/wiki/display/paxurl/Wrap+Protocol) is an OSGi URL handler that can process your legacy jar at runtime and transform it into an OSGi bundle. This can be used when declaring a dependency in your feature.xml, and when using the Karaf console's - `bundle:install`. Note that it is not yet supported in Brooklyn's `brooklyn.libraries` catalog items.__ + `bundle:install`. Note that it is not yet supported in Brooklyn's `brooklyn.libraries` catalog items. When using `wrap:` include the `Bundle-SymbolicName` and `Bundle-Version` headers as parameters. (e.g. `wrap:mvn:javax.xml.ws/jaxws-api/2.3.0$Bundle-Symbolic-Name=javax.xml.ws.api&Bundle-Version=2.3.0`)
[brooklyn-dist] branch master updated: update for security provider API change
This is an automated email from the ASF dual-hosted git repository.
tbouron pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
The following commit(s) were added to refs/heads/master by this push:
new 83db883 update for security provider API change
new fe89aff Merge pull request #139 from ahgittin/fix-sessions
83db883 is described below
commit 83db88331c9cae76ee5bb128890244f6eeed6416
Author: Alex Heneveld
AuthorDate: Tue Jan 29 20:06:50 2019 +
update for security provider API change
---
.../java/org/apache/brooklyn/security/CustomSecurityProvider.java| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProvider.java
b/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProvider.java
index 50195bf..b120cfe 100644
---
a/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProvider.java
+++
b/karaf/itest/src/test/java/org/apache/brooklyn/security/CustomSecurityProvider.java
@@ -18,6 +18,9 @@
*/
package org.apache.brooklyn.security;
+import java.util.function.Supplier;
+
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.brooklyn.rest.security.provider.AbstractSecurityProvider;
@@ -28,7 +31,7 @@ public class CustomSecurityProvider extends
AbstractSecurityProvider implements
static final String USER = "custom";
@Override
-public boolean authenticate(HttpSession session, String user, String
password) {
+public boolean authenticate(HttpServletRequest request,
Supplier sessionSupplierOnSuccess, String user, String pass)
throws SecurityProviderDeniedAuthentication {
return USER.equals(user);
}
[brooklyn-dist] branch master updated (fe89aff -> 8fa216c)
This is an automated email from the ASF dual-hosted git repository. heneveld pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git. from fe89aff Merge pull request #139 from ahgittin/fix-sessions new ca7c868 update license overrides for new versions, add CC0 new 8fa216c updated LICENSE and NOTICE files The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...adata-manual-mvn-aggregation-and-overrides.yaml |5 + dist/licensing/license-text/CC0| 41 + dist/src/main/license/files/LICENSE| 1370 ++-- dist/src/main/license/files/NOTICE | 1035 +++ karaf/apache-brooklyn/src/main/resources/LICENSE | 1370 ++-- karaf/apache-brooklyn/src/main/resources/NOTICE| 1035 +++ 6 files changed, 1886 insertions(+), 2970 deletions(-) create mode 100644 dist/licensing/license-text/CC0
[brooklyn-dist] 01/02: update license overrides for new versions, add CC0
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit ca7c86810b27b99a987f3f93cdaabe8e043c6277
Author: Alex Heneveld
AuthorDate: Thu Jan 31 12:07:09 2019 +
update license overrides for new versions, add CC0
---
...adata-manual-mvn-aggregation-and-overrides.yaml | 5 +++
dist/licensing/license-text/CC0| 41 ++
2 files changed, 46 insertions(+)
diff --git
a/dist/licensing/license-metadata-manual-mvn-aggregation-and-overrides.yaml
b/dist/licensing/license-metadata-manual-mvn-aggregation-and-overrides.yaml
index 25641c4..0c82e7a 100644
--- a/dist/licensing/license-metadata-manual-mvn-aggregation-and-overrides.yaml
+++ b/dist/licensing/license-metadata-manual-mvn-aggregation-and-overrides.yaml
@@ -54,6 +54,7 @@
- javax.annotation.javax.annotation-api
- javax.ws.rs.javax.ws.rs-api
- javax.servlet.javax.servlet-api
+ - org.jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec
- ids:
- javax.annotation.jsr250-api
- org.jboss.spec.javax.annotation.jboss-annotations-api_1.2_spec:1.0.0.Final
@@ -117,6 +118,10 @@
license: EPL-1.0
- id: com.google.code.findbugs.annotations
license: LGPL-3.0
+- license: LGPL-3.0
+ ids:
+ - com.github.fge.json-patch
+ - com.github.fge.jackson-coreutils
- id: com.google.code.findbugs
license: Apache-2.0
- ids:
diff --git a/dist/licensing/license-text/CC0 b/dist/licensing/license-text/CC0
new file mode 100644
index 000..9179f4a
--- /dev/null
+++ b/dist/licensing/license-text/CC0
@@ -0,0 +1,41 @@
+
+CC0 1.0 Universal (CC0 1.0)
+
+Creative Commons - No Copyright
+
+The person who associated a work with this deed has dedicated the work to the
public domain by waiving all of his or her rights to the work worldwide under
copyright law, including all related and neighboring rights, to the extent
allowed by law.
+
+You can copy, modify, distribute and perform the work, even for commercial
purposes, all without asking permission.
+
+Legal Code
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
exclusive Copyright and Related Rights (defined below) upon the creator and
subsequent owner(s) (each and all, an "owner") of an original work of
authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the
purpose of contributing to a commons of creative, cultural and scientific works
("Commons") that the public can reliably and without fear of later claims of
infringement build upon, modify, incorporate in other works, reuse and
redistribute as freely as possible in any form whatsoever and for any purposes,
including without limitation commercial purposes. These owners may contribute
to the Commons to promote the [...]
+
+For these and/or other purposes and motivations, and without any expectation
of additional consideration or compensation, the person associating CC0 with a
Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and
publicly distribute the Work under its terms, with knowledge of his or her
Copyright and Related Rights in the Work and the meaning and intended legal
effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
protected by copyright and related or neighboring rights ("Copyright and
Related Rights"). Copyright and Related Rights include, but are not limited to,
the following:
+
+the right to reproduce, adapt, distribute, perform, display, communicate, and
translate a Work;
+moral rights retained by the original author(s) and/or performer(s);
+publicity and privacy rights pertaining to a person's image or likeness
depicted in a Work;
+rights protecting against unfair competition in regards to a Work, subject to
the limitations in paragraph 4(a), below;
+rights protecting the extraction, dissemination, use and reuse of data in a
Work;
+database rights (such as those arising under Directive 96/9/EC of the European
Parliament and of the Council of 11 March 1996 on the legal protection of
databases, and under any national implementation thereof, including any amended
or successor version of such directive); and
+other similar, equivalent or corresponding rights throughout the world based
on applicable law or treaty, and any national implementations thereof.
+2. Waiver. To the greatest extent permitted by, but not in contravention of,
applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
and Related Rights and associated claims and causes of action, whether now
known or unknown (including existing as well as future claims and causes of
action), in the Work (i) in all territories w
[brooklyn] 01/03: Merge branch 'build-number-instruction'
This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn.git commit 2bfd3c01e38bd16313ca9c3dcc44b9140296e10b Merge: 7eec5c7 103f445 Author: Alex Heneveld AuthorDate: Thu Jan 31 12:08:26 2019 + Merge branch 'build-number-instruction' README.md | 12 1 file changed, 12 insertions(+) diff --cc README.md index b689222,2635b62..de29827 --- a/README.md +++ b/README.md @@@ -51,12 -38,22 +51,24 @@@ docker run -i --rm --name brooklyn -u $ The results are in `brooklyn-dist/dist/target/`, including a tar and a zip. Or to run straight after the build, do: -pushd brooklyn-dist/dist/target/brooklyn-dist/brooklyn/ -bin/brooklyn launch +```bash +pushd brooklyn-dist/karaf/apache-brooklyn/target/assembly/ +./bin/start +``` + ### Non-Git Build + + If you are performing a build on code not in source control (e.g. from a ZIP of source code, or after deleting SCM metadata), + you will need to manually set two variables that are normally inferred from the environment: + + * `-DbuildNumber=manual` + * `-DscmBranch=manual` + + You can set these properties to any value you wish. When using a checkout from git, the `buildNumber` is set to the SHA1 commit ID (short form) + of the containing project, and the `scmBranch` is set to the git branch. + + ### Resources
[brooklyn-client] branch master updated: updated license files for new deps
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-client.git
The following commit(s) were added to refs/heads/master by this push:
new 18e145e updated license files for new deps
18e145e is described below
commit 18e145e9b5058ad4d3005fd0e59cccaa63c4e4ac
Author: Alex Heneveld
AuthorDate: Thu Jan 31 12:09:46 2019 +
updated license files for new deps
---
LICENSE | 108 --
NOTICE| 104 +++-
cli/LICENSE | 6 +--
cli/release/license/files/LICENSE | 6 +--
4 files changed, 179 insertions(+), 45 deletions(-)
diff --git a/LICENSE b/LICENSE
index 58c8739..e94218a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -205,10 +205,10 @@ Apache License: |
Dependency licenses:
- # This software includes dependencies released under other licenses.
- # These other licenses are compatible with the Apache License above.
+ # This software includes dependencies released under their licenses.
+ # These licenses are compatible with the Apache License above.
# Details of these dependencies can be found in the accompanying NOTICE
file.
- # These other licenses are included below with their full text.
+ # These licenses are included below with their full text.
Apache License, version 2.0: |
# from https://www.apache.org/licenses/LICENSE-2.0
@@ -416,6 +416,49 @@ Dependency licenses:
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ CC0: |
+
+CC0 1.0 Universal (CC0 1.0)
+
+Creative Commons - No Copyright
+
+The person who associated a work with this deed has dedicated the work to
the public domain by waiving all of his or her rights to the work worldwide
under copyright law, including all related and neighboring rights, to the
extent allowed by law.
+
+You can copy, modify, distribute and perform the work, even for commercial
purposes, all without asking permission.
+
+Legal Code
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
exclusive Copyright and Related Rights (defined below) upon the creator and
subsequent owner(s) (each and all, an "owner") of an original work of
authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
the purpose of contributing to a commons of creative, cultural and scientific
works ("Commons") that the public can reliably and without fear of later claims
of infringement build upon, modify, incorporate in other works, reuse and
redistribute as freely as possible in any form whatsoever and for any purposes,
including without limitation commercial purposes. These owners may contribute
to the Commons to promote [...]
+
+For these and/or other purposes and motivations, and without any
expectation of additional consideration or compensation, the person associating
CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of
Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to
the Work and publicly distribute the Work under its terms, with knowledge of
his or her Copyright and Related Rights in the Work and the meaning and
intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
protected by copyright and related or neighboring rights ("Copyright and
Related Rights"). Copyright and Related Rights include, but are not limited to,
the following:
+
+the right to reproduce, adapt, distribute, perform, display, communicate,
and translate a Work;
+moral rights retained by the original author(s) and/or performer(s);
+publicity and privacy rights pertaining to a person's image or likeness
depicted in a Work;
+rights protecting against unfair competition in regards to a Work, subject
to the limitations in paragraph 4(a), below;
+rights protecting the extraction, dissemination, use and reuse of data in
a Work;
+database rights (such as those arising under Directive 96/9/EC of the
European Parliament and of the Council of 11 March 1996 on the legal protection
of databases, and under any national implementation thereof, including any
amended or successor version of such directive); and
+other similar, equivalent or corresponding rights throughout the world
based on applicable law or treaty, and any national implementations thereof.
+2. Waiver. To the greatest extent permitted by, but not in contravention
of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably
and unconditionally waives, abandons, and surrenders all of Affirmer's
Copyright and Rel
[brooklyn] branch master updated (7eec5c7 -> 2e38d75)
This is an automated email from the ASF dual-hosted git repository. heneveld pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn.git. from 7eec5c7 Closes #24 add 103f445 include instructions for building outwith source control new 2bfd3c0 Merge branch 'build-number-instruction' new 4bf4f4c add eclipse excludes for non-supported maven goals new 2e38d75 updated license / dependencies The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: LICENSE | 1370 ++--- NOTICE| 1081 README.md | 12 + pom.xml | 44 ++ 4 files changed, 999 insertions(+), 1508 deletions(-)
[brooklyn] 02/03: add eclipse excludes for non-supported maven goals
This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn.git commit 4bf4f4c821cad74bbdbf82951717e43a96956f32 Author: Alex Heneveld AuthorDate: Thu Jan 31 12:08:33 2019 + add eclipse excludes for non-supported maven goals --- pom.xml | 44 1 file changed, 44 insertions(+) diff --git a/pom.xml b/pom.xml index 49123c8..b684acb 100644 --- a/pom.xml +++ b/pom.xml @@ -106,4 +106,48 @@ + + + + + +org.eclipse.m2e +lifecycle-mapping +1.0.0 + + + + + + org.codehaus.mojo + flatten-maven-plugin + [1.0.1,) + +flatten + + + + + + + + + org.apache.karaf.tooling + karaf-maven-plugin + [4.1.6,) + +verify + + + + + + + + + + + + +
[brooklyn-server] branch master updated: update license/notice for new deps
This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git The following commit(s) were added to refs/heads/master by this push: new da7db69 update license/notice for new deps da7db69 is described below commit da7db69d1c1c321edb5cd2c9722d6d04b447a7c0 Author: Alex Heneveld AuthorDate: Thu Jan 31 12:11:13 2019 + update license/notice for new deps --- NOTICE| 123 ++-- server-cli/NOTICE | 126 +++--- 2 files changed, 136 insertions(+), 113 deletions(-) diff --git a/NOTICE b/NOTICE index a3cb1d8..ee9424a 100644 --- a/NOTICE +++ b/NOTICE @@ -69,9 +69,9 @@ Runtime dependencies: Developed by: QOS.ch (http://www.qos.ch) License name: Eclipse Public License, version 1.0 - com.fasterxml.jackson:2.9.6: + com.fasterxml.jackson:2.9.7: Project: Jackson FasterXML -Version: 2.9.6 +Version: 2.9.7 Available at: - http://github.com/FasterXML/jackson - https://github.com/FasterXML/jackson-core @@ -79,6 +79,13 @@ Runtime dependencies: Developed by: FasterXML (http://fasterxml.com/) License name: Apache License, version 2.0 + com.fasterxml.woodstox.woodstox-core:5.0.3: +Project: Woodstox +Version: 5.0.3 +Available at: https://github.com/FasterXML/woodstox +Developed by: FasterXML (http://fasterxml.com) +License name: Apache License, version 2.0 + com.google.code.findbugs:2.0.1: Project: - FindBugs-Annotations @@ -87,10 +94,10 @@ Runtime dependencies: Available at: http://findbugs.sourceforge.net/ License name: Apache License, version 2.0 - com.google.code.gson:2.3: + com.google.code.gson:2.5: Project: Gson -Version: 2.3 -Available at: http://code.google.com/p/google-gson/ +Version: 2.5 +Available at: https://github.com/google/gson Developed by: Google, Inc. (http://www.google.com) License name: Apache License, version 2.0 @@ -182,15 +189,6 @@ Runtime dependencies: License name: Apache License, version 2.0 Notice: Copyright (c) Square, Inc. - com.sun.xml.bind:2.2.11: -Project: - - Old JAXB Core - - Old JAXB Runtime -Version: 2.2.11 -Available at: http://jaxb.java.net -Developed by: Oracle Corporation (http://www.oracle.com/) -License name: Common Development and Distribution License, version 1.1 - com.thoughtworks.xstream:1.4.8: Project: XStream Core Version: 1.4.8 @@ -198,23 +196,23 @@ Runtime dependencies: Developed by: XStream (http://xstream.codehaus.org) License name: BSD 3-Clause (New BSD) License - commons-beanutils:1.9.1: + commons-beanutils:1.9.3: Project: Apache Commons BeanUtils -Version: 1.9.1 -Available at: http://commons.apache.org/proper/commons-beanutils/ -Developed by: The Apache Software Foundation (http://www.apache.org/) +Version: 1.9.3 +Available at: https://commons.apache.org/proper/commons-beanutils/ +Developed by: The Apache Software Foundation (https://www.apache.org/) License name: Apache License, version 2.0 - commons-codec:1.9: + commons-codec:1.10: Project: Apache Commons Codec -Version: 1.9 +Version: 1.10 Available at: http://commons.apache.org/proper/commons-codec/ Developed by: The Apache Software Foundation (http://www.apache.org/) License name: Apache License, version 2.0 - commons-collections:3.2.1: -Project: Commons Collections -Version: 3.2.1 + commons-collections:3.2.2: +Project: Apache Commons Collections +Version: 3.2.2 Available at: http://commons.apache.org/collections/ Developed by: The Apache Software Foundation (http://www.apache.org/) License name: Apache License, version 2.0 @@ -233,11 +231,11 @@ Runtime dependencies: Developed by: The Apache Software Foundation (http://www.apache.org/) License name: Apache License, version 2.0 - io.cloudsoft.windows:0.5.0: + io.cloudsoft.windows:0.6.1: Project: - Java WinRM library - WinRM Client -Version: 0.5.0 +Version: 0.6.1 Available at: http://github.com/cloudsoft/winrm4j License name: Apache License, version 2.0 @@ -308,20 +306,27 @@ Runtime dependencies: Developed by: The Apache Software Foundation (http://www.apache.org/) License name: Apache License, version 2.0 - org.apache.cxf:3.1.10: + org.apache.cxf:3.2.7: Project: Apache CXF -Version: 3.1.10 +Version: 3.2.7 Available at: http://cxf.apache.org Developed by: The Apache Software Foundation (http://www.apache.org/) License name: Apache License, version 2.0 -
