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 2016/04/15 16:04:37 UTC
[1/3] brooklyn-dist git commit: Fix deb package java dependencies
Repository: brooklyn-dist
Updated Branches:
refs/heads/master eb5a46e86 -> 91ad2a9e6
Fix deb package java dependencies
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/ce4f05aa
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/ce4f05aa
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/ce4f05aa
Branch: refs/heads/master
Commit: ce4f05aad5273b2431dd3b92ca8132e7298f2c43
Parents: 299c8cf
Author: alrick87 <so...@gmail.com>
Authored: Tue Apr 12 15:00:38 2016 +0300
Committer: alrick87 <so...@gmail.com>
Committed: Tue Apr 12 15:56:03 2016 +0300
----------------------------------------------------------------------
deb-packaging/src/deb/control/control | 2 +-
deb-packaging/src/deb/control/postrm | 18 ------------------
2 files changed, 1 insertion(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/ce4f05aa/deb-packaging/src/deb/control/control
----------------------------------------------------------------------
diff --git a/deb-packaging/src/deb/control/control b/deb-packaging/src/deb/control/control
index 1729a36..bd342f0 100644
--- a/deb-packaging/src/deb/control/control
+++ b/deb-packaging/src/deb/control/control
@@ -19,6 +19,6 @@ Version: [[version]]
Section: misc
Priority: optional
Architecture: all
-Depends: jdk (>= 1.7)
+Depends: default-jre-headless (>= 1.7)
Maintainer: Aleksandr Vasilev <al...@cloudsoftcorp.com>
Description: Apache Brooklyn is a framework for modeling, monitoring, and managing applications through autonomic blueprints.
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/ce4f05aa/deb-packaging/src/deb/control/postrm
----------------------------------------------------------------------
diff --git a/deb-packaging/src/deb/control/postrm b/deb-packaging/src/deb/control/postrm
deleted file mode 100644
index 55360bd..0000000
--- a/deb-packaging/src/deb/control/postrm
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# 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.
-/usr/sbin/userdel brooklyn
[3/3] brooklyn-dist git commit: Closes #33
Posted by sv...@apache.org.
Closes #33
Fix deb package java dependencies
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/91ad2a9e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/91ad2a9e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/91ad2a9e
Branch: refs/heads/master
Commit: 91ad2a9e63d9045ebee7ffb19233f5943b22fd44
Parents: eb5a46e cda86b9
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Apr 15 17:04:26 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri Apr 15 17:04:26 2016 +0300
----------------------------------------------------------------------
deb-packaging/pom.xml | 2 +-
deb-packaging/src/deb/control/control | 2 +-
deb-packaging/src/deb/control/postrm | 18 ------------------
3 files changed, 2 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
[2/3] brooklyn-dist git commit: Fix output dir
Posted by sv...@apache.org.
Fix output dir
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/cda86b99
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/cda86b99
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/cda86b99
Branch: refs/heads/master
Commit: cda86b99f7fc0133a8af1c8b86a8a41d6fda86c0
Parents: ce4f05a
Author: alrick87 <so...@gmail.com>
Authored: Tue Apr 12 16:58:10 2016 +0300
Committer: alrick87 <so...@gmail.com>
Committed: Tue Apr 12 16:58:10 2016 +0300
----------------------------------------------------------------------
deb-packaging/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/cda86b99/deb-packaging/pom.xml
----------------------------------------------------------------------
diff --git a/deb-packaging/pom.xml b/deb-packaging/pom.xml
index 566f93a..e2671b2 100644
--- a/deb-packaging/pom.xml
+++ b/deb-packaging/pom.xml
@@ -53,7 +53,7 @@
</goals>
<configuration>
<verbose>true</verbose>
- <deb>target/apache-brooklyn_${project.version}_all.deb</deb>
+ <deb>${project.build.directory}/apache-brooklyn_${project.version}_all.deb</deb>
<controlDir>${basedir}/src/deb/control</controlDir>
<dataSet>
<data>