Skip to content

Commit

Permalink
Merge pull request #68 from robotframework/release/1.5.2
Browse files Browse the repository at this point in the history
Release/1.5.2
  • Loading branch information
Hi-Fi authored Dec 17, 2019
2 parents 2647254 + 139d03f commit 04dea3b
Show file tree
Hide file tree
Showing 17 changed files with 62 additions and 124 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Java CI

on: [push]

jobs:
build_and_test:
runs-on: ubuntu-latest
strategy:
matrix:
# test against LTS java versions:
java: [ 8, 11 ]
name: Test with Java ${{ matrix.java }}
steps:
- uses: actions/checkout@v1
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
with:
java-version: ${{ matrix.java }}
- name: Build with Maven
run: mvn -B verify --file pom.xml
release:
needs: [build_and_test]
if: github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags/')
runs-on: ubuntu-latest
name: Release package
steps:
- uses: actions/checkout@v1
- name: Set up JDK
uses: actions/setup-java@v1
with:
java-version: 8
- name: Release Maven package
uses: samuelmeuli/action-maven-publish@v1
with:
gpg_private_key: ${{ secrets.gpg_private_key }}
gpg_passphrase: ${{ secrets.gpg_passphrase }}
nexus_username: ${{ secrets.nexus_username }}
nexus_password: ${{ secrets.nexus_password }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ docs/_build
.classpath
.settings/
.project
.factorypath
.vscode
51 changes: 0 additions & 51 deletions .travis.yml

This file was deleted.

15 changes: 0 additions & 15 deletions .travis/deploy.sh

This file was deleted.

25 changes: 0 additions & 25 deletions .travis/settings.xml

This file was deleted.

4 changes: 2 additions & 2 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ Releasing

osx:
```bash
grep -rl 'sion>1.5.1</ver' ./ | xargs sed -i '' 's|sion>1.5.1</ver|sion>1.6</ver|g'
grep -rl 'sion>1.5.2</ver' ./ | xargs sed -i '' 's|sion>1.5.2</ver|sion>1.6</ver|g'
```
linux:
```bash
grep -rl 'sion>1.5.1</ver' ./ | xargs sed -i 's|sion>1.5.1</ver|sion>1.6</ver|g'
grep -rl 'sion>1.5.2</ver' ./ | xargs sed -i 's|sion>1.5.2</ver|sion>1.6</ver|g'
```
Last you should update those rows above.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Add the plugin to your build:
<plugin>
<groupId>org.robotframework</groupId>
<artifactId>robotframework-maven-plugin</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
<executions>
<execution>
<goals>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<groupId>org.robotframework</groupId>
<artifactId>robotframework-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>1.5.1</version>
<version>1.5.2</version>
<name>Robot Framework Maven Plugin</name>
<description>
Maven plugin for the Robot Framework.
Expand Down Expand Up @@ -202,7 +202,7 @@
<dependency>
<groupId>org.robotframework</groupId>
<artifactId>robotframework</artifactId>
<version>3.1.1</version>
<version>3.1.2</version>
</dependency>

<dependency>
Expand Down
13 changes: 3 additions & 10 deletions src/site/apt/examples/javalibraries.apt
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
------
Java Libraries
------
Dietrich Schulten
------
2012-01-20
------

Using Java Libraries with the Robotframework Plugin

* Java test libraries

You can access Java test libraries by adding the jars to the extraPathDirectories parameter.
You can access Java test libraries by adding the jars to the extraPathDirectories parameter or importing those
as Maven dependencies.
Note that such tests will run with Jython only.

+---
Expand Down Expand Up @@ -43,7 +36,7 @@ Using Java Libraries with the Robotframework Plugin
<plugin>
<groupId>org.robotframework</groupId>
<artifactId>robotframework-maven-plugin</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
<configuration>
<extraPathDirectories>
<extraPathDirectory>src/test/resources/python</extraPathDirectory>
Expand Down
24 changes: 10 additions & 14 deletions src/site/apt/examples/seleniumlibrary.apt
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@
------
Selenium Library
------
Dietrich Schulten
------
2012-01-20
------


Using SeleniumLibrary with the Robotframework Plugin
Using Python-based SeleniumLibrary with the Robotframework Plugin

ExtraPathDirectories parameter can be used to add extra test libraries to your build.

By default, you should add them to $\{project.basedir}/src/test/resources/robotframework/libraries.

* Configuration and Installation

Download the tarball from the Selenium Library download page,
e.g. robotframework-seleniumlibrary-2.6.tar.gz
This is just and example how importing can be done, as there's also {{{https://github.com/Hi-Fi/robotframework-seleniumlibrary-java/}Java-based Selenium-library}} available that
can be included just as Maven depednency

Download the tarball from the Selenium Library releases page,
e.g. {{{https://github.com/robotframework/SeleniumLibrary/archive/v3.3.1.tar.gz}robotframework-seleniumlibrary-3.3.1.tar.gz}}

Extract the file and move the SeleniumLibrary directory from
robotframework-seleniumLibrary/src to ${project.basedir}/src/test/resources/robotframework/libraries.

So your project will have a folder
$\{project.basedir}/src/test/resources/robotframework/libraries/SeleniumLibrary


Make same thing for {{{https://github.com/robotframework/SeleniumLibrary/blob/master/requirements.txt}external dependencies of the library}}.
Robot Framework doesn't need to be imported, as it comes from dependencies.

* Example

Expand All @@ -40,5 +36,5 @@ Suite Tear Down Stop Selenium Server

*** Test Cases ***
My Test
Open Browser http://robotframework.googlecode.com
Open Browser http://robotframework.org
+---
4 changes: 2 additions & 2 deletions src/site/apt/index.apt
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Robot Framework Maven Plugin
<plugin>
<groupId>org.robotframework</groupId>
<artifactId>robotframework-maven-plugin</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
<executions>
<execution>
<goals>
Expand Down Expand Up @@ -126,7 +126,7 @@ Robot Framework Maven Plugin
<plugin>
<groupId>org.robotframework</groupId>
<artifactId>robotframework-maven-plugin</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
<executions>
<execution>
<goals>
Expand Down
4 changes: 2 additions & 2 deletions src/site/apt/transitioning.apt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Trasitioning from old version of Robot Framework Maven Plugin
<plugin>
<groupId>org.robotframework</groupId>
<artifactId>robotframework-maven-plugin</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
</plugin>
+---

Expand All @@ -46,7 +46,7 @@ Trasitioning from old version of Robot Framework Maven Plugin
<plugin>
<groupId>org.robotframework</groupId>
<artifactId>robotframework-maven-plugin</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
<configuration>
<libdoc>
<libraryOrResourceFile>MyLib</libraryOrResourceFile>
Expand Down

0 comments on commit 04dea3b

Please sign in to comment.