You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/10/11 20:10:44 UTC
[1/2] brooklyn-dist git commit: archetype’s catalog.bom set up as 0.1.0-SNAPSHOT
Repository: brooklyn-dist
Updated Branches:
refs/heads/master dc5391b25 -> 3cf8519cf
archetype\u2019s catalog.bom set up as 0.1.0-SNAPSHOT
Previously was 0.10.0-SNAPSHOT, but this is the version of the user\u2019s
project rather than brooklyn.
Also removes the apache header because this is a starting point for
a user to create their own projects (which will not necessarily be
apache licensed). This starting file is extremely basic; it is a file
without any degree of creativity.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/7238d47f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/7238d47f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/7238d47f
Branch: refs/heads/master
Commit: 7238d47fea04cdddb900c23fd0e8d211f8fa5621
Parents: dc5391b
Author: Aled Sage <al...@gmail.com>
Authored: Fri Oct 7 17:42:09 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Fri Oct 7 17:42:09 2016 +0100
----------------------------------------------------------------------
archetypes/quickstart/pom.xml | 1 +
.../src/main/resources/catalog.bom | 19 +------------------
2 files changed, 2 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/7238d47f/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/pom.xml b/archetypes/quickstart/pom.xml
index a028f54..9b71889 100644
--- a/archetypes/quickstart/pom.xml
+++ b/archetypes/quickstart/pom.xml
@@ -240,6 +240,7 @@
<exclude>**/src/brooklyn-sample/README.md</exclude>
<exclude>**/src/brooklyn-sample/pom.xml</exclude>
<exclude>**/src/brooklyn-sample/src/main/java/**/*.java</exclude>
+ <exclude>**/src/brooklyn-sample/src/main/resources/**/*.bom</exclude>
<exclude>**/src/brooklyn-sample/src/test/resources/**/*.bom</exclude>
<exclude>**/src/brooklyn-sample/src/test/resources/**/*.yaml</exclude>
<exclude>**/src/brooklyn-sample/src/test/java/**/*.java</exclude>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/7238d47f/archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom
----------------------------------------------------------------------
diff --git a/archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom b/archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom
index daca838..18d21c3 100644
--- a/archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom
+++ b/archetypes/quickstart/src/brooklyn-sample/src/main/resources/catalog.bom
@@ -1,22 +1,5 @@
-# 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-SNAPSHOT" # BROOKLYN_VERSION
+ version: "0.1.0-SNAPSHOT"
itemType: entity
items:
- id: com.acme.sample.brooklyn.MySample
[2/2] brooklyn-dist git commit: This closes #53
Posted by al...@apache.org.
This closes #53
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/3cf8519c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/3cf8519c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/3cf8519c
Branch: refs/heads/master
Commit: 3cf8519cf1466d07a3496faddbf9cc7607263a99
Parents: dc5391b 7238d47
Author: Aled Sage <al...@gmail.com>
Authored: Tue Oct 11 21:10:23 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Oct 11 21:10:23 2016 +0100
----------------------------------------------------------------------
archetypes/quickstart/pom.xml | 1 +
.../src/main/resources/catalog.bom | 19 +------------------
2 files changed, 2 insertions(+), 18 deletions(-)
----------------------------------------------------------------------