Skip to content

Commit ff68c4c

Browse files
Hi-FiHi-Fi
committed
Release 1.5.0 preparations
1 parent d9b470e commit ff68c4c

File tree

6 files changed

+316
-312
lines changed

6 files changed

+316
-312
lines changed

‎BUILD.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ Branches
22
========
33

44
`master` = "Release" branch, contains always version that's release to Maven Central
5+
56
`develop` = Developent time branch. All PRs should be targetted (and usually also started) from here.
7+
68
`gh-pages` = Github internal branch containing
79

810
Building
@@ -32,11 +34,11 @@ Releasing
3234

3335
osx:
3436
```bash
35-
grep -rl 'sion>1.4.9</ver' ./ | xargs sed -i '' 's|sion>1.4.9</ver|sion>1.5</ver|g'
37+
grep -rl 'sion>1.5.0</ver' ./ | xargs sed -i '' 's|sion>1.5.0</ver|sion>1.6</ver|g'
3638
```
3739
linux:
3840
```bash
39-
grep -rl 'sion>1.4.9</ver' ./ | xargs sed -i 's|sion>1.4.9</ver|sion>1.5</ver|g'
41+
grep -rl 'sion>1.5.0</ver' ./ | xargs sed -i 's|sion>1.5.0</ver|sion>1.6</ver|g'
4042
```
4143
Last you should update those rows above.
4244

@@ -58,8 +60,8 @@ mvn site:site
5860
* Commit to git
5961

6062
```bash
61-
git commit -am "version 1.5"
62-
git tag 1.5
63+
git commit -am "version 1.6"
64+
git tag -a 1.6
6365
git push
6466
git push --tags
6567
```

‎README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Add the plugin to your build:
3737
<plugin>
3838
<groupId>org.robotframework</groupId>
3939
<artifactId>robotframework-maven-plugin</artifactId>
40-
<version>1.4.9</version>
40+
<version>1.5.0</version>
4141
<executions>
4242
<execution>
4343
<goals>
@@ -62,3 +62,5 @@ Third party libraries (e.g. Selenium Library) can be added to ${project.basedir}
6262
During mvn install invocation, run command will be invoked during the integration-test phase.
6363

6464
For more detailed documentation please see http://robotframework.github.com/MavenPlugin/
65+
66+
*NOTE*: If needing plugin with Java 1.7, latest version supporting that is 1.4.9

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>org.robotframework</groupId>
88
<artifactId>robotframework-maven-plugin</artifactId>
99
<packaging>maven-plugin</packaging>
10-
<version>1.5.0-SNAPSHOT</version>
10+
<version>1.5.0</version>
1111
<name>Robot Framework Maven Plugin</name>
1212
<description>
1313
Maven plugin for the Robot Framework.

‎src/site/apt/examples/javalibraries.apt

+85-85
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,85 @@
1-
------
2-
Java Libraries
3-
------
4-
Dietrich Schulten
5-
------
6-
2012-01-20
7-
------
8-
9-
Using Java Libraries with the Robotframework Plugin
10-
11-
* Java test libraries
12-
13-
You can access Java test libraries by adding the jars to the extraPathDirectories parameter.
14-
Note that such tests will run with Jython only.
15-
16-
+---
17-
<plugin>
18-
<groupId>org.robotframework</groupId>
19-
<artifactId>robotframework-maven-plugin</artifactId>
20-
<configuration>
21-
<extraPathDirectories>
22-
<extraPathDirectory>src/test/pythonpath</extraPathDirectory>
23-
<extraPathDiectory>src/test/mytestlib.jar</extraPathDirectory
24-
</extraPathDirectories>
25-
</configuration>
26-
</plugin>
27-
+---
28-
29-
* Python libraries with Java dependencies
30-
31-
But there is a different use case. Python libraries can use Java libraries directly
32-
using JPype. For example, the Python based DatabaseLibrary can be
33-
used with jaydebeapi and JPype to access databases via Python and jdbc.
34-
35-
Such a test runs within a pure Python environment with JPype installed, as well as with
36-
Jython. That way you can have database test cases that run within RIDE in Python mode,
37-
and within the Robotframework Maven Plugin.
38-
39-
If you need Java libraries as dependencies to your test libraries, you can add them to the
40-
dependencies section of the maven plugin configuration in the pom.
41-
42-
+---
43-
<plugin>
44-
<groupId>org.robotframework</groupId>
45-
<artifactId>robotframework-maven-plugin</artifactId>
46-
<version>1.4.9</version>
47-
<configuration>
48-
<extraPathDirectories>
49-
<extraPathDirectory>src/test/resources/python</extraPathDirectory>
50-
</extraPathDirectories>
51-
</configuration>
52-
<dependencies>
53-
<dependency>
54-
<groupId>org.hsqldb</groupId>
55-
<artifactId>hsqldb</artifactId>
56-
<version>1.8.0.10</version>
57-
</dependency>
58-
</dependencies>
59-
</plugin>
60-
+---
61-
62-
The test cases access hsqldb, the python folder contains the DatabaseLibrary and the jaydebeapi.
63-
64-
If you want to run such a test within RIDE, make sure DatabaseLibrary, JPype and jaydebeapi
65-
are installed in your Python runtime.
66-
67-
An actual test case is shown below.
68-
69-
+---
70-
*** Settings ***
71-
Library OperatingSystem
72-
Library DatabaseLibrary
73-
74-
*** Test Cases ***
75-
Connect
76-
Connect To Database Using Custom Params jaydebeapi org.hsqldb.jdbcDriver jdbc:hsqldb:mem:robot sa ${EMPTY}
77-
Execute SQL create table testtable (myid integer not null primary key, name varchar(25))
78-
Execute SQL insert into testtable values (1, 'myname')
79-
Execute SQL insert into testtable values (2, 'yourname')
80-
@{result}= Execute Sql Select * from testtable
81-
Log Many @{result}
82-
Check If Exists In Database select * from testtable where myid=2
83-
Execute SQL drop table testtable
84-
Disconnect From Database
85-
+---
1+
------
2+
Java Libraries
3+
------
4+
Dietrich Schulten
5+
------
6+
2012-01-20
7+
------
8+
9+
Using Java Libraries with the Robotframework Plugin
10+
11+
* Java test libraries
12+
13+
You can access Java test libraries by adding the jars to the extraPathDirectories parameter.
14+
Note that such tests will run with Jython only.
15+
16+
+---
17+
<plugin>
18+
<groupId>org.robotframework</groupId>
19+
<artifactId>robotframework-maven-plugin</artifactId>
20+
<configuration>
21+
<extraPathDirectories>
22+
<extraPathDirectory>src/test/pythonpath</extraPathDirectory>
23+
<extraPathDiectory>src/test/mytestlib.jar</extraPathDirectory
24+
</extraPathDirectories>
25+
</configuration>
26+
</plugin>
27+
+---
28+
29+
* Python libraries with Java dependencies
30+
31+
But there is a different use case. Python libraries can use Java libraries directly
32+
using JPype. For example, the Python based DatabaseLibrary can be
33+
used with jaydebeapi and JPype to access databases via Python and jdbc.
34+
35+
Such a test runs within a pure Python environment with JPype installed, as well as with
36+
Jython. That way you can have database test cases that run within RIDE in Python mode,
37+
and within the Robotframework Maven Plugin.
38+
39+
If you need Java libraries as dependencies to your test libraries, you can add them to the
40+
dependencies section of the maven plugin configuration in the pom.
41+
42+
+---
43+
<plugin>
44+
<groupId>org.robotframework</groupId>
45+
<artifactId>robotframework-maven-plugin</artifactId>
46+
<version>1.5.0</version>
47+
<configuration>
48+
<extraPathDirectories>
49+
<extraPathDirectory>src/test/resources/python</extraPathDirectory>
50+
</extraPathDirectories>
51+
</configuration>
52+
<dependencies>
53+
<dependency>
54+
<groupId>org.hsqldb</groupId>
55+
<artifactId>hsqldb</artifactId>
56+
<version>1.8.0.10</version>
57+
</dependency>
58+
</dependencies>
59+
</plugin>
60+
+---
61+
62+
The test cases access hsqldb, the python folder contains the DatabaseLibrary and the jaydebeapi.
63+
64+
If you want to run such a test within RIDE, make sure DatabaseLibrary, JPype and jaydebeapi
65+
are installed in your Python runtime.
66+
67+
An actual test case is shown below.
68+
69+
+---
70+
*** Settings ***
71+
Library OperatingSystem
72+
Library DatabaseLibrary
73+
74+
*** Test Cases ***
75+
Connect
76+
Connect To Database Using Custom Params jaydebeapi org.hsqldb.jdbcDriver jdbc:hsqldb:mem:robot sa ${EMPTY}
77+
Execute SQL create table testtable (myid integer not null primary key, name varchar(25))
78+
Execute SQL insert into testtable values (1, 'myname')
79+
Execute SQL insert into testtable values (2, 'yourname')
80+
@{result}= Execute Sql Select * from testtable
81+
Log Many @{result}
82+
Check If Exists In Database select * from testtable where myid=2
83+
Execute SQL drop table testtable
84+
Disconnect From Database
85+
+---

0 commit comments

Comments
 (0)