Skip to content

Commit

Permalink
MichaelTamm: Prepared Maven pom.xml files for next release
Browse files Browse the repository at this point in the history 
r11282
  • Loading branch information
Michael Tamm committed Feb 4, 2011
1 parent 2c3acec commit 4599600
Show file tree
Hide file tree
Showing 10 changed files with 67 additions and 103 deletions.
6 changes: 3 additions & 3 deletions maven/api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<artifactId>selenium-parent</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<artifactId>selenium-api</artifactId>
<name>selenium-api</name>
<artifactId>selenium-webdriver-api</artifactId>
<name>selenium-webdriver-api</name>

<dependencies>
<dependency>
Expand All @@ -30,7 +30,7 @@
<configuration>
<tasks>
<delete dir="src/main/java" />
<copy todir="src/main/java">
<copy todir="src/main/java" includeEmptyDirs="false">
<fileset dir="../../java/client/src">
<include name="com/thoughtworks/selenium/SeleniumException.java" />
<include name="org/openqa/selenium/*.java" />
Expand Down
4 changes: 2 additions & 2 deletions maven/chrome/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<dependencies>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-common</artifactId>
<artifactId>selenium-webdriver-common</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand All @@ -31,7 +31,7 @@
<configuration>
<tasks>
<delete dir="src/main/java" />
<copy todir="src/main/java">
<copy todir="src/main/java" includeEmptyDirs="false">
<fileset dir="../../java/client/src">
<include name="org/openqa/selenium/chrome/**/*.java" />
</fileset>
Expand Down
8 changes: 4 additions & 4 deletions maven/common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<artifactId>selenium-parent</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
<artifactId>selenium-common</artifactId>
<name>selenium-common</name>
<artifactId>selenium-webdriver-common</artifactId>
<name>selenium-webdriver-common</name>

<dependencies>
<dependency>
Expand All @@ -22,7 +22,7 @@
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-api</artifactId>
<artifactId>selenium-webdriver-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -43,7 +43,7 @@
<configuration>
<tasks>
<delete dir="src/main/java" />
<copy todir="src/main/java">
<copy todir="src/main/java" includeEmptyDirs="false">
<fileset dir="../../java/client/src">
<include name="org/openqa/selenium/browserlaunchers/**/*.java" />
<include name="org/openqa/selenium/io/**/*.java" />
Expand Down
4 changes: 2 additions & 2 deletions maven/firefox/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<dependencies>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-common</artifactId>
<artifactId>webdriver-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -35,7 +35,7 @@
<configuration>
<tasks>
<delete dir="src/main/java" />
<copy todir="src/main/java">
<copy todir="src/main/java" includeEmptyDirs="false">
<fileset dir="../../java/client/src">
<include name="org/openqa/selenium/firefox/**/*.java" />
</fileset>
Expand Down
4 changes: 2 additions & 2 deletions maven/htmlunit/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<dependencies>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-api</artifactId>
<artifactId>selenium-webdriver-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -36,7 +36,7 @@
<configuration>
<tasks>
<delete dir="src/main/java" />
<copy todir="src/main/java">
<copy todir="src/main/java" includeEmptyDirs="false">
<fileset dir="../../java/client/src">
<include name="org/openqa/selenium/htmlunit/**/*.java" />
</fileset>
Expand Down
4 changes: 2 additions & 2 deletions maven/ie/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-common</artifactId>
<artifactId>selenium-webdriver-common</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand All @@ -35,7 +35,7 @@
<configuration>
<tasks>
<delete dir="src/main/java" />
<copy todir="src/main/java">
<copy todir="src/main/java" includeEmptyDirs="false">
<fileset dir="../../java/client/src">
<include name="org/openqa/selenium/ie/**/*.java" />
</fileset>
Expand Down
7 changes: 5 additions & 2 deletions maven/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,8 @@
<module>firefox</module>
<module>htmlunit</module>
<module>ie</module>
<!--
<module>selenium</module>
<module>server</module>
-->
<module>support</module>
</modules>

Expand Down Expand Up @@ -147,6 +145,11 @@
<artifactId>httpclient</artifactId>
<version>4.0.2</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
Expand Down
97 changes: 31 additions & 66 deletions maven/selenium/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@
<artifactId>junit</artifactId>
<optional>true</optional>
</dependency>
<!-- We need TestNG for SeleneseTestNgHelper ... -->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<optional>true</optional>
</dependency>
<!-- Runtime dependencies ... -->
<!--
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-chrome-driver</artifactId>
Expand All @@ -36,90 +28,74 @@
<artifactId>selenium-htmlunit-driver</artifactId>
<version>${project.version}</version>
</dependency>
-->
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-firefox-driver</artifactId>
<version>${project.version}</version>
</dependency>
<!--
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-ie-driver</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-iphone-driver</artifactId>
<artifactId>selenium-support</artifactId>
<version>${project.version}</version>
</dependency>
-->
<!-- We need TestNG for SeleneseTestNgHelper ... -->
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-support</artifactId>
<version>${project.version}</version>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<optional>true</optional>
</dependency>
</dependencies>

<build>
<sourceDirectory>src/java</sourceDirectory>
<testSourceDirectory>test/java</testSourceDirectory>
<plugins>
<!-- See http://maven.apache.org/plugins/maven-antrun-plugin -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>create_selenium_resources</id>
<phase>generate-resources</phase>
<id>copy_java_files</id>
<phase>generate-sources</phase>
<configuration>
<tasks>
<!-- 1. Execute rake to build ../build/selenium/selenium.jar ... -->
<condition property="goExecutable" value="go.bat" else="./go">
<os family="windows" />
</condition>
<exec dir=".." executable="${goExecutable}">
<arg value="//selenium:selenium" />
</exec>
<!-- Extract everything but the *.class files and MANIFEST.MF from selenium.jar to target/classes ... -->
<unjar src="../../build/java/client/src/org/openqa/selenium/server/server_lite.jar" dest="target/classes">
<patternset>
<exclude name="**/*.class" />
<exclude name="META-INF/MANIFEST.MF" />
</patternset>
</unjar>
<!-- 2. Extract everything but the class files and MANIFEST.MF to target/classes ... -->
<mkdir dir="target/classes" />
<unjar src="../build/selenium/selenium.jar" dest="target/classes">
<patternset>
<exclude name="**/*.class" />
<exclude name="META-INF/MANIFEST.MF" />
</patternset>
</unjar>
<delete dir="src/main/java" />
<copy todir="src/main/java" includeEmptyDirs="false">
<fileset dir="../../java/client/src">
<include name="**/*.java" />
<not>
<or>
<present targetdir="../api/src/main/java" />
<present targetdir="../chrome/src/main/java" />
<present targetdir="../common/src/main/java" />
<present targetdir="../firefox/src/main/java" />
<present targetdir="../htmlunit/src/main/java" />
<present targetdir="../ie/src/main/java" />
<present targetdir="../support/src/main/java" />
</or>
</not>
<exclude name="org/openqa/selenium/android/**" />
<exclude name="org/openqa/selenium/iphone/**" />
</fileset>
</copy>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<execution>
<id>create_selenium_test_resources</id>
<phase>generate-test-resources</phase>
<id>copy_resources</id>
<phase>generate-resources</phase>
<configuration>
<tasks>
<!-- 1. Execute rake to build ../build/selenium/test.jar ... -->
<condition property="goExecutable" value="go.bat" else="./go">
<os family="windows" />
</condition>
<exec dir=".." executable="${goExecutable}">
<arg value="//selenium:test" />
</exec>
<!-- 2. Extract everything but the class files and MANIFEST.MF to target/test-classes ... -->
<mkdir dir="target/test-classes" />
<unjar src="../build/selenium/test.jar" dest="target/test-classes">
<!-- Extract scripts from client-combined-nodeps.jar to target/classes ... -->
<unjar src="../../build/java/client/src/org/openqa/selenium/client-combined-nodeps.jar" dest="target/classes">
<patternset>
<exclude name="**/*.class" />
<exclude name="META-INF/MANIFEST.MF" />
<include name="scripts/selenium/*.js" />
</patternset>
</unjar>
</tasks>
Expand All @@ -130,17 +106,6 @@
</execution>
</executions>
</plugin>
<!-- See http://maven.apache.org/plugins/maven-surefire-plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>**/*TestSuite.java</include>
<exclude>**/SingleTestSuite.java</exclude>
</includes>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
25 changes: 7 additions & 18 deletions maven/server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@
<name>selenium-server</name>

<dependencies>
<!--
<dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.6.5</version>
</dependency>
-->
<dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
Expand Down Expand Up @@ -54,13 +47,6 @@
<artifactId>selenium-ie-driver</artifactId>
<version>${project.version}</version>
</dependency>
<!--
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-iphone-driver</artifactId>
<version>${project.version}</version>
</dependency>
-->
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-support</artifactId>
Expand All @@ -80,8 +66,10 @@
<configuration>
<tasks>
<delete dir="src/main/java" />
<copy todir="src/main/java">
<fileset dir="../../java/server/src" />
<copy todir="src/main/java" includeEmptyDirs="false">
<fileset dir="../../java/server/src">
<include name="**/*.java" />
</fileset>
</copy>
</tasks>
</configuration>
Expand All @@ -101,10 +89,11 @@
<exclude name="META-INF/MANIFEST.MF" />
</patternset>
</unjar>
<!-- Copy everything but the *.java files from the java/server/src directory to target/classes ... -->
<copy todir="target/classes">
<!-- Copy everything but the *.java and build.desc files from the java/server/src directory to target/classes ... -->
<copy todir="target/classes" includeEmptyDirs="false">
<fileset dir="../../java/server/src">
<exclude name="**/*.java" />
<exclude name="**/build.desc" />
</fileset>
</copy>
</tasks>
Expand Down
11 changes: 9 additions & 2 deletions maven/support/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,15 @@
<dependencies>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-api</artifactId>
<artifactId>selenium-webdriver-api</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Hamcrest is needed for the classes in the org.openqa.selenium.lift package ... -->
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -36,8 +42,9 @@
<configuration>
<tasks>
<delete dir="src/main/java" />
<copy todir="src/main/java">
<copy todir="src/main/java" includeEmptyDirs="false">
<fileset dir="../../java/client/src">
<include name="org/openqa/selenium/lift/**/*.java" />
<include name="org/openqa/selenium/support/**/*.java" />
</fileset>
</copy>
Expand Down

0 comments on commit 4599600

Please sign in to comment.