diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000..8f5a85a --- /dev/null +++ b/.github/workflows/maven.yml @@ -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 }} diff --git a/.gitignore b/.gitignore index 1b9a3aa..59f9c57 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,5 @@ docs/_build .classpath .settings/ .project +.factorypath +.vscode \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 6b02aa8..0000000 --- a/.travis.yml +++ /dev/null @@ -1,51 +0,0 @@ -language: java -jdk: - - oraclejdk8 - - oraclejdk11 - - openjdk8 - - openjdk11 - -stages: - - test - - name: deploySnapshot - if: branch = develop - - name: deployRelease - if: tag IS present - -before_install: - - if [ ! -z "$GPG_SECRET_KEYS" ]; then echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import; fi - - if [ ! -z "$GPG_OWNERTRUST" ]; then echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust; fi - - wget https://www-eu.apache.org/dist/maven/maven-3/3.6.0/binaries/apache-maven-3.6.0-bin.zip - - unzip -qq apache-maven-3.6.0-bin.zip - - export M2_HOME=$PWD/apache-maven-3.6.0 - - export PATH=$M2_HOME/bin:$PATH - -install: - - mvn --settings .travis/settings.xml install -Dgpg.skip -Dmaven.javadoc.skip=true -B -V - -script: skip - -jobs: - include: - - stage: deploySnapshot - install: skip - script: skip - deploy: - provider: script - script: .travis/deploy.sh - skip_cleanup: true - on: - repo: robotframework/MavenPlugin - branch: develop - jdk: oraclejdk8 - - stage: deployRelease - install: skip - script: skip - deploy: - provider: script - script: .travis/deploy.sh - skip_cleanup: true - on: - repo: robotframework/MavenPlugin - tags: true - jdk: oraclejdk8 \ No newline at end of file diff --git a/.travis/deploy.sh b/.travis/deploy.sh deleted file mode 100755 index 77bb980..0000000 --- a/.travis/deploy.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ -z "$SONATYPE_USERNAME" ] -then - echo "error: please set SONATYPE_USERNAME and SONATYPE_PASSWORD environment variable" - exit 1 -fi - -if [ -z "$SONATYPE_PASSWORD" ] -then - echo "error: please set SONATYPE_PASSWORD environment variable" - exit 1 -fi - -mvn clean deploy --settings .travis/settings.xml -DskipTests=true -B -U -Prelease \ No newline at end of file diff --git a/.travis/settings.xml b/.travis/settings.xml deleted file mode 100644 index 1fd1d9e..0000000 --- a/.travis/settings.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - ossrh - ${env.SONATYPE_USERNAME} - ${env.SONATYPE_PASSWORD} - - - - - ossrh - - true - - - ${env.GPG_EXECUTABLE} - ${env.GPG_PASSPHRASE} - - - - \ No newline at end of file diff --git a/BUILD.md b/BUILD.md index 25200bd..343de9f 100644 --- a/BUILD.md +++ b/BUILD.md @@ -34,11 +34,11 @@ Releasing osx: ```bash -grep -rl 'sion>1.5.11.5.11.61.5.21.5.21.61.5.11.5.11.61.5.21.5.21.6 org.robotframework robotframework-maven-plugin - 1.5.1 + 1.5.2 diff --git a/pom.xml b/pom.xml index 5a618e2..26f200e 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.robotframework robotframework-maven-plugin maven-plugin - 1.5.1 + 1.5.2 Robot Framework Maven Plugin Maven plugin for the Robot Framework. @@ -202,7 +202,7 @@ org.robotframework robotframework - 3.1.1 + 3.1.2 diff --git a/src/site/apt/examples/javalibraries.apt b/src/site/apt/examples/javalibraries.apt index f796ecd..629163b 100644 --- a/src/site/apt/examples/javalibraries.apt +++ b/src/site/apt/examples/javalibraries.apt @@ -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. +--- @@ -43,7 +36,7 @@ Using Java Libraries with the Robotframework Plugin org.robotframework robotframework-maven-plugin - 1.5.1 + 1.5.2 src/test/resources/python diff --git a/src/site/apt/examples/seleniumlibrary.apt b/src/site/apt/examples/seleniumlibrary.apt index 74a0ff9..2690276 100644 --- a/src/site/apt/examples/seleniumlibrary.apt +++ b/src/site/apt/examples/seleniumlibrary.apt @@ -1,13 +1,4 @@ - ------ - 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. @@ -15,15 +6,20 @@ Using SeleniumLibrary with the Robotframework Plugin * 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 @@ -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 +--- \ No newline at end of file diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index 9421cb8..e56deb7 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -65,7 +65,7 @@ Robot Framework Maven Plugin org.robotframework robotframework-maven-plugin - 1.5.1 + 1.5.2 @@ -126,7 +126,7 @@ Robot Framework Maven Plugin org.robotframework robotframework-maven-plugin - 1.5.1 + 1.5.2 diff --git a/src/site/apt/transitioning.apt b/src/site/apt/transitioning.apt index e570096..589abca 100644 --- a/src/site/apt/transitioning.apt +++ b/src/site/apt/transitioning.apt @@ -24,7 +24,7 @@ Trasitioning from old version of Robot Framework Maven Plugin org.robotframework robotframework-maven-plugin - 1.5.1 + 1.5.2 +--- @@ -46,7 +46,7 @@ Trasitioning from old version of Robot Framework Maven Plugin org.robotframework robotframework-maven-plugin - 1.5.1 + 1.5.2 MyLib diff --git a/src/test/projects/acceptance-and-verify/src/test/robotframework/acceptance/anotherSuccessfulTest.txt b/src/test/projects/acceptance-and-verify/src/test/robotframework/acceptance/anotherSuccessfulTest.robot similarity index 100% rename from src/test/projects/acceptance-and-verify/src/test/robotframework/acceptance/anotherSuccessfulTest.txt rename to src/test/projects/acceptance-and-verify/src/test/robotframework/acceptance/anotherSuccessfulTest.robot diff --git a/src/test/projects/acceptance-and-verify/src/test/robotframework/acceptance/failingTest.txt b/src/test/projects/acceptance-and-verify/src/test/robotframework/acceptance/failingTest.robot similarity index 100% rename from src/test/projects/acceptance-and-verify/src/test/robotframework/acceptance/failingTest.txt rename to src/test/projects/acceptance-and-verify/src/test/robotframework/acceptance/failingTest.robot diff --git a/src/test/projects/acceptance-and-verify/src/test/robotframework/acceptance/secondFailingTest.txt b/src/test/projects/acceptance-and-verify/src/test/robotframework/acceptance/secondFailingTest.robot similarity index 100% rename from src/test/projects/acceptance-and-verify/src/test/robotframework/acceptance/secondFailingTest.txt rename to src/test/projects/acceptance-and-verify/src/test/robotframework/acceptance/secondFailingTest.robot diff --git a/src/test/projects/acceptance-and-verify/src/test/robotframework/acceptance/successfulTest.txt b/src/test/projects/acceptance-and-verify/src/test/robotframework/acceptance/successfulTest.robot similarity index 100% rename from src/test/projects/acceptance-and-verify/src/test/robotframework/acceptance/successfulTest.txt rename to src/test/projects/acceptance-and-verify/src/test/robotframework/acceptance/successfulTest.robot diff --git a/src/test/projects/acceptance-and-verify/src/test/robotframework/classpath-acceptance/classpathTests.txt b/src/test/projects/acceptance-and-verify/src/test/robotframework/classpath-acceptance/classpathTests.robot similarity index 100% rename from src/test/projects/acceptance-and-verify/src/test/robotframework/classpath-acceptance/classpathTests.txt rename to src/test/projects/acceptance-and-verify/src/test/robotframework/classpath-acceptance/classpathTests.robot