cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [cloudstack] branch CLOUDSTACK-10012 updated: fix packaging
Date Thu, 26 Oct 2017 11:03:54 GMT
This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/CLOUDSTACK-10012 by this push:
     new a9cb42c  fix packaging
a9cb42c is described below

commit a9cb42c5ec79395b5bdeeb965770d65db208cca4
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
AuthorDate: Thu Oct 26 16:33:43 2017 +0530

    fix packaging
    
    Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 client/pom.xml                       | 4 ----
 debian/cloudstack-management.install | 1 +
 packaging/centos63/cloud.spec        | 3 ++-
 packaging/centos7/cloud.spec         | 3 ++-
 pom.xml                              | 5 -----
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index 03dcbd3..5090c90 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -42,10 +42,6 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jmx</artifactId>
     </dependency>
     <dependency>
diff --git a/debian/cloudstack-management.install b/debian/cloudstack-management.install
index a4926e1..bb241fb 100644
--- a/debian/cloudstack-management.install
+++ b/debian/cloudstack-management.install
@@ -18,6 +18,7 @@
 /etc/cloudstack/management/ehcache.xml
 /etc/cloudstack/management/db.properties
 /etc/cloudstack/management/environment.properties
+/etc/cloudstack/management/server.properties
 /etc/cloudstack/management/java.security.ciphers
 /etc/cloudstack/management/log4j-cloud.xml
 /etc/default/cloudstack-management
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 13b66fb..dbfdd5d 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -294,7 +294,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/cl
 
 cp client/target/classes/META-INF/webapp/WEB-INF/web.xml ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management
 
-for name in db.properties log4j-cloud.xml commons-logging.properties environment.properties
java.security.ciphers
+for name in db.properties server.properties log4j-cloud.xml commons-logging.properties environment.properties
java.security.ciphers
 do
   cp client/target/conf/$name ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
@@ -524,6 +524,7 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
 %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/management
 %config(noreplace) %{_sysconfdir}/sudoers.d/%{name}-management
 %config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties
+%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/server.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml
 %config(noreplace) %{_sysconfdir}/%{name}/management/log4j.xml
 %config(noreplace) %{_sysconfdir}/%{name}/management/web.xml
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 3cc714b..4f743e5 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -265,7 +265,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/cl
 
 cp client/target/classes/META-INF/webapp/WEB-INF/web.xml ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management
 
-for name in db.properties log4j-cloud.xml commons-logging.properties environment.properties
java.security.ciphers
+for name in db.properties server.properties log4j-cloud.xml commons-logging.properties environment.properties
java.security.ciphers
 do
   cp client/target/conf/$name ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
@@ -473,6 +473,7 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
 %config(noreplace) %{_sysconfdir}/sudoers.d/%{name}-management
 %config(noreplace) %{_sysconfdir}/security/limits.d/cloud
 %config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties
+%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/server.properties
 %config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml
 %config(noreplace) %{_sysconfdir}/%{name}/management/log4j.xml
 %config(noreplace) %{_sysconfdir}/%{name}/management/web.xml
diff --git a/pom.xml b/pom.xml
index ffbda4d..a899f3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -496,11 +496,6 @@
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-annotations</artifactId>
-        <version>${cs.jetty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-jmx</artifactId>
         <version>${cs.jetty.version}</version>
       </dependency>

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>'].

Mime
View raw message