MichaelTamm: Updated pom.xml files for building Maven artifacts

r12495
patcadelina · Jun 15, 2011 · 5fb6adf · 5fb6adf
1 parent 70efdb8
commit 5fb6adf
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 36 deletions.
diff --git a/maven/android-driver/pom.xml b/maven/android-driver/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<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>
+
+	<parent>
+		<groupId>org.seleniumhq.selenium</groupId>
+		<artifactId>selenium-parent</artifactId>
+		<version>2.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>selenium-android-driver</artifactId>
+	<name>selenium-android-driver</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.seleniumhq.selenium</groupId>
+			<artifactId>selenium-remote-driver</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
+    <build>
+        <plugins>
+            <!-- See http://maven.apache.org/plugins/maven-antrun-plugin -->
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy_java_files</id>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <tasks>
+                                <delete dir="src/main/java" />
+                                <copy todir="src/main/java" includeEmptyDirs="false">
+                                    <fileset dir="../../java/client/src">
+                                        <include name="org/openqa/selenium/android/**/*.java" />
+                                    </fileset>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/maven/remote-control/pom.xml → maven/java/pom.xml b/maven/remote-control/pom.xml → maven/java/pom.xml
@@ -8,15 +8,14 @@
         <artifactId>selenium-parent</artifactId>
         <version>2.0-SNAPSHOT</version>
     </parent>
-    <artifactId>selenium-remote-control</artifactId>
-    <name>selenium-remote-control</name>
+    <artifactId>selenium-java</artifactId>
+    <name>selenium-java</name>
 
     <dependencies>
-        <!-- We need JUnit for SeleneseTestCase ... -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <optional>true</optional>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-android-driver</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
@@ -49,6 +48,12 @@
             <version>${project.version}</version>
             <optional>true</optional>
         </dependency>
+        <!-- We need JUnit for SeleneseTestCase ... -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <optional>true</optional>
+        </dependency>
         <!-- We need TestNG for SeleneseTestNgHelper ... -->
         <dependency>
             <groupId>org.testng</groupId>

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -102,15 +102,15 @@
     </profiles>
 
     <modules>
+		<module>android-driver</module>
         <module>api</module>
         <module>chrome-driver</module>
         <module>firefox-driver</module>
         <module>htmlunit-driver</module>
         <module>ie-driver</module>
         <module>iphone-driver</module>
-        <module>remote-control</module>
+        <module>java</module>
         <module>remote-driver</module>
-        <module>selenium</module>
         <module>server</module>
         <module>support</module>
     </modules>

diff --git a/maven/selenium/pom.xml b/maven/selenium/pom.xml
diff --git a/maven/server/pom.xml b/maven/server/pom.xml
@@ -27,6 +27,11 @@
             <artifactId>servlet-api-2.5</artifactId>
             <version>6.1.9</version>
         </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-android-driver</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-chrome-driver</artifactId>