[GitHub] brooklyn-dist pull request: Populate catalog from bundle bom

2016-04-15 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/brooklyn-dist/pull/26


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-dist pull request: Populate catalog from bundle bom

2016-04-13 Thread geomacy
Github user geomacy commented on a diff in the pull request:

https://github.com/apache/brooklyn-dist/pull/26#discussion_r59532598
  
--- Diff: 
archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom ---
@@ -0,0 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+brooklyn.catalog:
+version: 0.10.0 # BROOKLYN_VERSION
--- End diff --

Dang, of course. Will fix.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-dist pull request: Populate catalog from bundle bom

2016-04-13 Thread neykov
Github user neykov commented on a diff in the pull request:

https://github.com/apache/brooklyn-dist/pull/26#discussion_r59531395
  
--- Diff: 
archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom ---
@@ -0,0 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+brooklyn.catalog:
+version: 0.10.0 # BROOKLYN_VERSION
--- End diff --

Should be -SNAPSHOT, as done in brooklyn-library


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-dist pull request: Populate catalog from bundle bom

2016-04-13 Thread geomacy
Github user geomacy commented on the pull request:

https://github.com/apache/brooklyn-dist/pull/26#issuecomment-209362988
  
Version updated and commits squashed.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-dist pull request: Populate catalog from bundle bom

2016-04-13 Thread neykov
Github user neykov commented on the pull request:

https://github.com/apache/brooklyn-dist/pull/26#issuecomment-209337233
  
Also could you squash the commits.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-dist pull request: Populate catalog from bundle bom

2016-04-13 Thread neykov
Github user neykov commented on a diff in the pull request:

https://github.com/apache/brooklyn-dist/pull/26#discussion_r59518879
  
--- Diff: 
archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom ---
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+brooklyn.catalog:
+version: 0.9.0
+scanJavaAnnotations: true
--- End diff --

Can you remove.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-dist pull request: Populate catalog from bundle bom

2016-04-13 Thread neykov
Github user neykov commented on a diff in the pull request:

https://github.com/apache/brooklyn-dist/pull/26#discussion_r59518971
  
--- Diff: 
archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom ---
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+brooklyn.catalog:
+version: 0.9.0
--- End diff --

Can you do the same change as you already did elsewhere (updating to 
current Brooklyn version & adding the version marker).


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---


[GitHub] brooklyn-dist pull request: Populate catalog from bundle bom

2016-03-24 Thread geomacy
GitHub user geomacy opened a pull request:

https://github.com/apache/brooklyn-dist/pull/26

Populate catalog from bundle bom

The PR adds updates to the existing jars to add a catalog.bom file that 
includes the details of the various entities in each.  

See https://github.com/apache/brooklyn-server/pull/80 for details; this PR 
depends on that one and should be merged after it.


You can merge this pull request into a Git repository by running:

$ git pull https://github.com/geomacy/brooklyn-dist 
populate-catalog-from-bundle-bom

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/brooklyn-dist/pull/26.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #26


commit 1e40c0b39d19ccfaec908cdbccf5ec9a6d467889
Author: Geoff Macartney 
Date:   2016-03-23T16:16:22Z

Add default catalog.bom files (empty at present).

commit 2c09645e336ec972d5827556f78d41d338d55a39
Author: Geoff Macartney 
Date:   2016-03-24T18:02:12Z

Amend catalog.com with items for this package.




---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---