You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2017/10/16 12:44:19 UTC
[cloudstack] branch CLOUDSTACK-10012 updated: build fixes
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 a8ebf8d build fixes
a8ebf8d is described below
commit a8ebf8d69434976f8dc4988cf34e3a415ea365f4
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Mon Oct 16 17:35:05 2017 +0530
build fixes
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
build/replace.properties | 2 +-
client/pom.xml | 24 +++++++++++++++++++++++
debian/rules | 1 -
packaging/centos63/cloud.spec | 1 -
packaging/centos7/cloud.spec | 1 -
packaging/debian/replace.properties | 2 +-
plugins/network-elements/juniper-contrail/pom.xml | 6 ++++++
pom.xml | 5 +++++
8 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/build/replace.properties b/build/replace.properties
index 9e0b65c..3d9a459 100644
--- a/build/replace.properties
+++ b/build/replace.properties
@@ -27,4 +27,4 @@ AGENTLOG=logs/agent.log
MSMNTDIR=/mnt
COMPONENTS-SPEC=components.xml
REMOTEHOST=localhost
-COMMONLIBDIR=client/target/cloud-client-ui-4.7.0/WEB-INF/lib/
+COMMONLIBDIR=client/target/common/
diff --git a/client/pom.xml b/client/pom.xml
index 9a09d89..8157937 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -61,6 +61,10 @@
<artifactId>jetty-annotations</artifactId>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${cs.jackson.version}</version>
@@ -360,6 +364,7 @@
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-outofbandmanagement-driver-nested-cloudstack</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
@@ -383,6 +388,7 @@
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-framework-ca</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
@@ -538,6 +544,7 @@
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-integrations-prometheus-exporter</artifactId>
<version>${project.version}</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
<build>
@@ -557,6 +564,23 @@
</executions>
</plugin>
<plugin>
+ <groupId>com.googlecode.todomap</groupId>
+ <artifactId>maven-jettygzip-plugin</artifactId>
+ <version>0.0.4</version>
+ <configuration>
+ <webappDirectory>${project.build.directory}/classes/META-INF/webapp</webappDirectory>
+ <outputDirectory>${project.build.directory}/classes/META-INF/webapp</outputDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
diff --git a/debian/rules b/debian/rules
index 5958c2b..7053961 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,7 +77,6 @@ override_dh_auto_install:
cp server/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/
cp client/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/
cp client/target/cloud-client-ui-$(VERSION).jar $(DESTDIR)/usr/share/$(PACKAGE)-management/cloud-management-server.jar
- cp client/target/bcprov-jdk15on-1.55.jar $(DESTDIR)/usr/share/$(PACKAGE)-management/lib/
# To make jetty happy from the 1st line of log
ln -s log4j-cloud.xml $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/log4j.xml
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 0104dfa..53b27fa 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -286,7 +286,6 @@ cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-
cp client/target/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-management-server.jar
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib
-cp client/target/bcprov-jdk15on-1.55.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/
# Don't package the scripts in the management webapp
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 6ce1d0a..826ed04 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -256,7 +256,6 @@ cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-
cp -r client/target/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/
mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-management-server.jar
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib
-cp client/target/bcprov-jdk15on-1.55.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/
# Don't package the scripts in the management webapp
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts
diff --git a/packaging/debian/replace.properties b/packaging/debian/replace.properties
index e1d28bb..258cb84 100644
--- a/packaging/debian/replace.properties
+++ b/packaging/debian/replace.properties
@@ -32,7 +32,7 @@ APISERVERLOG=/var/log/cloudstack/management/apilog.log
BINDIR=/usr/bin
COMMONLIBDIR=/usr/share/cloudstack-common
CONFIGUREVARS=
-DEPSCLASSPATH=/usr/share/tomcat6/bin/bootstrap.jar:/usr/share/tomcat6/bin/tomcat-juli.jar
+DEPSCLASSPATH=
DOCDIR=
IPALOCATORLOG=/var/log/cloudstack/management/ipallocator.log
JAVADIR=/usr/share/cloudstack-management/webapps/client/WEB-INF/lib
diff --git a/plugins/network-elements/juniper-contrail/pom.xml b/plugins/network-elements/juniper-contrail/pom.xml
index 14e5ba4..f98b629 100644
--- a/plugins/network-elements/juniper-contrail/pom.xml
+++ b/plugins/network-elements/juniper-contrail/pom.xml
@@ -99,6 +99,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${cs.jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
diff --git a/pom.xml b/pom.xml
index 495e074..f87b099 100644
--- a/pom.xml
+++ b/pom.xml
@@ -513,6 +513,11 @@
<artifactId>jetty-annotations</artifactId>
<version>${cs.jetty.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${cs.jetty.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
--
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].