Skip to content

Commit 0ea8f7a

Browse files
Merge pull request #200 from HelioGuilherme66/develop
Upgrade versions of dependencies, in particular jobotremoteserver
2 parents 8d64110 + 2925af0 commit 0ea8f7a

6 files changed

Lines changed: 34 additions & 25 deletions

File tree

build.sh

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
#! /usr/bin/bash
22

33
# Tested on Fedora 42, Java 21, Python 13
4-
export JAVA_HOME=/usr/lib/jvm/java
4+
# export JAVA_HOME=/usr/lib/jvm/java
5+
export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-11.0.24.0.8-2.fc41.x86_64
6+
# export JAVA_HOME=/usr/lib/jvm/java-21-openjdk
7+
export JAVA_HOME=/usr/lib/jvm/java-24-openjdk
58
export DISABLE_SIKULI_LOG=1
9+
export PATH=$JAVA_HOME/bin:$PATH
610

11+
# mvn -X -e package
712
mvn package
813

914
if [[ $? -eq 0 ]];
1015
then
11-
pip wheel .
12-
libdoc --theme DARK build/lib/SikuliLibrary docs/SikuliLibrary_2.0.5_dark.html
16+
# pip wheel .
17+
python -m build
18+
libdoc --theme DARK target/src/SikuliLibrary docs/SikuliLibrary_dark.html
19+
libdoc --theme LIGHT target/src/SikuliLibrary docs/SikuliLibrary.html
1320
fi

demo/test.robot

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ Open Image
88
END
99

1010
*** Settings ***
11+
Suite Setup Start Sikuli Process
1112
Suite Teardown Stop Remote Server
12-
Library SikuliLibrary
13+
Library SikuliLibrary mode=NEW
1314
Library Process
1415

1516
*** Test Cases ***

docs/SikuliLibrary.html

Lines changed: 7 additions & 7 deletions
Large diffs are not rendered by default.

docs/SikuliLibrary_dark.html

Lines changed: 7 additions & 7 deletions
Large diffs are not rendered by default.

pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>org.eclipse.jetty</groupId>
3737
<artifactId>jetty-servlet</artifactId>
38-
<version>9.4.45.v20220203</version>
38+
<version>11.0.3</version>
3939
</dependency>
4040
<dependency>
4141
<groupId>org.apache.logging.log4j</groupId>
@@ -48,9 +48,9 @@
4848
<version>2.17.2</version>
4949
</dependency>
5050
<dependency>
51-
<groupId>org.apache.xmlrpc</groupId>
52-
<artifactId>xmlrpc-server</artifactId>
53-
<version>3.1.3</version>
51+
<groupId>jakarta.servlet</groupId>
52+
<artifactId>jakarta.servlet-api</artifactId>
53+
<version>5.0.0</version>
5454
</dependency>
5555
<dependency>
5656
<groupId>org.apache.commons</groupId>
@@ -66,7 +66,7 @@
6666
<dependency>
6767
<groupId>org.robotframework</groupId>
6868
<artifactId>jrobotremoteserver</artifactId>
69-
<version>4.1.0</version>
69+
<version>4.1.1</version>
7070
</dependency>
7171

7272

@@ -136,7 +136,7 @@
136136
<id>dist</id>
137137
<phase>package</phase>
138138
<configuration>
139-
<tasks>
139+
<target>
140140
<echo message="unzip package"/>
141141
<unzip src="target/SikuliLibrary.zip" dest="target/src"/>
142142
<echo message="generate keywords.py"/>
@@ -149,7 +149,7 @@
149149
<!--<include name="prefix*.zip" />-->
150150
<!--</fileset>-->
151151
<!--</unzip>-->
152-
</tasks>
152+
</target>
153153
</configuration>
154154
<goals>
155155
<goal>run</goal>

src/java/META-INF/MANIFEST.MF

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
Manifest-Version: 1.0
22
Main-Class: com.github.rainmanwy.robotframework.sikulilib.SikuliLibrary
3+
Enable-Native-Access: ALL-UNNAMED

0 commit comments

Comments
 (0)