reverting maven removal of leg-rc package

removing versionsBackup files that were accidentally added
skestle · Apr 13, 2016 · 99abe79 · 99abe79
1 parent c6f7cd5
commit 99abe79
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 316 deletions.
diff --git a/maven/java/pom.xml b/maven/java/pom.xml
@@ -42,6 +42,11 @@
             <artifactId>selenium-support</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-leg-rc</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/maven/java/pom.xml.versionsBackup → maven/leg-rc/pom.xml b/maven/java/pom.xml.versionsBackup → maven/leg-rc/pom.xml
@@ -6,46 +6,28 @@
     <parent>
         <groupId>org.seleniumhq.selenium</groupId>
         <artifactId>selenium-parent</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>3.0-beta1-SNAPSHOT</version>
     </parent>
-    <artifactId>selenium-java</artifactId>
-    <name>selenium-java</name>
+    <artifactId>selenium-leg-rc</artifactId>
+    <name>selenium-leg-rc</name>
 
     <dependencies>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-chrome-driver</artifactId>
+            <artifactId>selenium-remote-driver</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <!-- We need JUnit for SeleneseTestCase ... -->
         <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-edge-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-safari-driver</artifactId>
-            <version>${project.version}</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <optional>true</optional>
         </dependency>
+        <!-- We need TestNG for SeleneseTestNgHelper ... -->
         <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-support</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-leg-rc</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 
@@ -69,15 +51,14 @@
                                             <or>
                                                 <present targetdir="../api/src/main/java" />
                                                 <present targetdir="../chrome-driver/src/main/java" />
-                                                <present targetdir="../edge-driver/src/main/java" />
                                                 <present targetdir="../firefox-driver/src/main/java" />
                                                 <present targetdir="../htmlunit-driver/src/main/java" />
                                                 <present targetdir="../ie-driver/src/main/java" />
                                                 <present targetdir="../iphone-driver/src/main/java" />
                                                 <present targetdir="../remote-driver/src/main/java" />
                                                 <present targetdir="../safari-driver/src/main/java" />
+                                                <present targetdir="../edge-driver/src/main/java" />
                                                 <present targetdir="../support/src/main/java" />
-                                                <present targetdir="../leg-rc/src/main/java" />
                                             </or>
                                         </not>
                                     </fileset>
@@ -88,6 +69,23 @@
                             <goal>run</goal>
                         </goals>
                     </execution>
+                    <execution>
+                        <id>copy_resource_files</id>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <tasks>
+                                <!-- Extract *.js files from client-combined-nodeps.jar to target/classes ... -->
+                                <unjar src="../../build/java/client/src/com/thoughtworks/selenium/webdriven/webdriven.jar" dest="target/classes">
+                                    <patternset>
+                                        <include name="**/webdriven/*.js" />
+                                    </patternset>
+                                </unjar>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -134,6 +134,7 @@
         <module>safari-driver</module>
         <module>server</module>
         <module>support</module>
+        <module>leg-rc</module>
     </modules>
 
     <dependencyManagement>