Updated Branches: refs/heads/master 6c2610428 -> 17977b426
Forgot to add a few items to the commit to move the systemvm Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/17977b42 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/17977b42 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/17977b42 Branch: refs/heads/master Commit: 17977b426bc53bb08d78fa7829d251495177ec3d Parents: 6c26104 Author: Hugo Trippaers <[email protected]> Authored: Fri Sep 20 18:52:47 2013 +0800 Committer: Hugo Trippaers <[email protected]> Committed: Fri Sep 20 18:52:47 2013 +0800 ---------------------------------------------------------------------- patches/pom.xml | 84 --------------------------------- services/secondary-storage/pom.xml | 6 --- 2 files changed, 90 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17977b42/patches/pom.xml ---------------------------------------------------------------------- diff --git a/patches/pom.xml b/patches/pom.xml deleted file mode 100644 index 6457c7a..0000000 --- a/patches/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ -<!-- 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. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <artifactId>cloud-patches</artifactId> - <name>Apache CloudStack SystemVM Patches</name> - <packaging>pom</packaging> - <parent> - <groupId>org.apache.cloudstack</groupId> - <artifactId>cloudstack</artifactId> - <version>4.3.0-SNAPSHOT</version> - </parent> - <build> - <defaultGoal>install</defaultGoal> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.7</version> - <executions> - <execution> - <id>build-cloud-scripts</id> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target> - <mkdir dir="${basedir}/target/build-patch" /> - <mkdir dir="${basedir}/target/build-patch/usr/sbin" /> - <copy overwrite="true" todir="${basedir}/target/build-patch"> - <fileset dir="${basedir}/systemvm/debian/config/"> - <include name="**/*" /> - </fileset> - <fileset dir="${basedir}/systemvm/debian/vpn/"> - <include name="**/*" /> - </fileset> - <fileset dir="${basedir}/systemvm/debian/xe/"> - <include name="**/*" /> - <exclude name="**/xe-*" /> - <exclude name="**/xen-*" /> - </fileset> - </copy> - <copy overwrite="true" todir="${basedir}/target/build-patch/usr/sbin/"> - <fileset dir="${basedir}/systemvm/debian/xe/"> - <include name="**/xe-*" /> - <include name="**/xen-*" /> - </fileset> - </copy> - <tar destfile="${basedir}/target/patch.tar"> - <tarfileset dir="${basedir}/target/build-patch/" - filemode="755"> - <include name="**/*" /> - <exclude name="**/.classpath" /> - <exclude name="**/log**"/> - <exclude name="**/logrotate.d"/> - <exclude name="**/.project" /> - <exclude name="**/wscript_build" /> - </tarfileset> - <tarfileset dir="${basedir}/target/build-patch/" - filemode="644"> - <include name="**/log**"/> - <include name="**/logrotate.d/**"/> - </tarfileset> - </tar> - <gzip destfile="${basedir}/target/cloud-scripts.tgz" src="${basedir}/target/patch.tar" /> - <delete dir="${basedir}/target/build-patch" /> - <delete file="${basedir}/target/patch.tar" /> - </target> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17977b42/services/secondary-storage/pom.xml ---------------------------------------------------------------------- diff --git a/services/secondary-storage/pom.xml b/services/secondary-storage/pom.xml index 9fe8da3..2015ce0 100644 --- a/services/secondary-storage/pom.xml +++ b/services/secondary-storage/pom.xml @@ -50,12 +50,6 @@ </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> - <artifactId>cloud-patches</artifactId> - <version>${project.version}</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-server</artifactId> <version>${project.version}</version> </dependency>
