Skip to content
This repository was archived by the owner on Feb 2, 2025. It is now read-only.

Commit 4596ca3

Browse files
Hi-FiHi-Fi
authored
Merge pull request #66 from Hi-Fi/release/3.141.59.2
Release/3.141.59.2
2 parents 471a26f + b2955a2 commit 4596ca3

File tree

11 files changed

+95
-177
lines changed

11 files changed

+95
-177
lines changed

‎.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ env:
88
- PROFILE=build,firefox
99
- PROFILE=build,googlechromeheadless
1010
- PROFILE=build,firefoxheadless
11-
- PROFILE=build,phantomjs
12-
- PROFILE=build,htmlunitwithjs
1311

1412
stages:
1513
- test

‎README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,24 +45,25 @@ your pom.xml:
4545
<dependency>
4646
<groupId>com.github.hi-fi</groupId>
4747
<artifactId>robotframework-seleniumlibrary</artifactId>
48-
<version>3.14.0.0</version>
48+
<version>3.141.59.2</version>
4949
<scope>test</scope>
5050
</dependency>
5151

5252
If you cannot use the robotframework-maven-plugin you can use the
53-
[jar-with-dependencies](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.14.0.0/robotframework-seleniumlibrary-3.14.0.0-jar-with-dependencies.jar),
54-
which contains all required libraries.
53+
[jar-with-dependencies](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.2/robotframework-seleniumlibrary-3.141.59.2-jar-with-dependencies.jar),
54+
which contains all required libraries. Running of tests with this can be done with command `java -jar robotframework-seleniumlibrary-3.141.59.2-jar-with-dependencies.jar <test location>`.
5555

5656
* More information about this library can be found in the
57-
[Keyword Documentation](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.14.0.0/robotframework-seleniumlibrary-3.14.0.0.html).
57+
[Keyword Documentation](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.2/robotframework-seleniumlibrary-3.141.59.2.html).
5858
* For keyword completion in RIDE you can download this
59-
[Library Specs](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.14.0.0/robotframework-seleniumlibrary-3.14.0.0.xml)
59+
[Library Specs](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.2/robotframework-seleniumlibrary-3.141.59.2.xml)
6060
and place it in your PYTHONPATH.
6161

6262
Differences
6363
-----------
6464

6565
* Some keyword differences between this and [Python version](https://github.com/robotframework/SeleniumLibrary) exists. (Same) keywords should be aligned in upcoming versions.
66+
* Older version of the library was imported as `Library Selenium2Library` (both Java and Python versions). Since 2.53.1.1 (and all 3.x versions) import is done as `Library SeleniumLibrary`
6667

6768

6869
Browser drivers

‎pom.xml

Lines changed: 54 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

56
<groupId>com.github.hi-fi</groupId>
67
<artifactId>robotframework-seleniumlibrary</artifactId>
7-
<version>3.14.0.1-SNAPSHOT</version>
8+
<version>3.141.59.26-SNAPSHOT</version>
89
<packaging>jar</packaging>
910

1011
<name>Robot Framework :: SeleniumLibrary</name>
@@ -67,10 +68,10 @@
6768
<downloadSources>true</downloadSources>
6869
<downloadJavadocs>true</downloadJavadocs>
6970
<aspectj.version>1.9.1</aspectj.version>
70-
<java.version>1.7</java.version>
71-
<robotframework.version>3.0.4</robotframework.version>
72-
<robotframework.maven.plugin.version>1.4.7</robotframework.maven.plugin.version>
73-
<selenium.version>3.14.0</selenium.version>
71+
<java.version>1.8</java.version>
72+
<robotframework.maven.plugin.version>1.5.1</robotframework.maven.plugin.version>
73+
<robotframework.version>3.1.1</robotframework.version>
74+
<selenium.version>3.141.59</selenium.version>
7475
<keywords.class>SeleniumLibrary</keywords.class>
7576
<browser>jbrowser</browser>
7677
</properties>
@@ -81,16 +82,16 @@
8182
<artifactId>javalib-core</artifactId>
8283
<version>1.2.1</version>
8384
</dependency>
84-
<dependency>
85-
<groupId>org.seleniumhq.selenium</groupId>
86-
<artifactId>selenium-server</artifactId>
87-
<version>${selenium.version}</version>
88-
</dependency>
8985
<dependency>
9086
<groupId>org.robotframework</groupId>
9187
<artifactId>robotframework</artifactId>
9288
<version>${robotframework.version}</version>
9389
</dependency>
90+
<dependency>
91+
<groupId>org.seleniumhq.selenium</groupId>
92+
<artifactId>selenium-server</artifactId>
93+
<version>${selenium.version}</version>
94+
</dependency>
9495
<dependency>
9596
<groupId>org.aspectj</groupId>
9697
<artifactId>aspectjrt</artifactId>
@@ -115,46 +116,17 @@
115116
<dependency>
116117
<groupId>io.appium</groupId>
117118
<artifactId>java-client</artifactId>
118-
<version>5.0.4</version>
119-
<exclusions>
120-
<exclusion>
121-
<groupId>org.seleniumhq.selenium</groupId>
122-
<artifactId>selenium-java</artifactId>
123-
</exclusion>
124-
<exclusion>
125-
<groupId>org.seleniumhq.selenium</groupId>
126-
<artifactId>selenium-support</artifactId>
127-
</exclusion>
128-
<exclusion>
129-
<groupId>org.seleniumhq.selenium</groupId>
130-
<artifactId>selenium-api</artifactId>
131-
</exclusion>
132-
</exclusions>
119+
<version>7.0.0</version>
133120
</dependency>
134121
<dependency>
135122
<groupId>org.apache.commons</groupId>
136123
<artifactId>commons-exec</artifactId>
137124
<version>1.3</version>
138125
</dependency>
139-
<dependency>
140-
<groupId>com.codeborne</groupId>
141-
<artifactId>phantomjsdriver</artifactId>
142-
<version>1.4.4</version>
143-
<exclusions>
144-
<exclusion>
145-
<groupId>org.seleniumhq.selenium</groupId>
146-
<artifactId>selenium-api</artifactId>
147-
</exclusion>
148-
<exclusion>
149-
<groupId>org.seleniumhq.selenium</groupId>
150-
<artifactId>selenium-remote-driver</artifactId>
151-
</exclusion>
152-
</exclusions>
153-
</dependency>
154126
<dependency>
155127
<groupId>com.machinepublishers</groupId>
156128
<artifactId>jbrowserdriver</artifactId>
157-
<version>1.0.0</version>
129+
<version>1.0.1</version>
158130
</dependency>
159131
<dependency>
160132
<groupId>org.mockito</groupId>
@@ -380,6 +352,12 @@
380352
<artifactId>maven-assembly-plugin</artifactId>
381353
<version>2.6</version>
382354
<configuration>
355+
<archive>
356+
<manifest>
357+
<addClasspath>true</addClasspath>
358+
<mainClass>org.robotframework.RobotFramework</mainClass>
359+
</manifest>
360+
</archive>
383361
<descriptorRefs>
384362
<descriptorRef>jar-with-dependencies</descriptorRef>
385363
</descriptorRefs>
@@ -412,45 +390,20 @@
412390
<groupId>org.robotframework</groupId>
413391
<artifactId>robotframework-maven-plugin</artifactId>
414392
<configuration>
415-
<externalRunner>
416-
<jvmArgs>
417-
<jvmArg>-Dwebdriver.gecko.driver=${webdriver.gecko.driver}</jvmArg>
418-
</jvmArgs>
419-
</externalRunner>
393+
<externalRunner>
394+
<jvmArgs>
395+
<jvmArg>-Dwebdriver.gecko.driver=${webdriver.gecko.driver}</jvmArg>
396+
</jvmArgs>
397+
</externalRunner>
420398
</configuration>
421399
</plugin>
422400
</plugins>
423401
</build>
424402
</profile>
425-
<profile>
426-
<id>firefoxheadless</id>
427-
<properties>
428-
<browser>firefoxheadless</browser>
429-
</properties>
430-
<build>
431-
<plugins>
432-
<plugin>
433-
<groupId>com.lazerycode.selenium</groupId>
434-
<artifactId>driver-binary-downloader-maven-plugin</artifactId>
435-
</plugin>
436-
<plugin>
437-
<groupId>org.robotframework</groupId>
438-
<artifactId>robotframework-maven-plugin</artifactId>
439-
<configuration>
440-
<externalRunner>
441-
<jvmArgs>
442-
<jvmArg>-Dwebdriver.gecko.driver=${webdriver.gecko.driver}</jvmArg>
443-
</jvmArgs>
444-
</externalRunner>
445-
</configuration>
446-
</plugin>
447-
</plugins>
448-
</build>
449-
</profile>
450403
<profile>
451-
<id>phantomjs</id>
404+
<id>firefoxheadless</id>
452405
<properties>
453-
<browser>phantomjs</browser>
406+
<browser>firefoxheadless</browser>
454407
</properties>
455408
<build>
456409
<plugins>
@@ -461,13 +414,13 @@
461414
<plugin>
462415
<groupId>org.robotframework</groupId>
463416
<artifactId>robotframework-maven-plugin</artifactId>
464-
<configuration>
465-
<externalRunner>
466-
<jvmArgs>
467-
<jvmArg>-Dphantomjs.binary.path=${phantomjs.binary.path}</jvmArg>
468-
</jvmArgs>
469-
</externalRunner>
470-
</configuration>
417+
<configuration>
418+
<externalRunner>
419+
<jvmArgs>
420+
<jvmArg>-Dwebdriver.gecko.driver=${webdriver.gecko.driver}</jvmArg>
421+
</jvmArgs>
422+
</externalRunner>
423+
</configuration>
471424
</plugin>
472425
</plugins>
473426
</build>
@@ -486,52 +439,38 @@
486439
<plugin>
487440
<groupId>org.robotframework</groupId>
488441
<artifactId>robotframework-maven-plugin</artifactId>
489-
<configuration>
490-
<externalRunner>
491-
<jvmArgs>
492-
<jvmArg>-Dwebdriver.chrome.driver=${webdriver.chrome.driver}</jvmArg>
493-
</jvmArgs>
494-
</externalRunner>
495-
</configuration>
442+
<configuration>
443+
<externalRunner>
444+
<jvmArgs>
445+
<jvmArg>-Dwebdriver.chrome.driver=${webdriver.chrome.driver}</jvmArg>
446+
</jvmArgs>
447+
</externalRunner>
448+
</configuration>
496449
</plugin>
497450
</plugins>
498451
</build>
499452
</profile>
500453
<profile>
501-
<id>googlechromeheadless</id>
502-
<properties>
503-
<browser>googlechromeheadless</browser>
504-
</properties>
505-
<build>
506-
<plugins>
507-
<plugin>
508-
<groupId>com.lazerycode.selenium</groupId>
509-
<artifactId>driver-binary-downloader-maven-plugin</artifactId>
510-
</plugin>
511-
<plugin>
512-
<groupId>org.robotframework</groupId>
513-
<artifactId>robotframework-maven-plugin</artifactId>
514-
<configuration>
515-
<externalRunner>
516-
<jvmArgs>
517-
<jvmArg>-Dwebdriver.chrome.driver=${webdriver.chrome.driver}</jvmArg>
518-
</jvmArgs>
519-
</externalRunner>
520-
</configuration>
521-
</plugin>
522-
</plugins>
523-
</build>
524-
</profile>
525-
<profile>
526-
<id>htmlunitwithjs</id>
454+
<id>googlechromeheadless</id>
527455
<properties>
528-
<browser>htmlunitwithjs</browser>
456+
<browser>googlechromeheadless</browser>
529457
</properties>
530458
<build>
531459
<plugins>
460+
<plugin>
461+
<groupId>com.lazerycode.selenium</groupId>
462+
<artifactId>driver-binary-downloader-maven-plugin</artifactId>
463+
</plugin>
532464
<plugin>
533465
<groupId>org.robotframework</groupId>
534466
<artifactId>robotframework-maven-plugin</artifactId>
467+
<configuration>
468+
<externalRunner>
469+
<jvmArgs>
470+
<jvmArg>-Dwebdriver.chrome.driver=${webdriver.chrome.driver}</jvmArg>
471+
</jvmArgs>
472+
</externalRunner>
473+
</configuration>
535474
</plugin>
536475
</plugins>
537476
</build>

0 commit comments

Comments
 (0)