cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject git commit: updated refs/heads/master to 34b6a39
Date Tue, 12 Nov 2013 16:18:14 GMT
Updated Branches:
  refs/heads/master c2078cd60 -> 34b6a395c


Fix pom problems causing compilation failures. No master pom was set and this module uses
maven standard directory locations


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/34b6a395
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/34b6a395
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/34b6a395

Branch: refs/heads/master
Commit: 34b6a395ced605055e28965c7f4e346431a343b2
Parents: c2078cd
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Tue Nov 12 17:16:57 2013 +0100
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Tue Nov 12 17:16:57 2013 +0100

----------------------------------------------------------------------
 services/console-proxy-rdp/rdpconsole/pom.xml | 29 +++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/34b6a395/services/console-proxy-rdp/rdpconsole/pom.xml
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/pom.xml b/services/console-proxy-rdp/rdpconsole/pom.xml
index 71d0241..c829f6b 100644
--- a/services/console-proxy-rdp/rdpconsole/pom.xml
+++ b/services/console-proxy-rdp/rdpconsole/pom.xml
@@ -21,16 +21,39 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>rdpclient</groupId>
   <artifactId>cloudstack-service-console-proxy-rdpclient</artifactId>
-  <version>4.3.0-SNAPSHOT</version>
   <packaging>jar</packaging>
-
   <name>Apache CloudStack Console Proxy - RDP Client</name>
-  <url>http://maven.apache.org</url>
+
+  <parent>
+    <groupId>org.apache.cloudstack</groupId>
+    <artifactId>cloudstack-services</artifactId>
+    <version>4.3.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
+  <!-- not parenting to the maven-default pom, as we want this in services -->
+  <build>
+    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+    <scriptSourceDirectory>${basedir}/src/main/scripts</scriptSourceDirectory>
+    <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
+    <outputDirectory>${basedir}/target/classes</outputDirectory>
+    <testOutputDirectory>${basedir}/target/test-classes</testOutputDirectory>
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/resources</directory>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>${basedir}/src/test/resources</directory>
+      </testResource>
+    </testResources>
+  </build>
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>


Mime
View raw message