Skip to content

Commit

Permalink
Release 1.6.0
Browse files Browse the repository at this point in the history
Site release (fixes #69)
  • Loading branch information
Hi-Fi committed Jan 5, 2020
1 parent e411e9a commit b7e0460
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 18 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
java: [ 8, 11 ]
name: Test with Java ${{ matrix.java }}
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2.0.0
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v1
uses: actions/setup-java@v1.3.0
with:
java-version: ${{ matrix.java }}
- name: Build with Maven
Expand All @@ -24,15 +24,18 @@ jobs:
runs-on: ubuntu-latest
name: Release package
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2.0.0
- name: Set up JDK
uses: actions/setup-java@v1
uses: actions/setup-java@v1.3.0
with:
java-version: 8
- name: Release Maven package
uses: samuelmeuli/action-maven-publish@v1
uses: samuelmeuli/action-maven-publish@82d218a8bc9cacee5493e3604d651ab3ca74b506 #v1.0.0
with:
gpg_private_key: ${{ secrets.gpg_private_key }}
gpg_passphrase: ${{ secrets.gpg_passphrase }}
nexus_username: ${{ secrets.nexus_username }}
nexus_password: ${{ secrets.nexus_password }}
maven_args: -DskipTests
- name: Publish site
run: mvn clean site -Dgithub.site.password=${{ secrets.github_site_password }} -Dgithub.site.userName=${{ secrets.github_site_username }}
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.2</version>
<version>1.6.0</version>
<executions>
<execution>
<goals>
Expand Down
2 changes: 1 addition & 1 deletion 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.3-SNAPSHOT</version>
<version>1.6.0</version>
<name>Robot Framework Maven Plugin</name>
<description>
Maven plugin for the Robot Framework.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,17 +193,17 @@ public void populateDefaults(LibDocMojo defaults) {

/**
* Name or path of the documented library or resource file.
* <p/>
* <p></p>
* Name must be in the same format as when used in Robot Framework test
* data, for example <code>BuiltIn</code> or
* <code>com.acme.FooLibrary</code>. When name is used, the library is
* imported the same as when running the tests. Use
* {@link #extraPathDirectories} to set PYTHONPATH/CLASSPATH accordingly.
* <p/>
* <p></p>
* Paths are considered relative to the location of <code>pom.xml</code> and
* must point to a valid Python/Java source file or a resource file. For
* example <code>src/main/java/com/test/ExampleLib.java</code>
*
*
* One may also use ant-like patterns, for example
* <code>src/main/java/com/**{@literal /}*Lib.java</code>
*
Expand All @@ -213,7 +213,7 @@ public void populateDefaults(LibDocMojo defaults) {
/**
* A directory to be added to the PYTHONPATH/CLASSPATH when creating
* documentation.
* <p/>
* <p></p>
* e.g. src/main/java/com/test/
*/
private File[] extraPathDirectories;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/robotframework/mavenplugin/LibDocMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ public void runLibDoc() throws IOException {
* <li><code>outputFile</code> The name for the output file. Documentation output format is deduced from the file extension.
* We also support patterns like {@code *.html}, which indicates to derive the output name from the original name.</li>
* <li><code>libraryOrResourceFile</code> Name or path of the documented library or resource file. Supports ant-like pattern format to match multiple inputs, such as <code>src/java/**{@literal /}*.java</code>
* <p/>
* <p></p>
* Name must be in the same format as when used in Robot Framework test data, for example <code>BuiltIn</code> or
* <code>com.acme.FooLibrary</code>. When name is used, the library is imported the same as when running the tests.
* Use extraPathDirectories to set PYTHONPATH/CLASSPATH accordingly.
*
*
* Paths are considered relative to the location of <code>pom.xml</code> and must point to a valid Python/Java
* source file or a resource file. For example <code>src/main/python/test/ExampleLib.py</code>
*
*
* Note that you should preferably import java classes by classname, not path. Dynamic libraries will not be compiled correctly with path.</li>
* </ul>
* Optional settings:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,11 @@ public void populateDefaults(TestDocMojo defaults) {

/**
* Name or path of the documented library or resource file.
* <p/>
* <p></p>
* Name must be in the same format as when used in Robot Framework test data, for example <code>BuiltIn</code> or
* <code>com.acme.FooLibrary</code>. When name is used, the library is imported the same as when running the tests.
* Use {@link #extraPathDirectories} to set PYTHONPATH/CLASSPATH accordingly.
* <p/>
* <p></p>
* Paths are considered relative to the location of <code>pom.xml</code> and must point to a valid Python/Java
* source file or a resource file. For example <code>src/main/java/com/test/ExampleLib.java</code>
*
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/robotframework/mavenplugin/TestDocMojo.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

/**
* Create documentation of test suites using the Robot Framework <code>testdoc</code> tool.
* <p/>
* <p></p>
* Uses the <code>testdoc</code> bundled in Robot Framework jar distribution. For more help see
* <a href="http://robotframework.org/robotframework/latest/RobotFrameworkUserGuide.html#test-data-documentation-tool-testdoc">testdoc documentation</a>.
*
Expand Down Expand Up @@ -71,7 +71,7 @@ public void runTestDoc()
* We also support patterns like {@code *.html}, which indicates to derive the output name from the original name.</li>
* <li><code>dataSourceFile</code> Name or path of the documented test case(s). Supports ant-like pattern format to match multiple inputs, such as <code>src/robot/**{@literal /}*.robot</code></li>
* </ul>
* <p/>
* <p></p>
* Paths are considered relative to the location of <code>pom.xml</code> and must point to a valid test case file.
* For example <code>src/main/test/ExampleTest.txt</code>
* Optional settings:
Expand Down

0 comments on commit b7e0460

Please sign in to comment.