mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Separate out the target directories for eclipse and the one for regular builds
This commit is contained in:
Alex Huang
parent
1079d63b6f
commit
01151331f5
1
.gitignore
vendored
1
.gitignore
vendored
@ -59,6 +59,7 @@ tools/cli/build/
|
||||
*.iso
|
||||
*.tar.gz
|
||||
*.tgz
|
||||
target-eclipse
|
||||
awsapi/modules/*
|
||||
!.gitignore
|
||||
.classpath
|
||||
|
||||
124
pom.xml
124
pom.xml
@ -1,21 +1,13 @@
|
||||
<!--
|
||||
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.
|
||||
-->
|
||||
<!-- 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/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
@ -43,7 +35,7 @@
|
||||
</issueManagement>
|
||||
|
||||
<properties>
|
||||
<!--skipTests>true</skipTests-->
|
||||
<!--skipTests>true</skipTests -->
|
||||
<cs.jdk.version>1.6</cs.jdk.version>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
||||
@ -92,6 +84,7 @@
|
||||
<cs.java-ipv6.version>0.10</cs.java-ipv6.version>
|
||||
<cs.replace.properties>build/replace.properties</cs.replace.properties>
|
||||
<cs.libvirt-java.version>0.4.9</cs.libvirt-java.version>
|
||||
<cs.target.dir>target</cs.target.dir>
|
||||
</properties>
|
||||
|
||||
<distributionManagement>
|
||||
@ -205,61 +198,24 @@
|
||||
<artifactId>spring-web</artifactId>
|
||||
<version>${org.springframework.version}</version>
|
||||
</dependency>
|
||||
<!--
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-expression</artifactId>
|
||||
<version>${org.springframework.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-beans</artifactId>
|
||||
<version>${org.springframework.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-aop</artifactId>
|
||||
<version>${org.springframework.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-context-support</artifactId>
|
||||
<version>${org.springframework.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-tx</artifactId>
|
||||
<version>${org.springframework.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-jdbc</artifactId>
|
||||
<version>${org.springframework.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-orm</artifactId>
|
||||
<version>${org.springframework.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-oxm</artifactId>
|
||||
<version>${org.springframework.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-webmvc</artifactId>
|
||||
<version>${org.springframework.version}</version>
|
||||
</dependency>
|
||||
-->
|
||||
<!-- <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> <dependency>
|
||||
<groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> <dependency>
|
||||
<groupId>org.springframework</groupId> <artifactId>spring-aop</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> <dependency>
|
||||
<groupId>org.springframework</groupId> <artifactId>spring-context-support</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> <dependency>
|
||||
<groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> <dependency>
|
||||
<groupId>org.springframework</groupId> <artifactId>spring-jdbc</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> <dependency>
|
||||
<groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> <dependency>
|
||||
<groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> <dependency>
|
||||
<groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId>
|
||||
<version>${org.springframework.version}</version> </dependency> -->
|
||||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-all</artifactId>
|
||||
@ -293,6 +249,8 @@
|
||||
|
||||
<build>
|
||||
<defaultGoal>install</defaultGoal>
|
||||
<outputDirectory>${basedir}/${cs.target.dir}/classes</outputDirectory>
|
||||
<testOutputDirectory>${basedir}/${cs.target.dir}/test-classes</testOutputDirectory>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<!--This plugin's configuration is used to store Eclipse m2e settings
|
||||
@ -514,6 +472,12 @@
|
||||
<module>awsapi</module>
|
||||
</modules>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>eclipse</id>
|
||||
<properties>
|
||||
<cs.target.dir>target-eclipse</cs.target.dir>
|
||||
</properties>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>developer</id>
|
||||
<properties>
|
||||
@ -524,6 +488,16 @@
|
||||
<module>tools</module>
|
||||
</modules>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>impatient</id>
|
||||
<properties>
|
||||
<marvin.config>tools/devcloud/devcloud.cfg</marvin.config>
|
||||
</properties>
|
||||
<modules>
|
||||
<module>developer</module>
|
||||
<!--module>tools/devcloud</module-->
|
||||
</modules>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>vmware</id>
|
||||
<activation>
|
||||
@ -626,7 +600,7 @@
|
||||
<!-- simulator sql files -->
|
||||
<argument>${basedir}/target/db/create-schema-simulator.sql</argument>
|
||||
<argument>${basedir}/target/db/templates.simulator.sql</argument>
|
||||
<!-- database upgrade-->
|
||||
<!-- database upgrade -->
|
||||
<argument>com.cloud.upgrade.DatabaseUpgradeChecker</argument>
|
||||
<argument>--database=simulator</argument>
|
||||
<argument>--rootpassword=${db.root.password}</argument>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user