Skip to content

Commit 8dff2e6

Browse files
committed
improve library version info handling to be build time procedure
1 parent e707681 commit 8dff2e6

File tree

3 files changed

+28
-2
lines changed

3 files changed

+28
-2
lines changed

pom.xml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,22 @@
165165
</distributionManagement>
166166

167167
<build>
168+
<resources>
169+
<resource>
170+
<directory>src/main/resources</directory>
171+
<filtering>true</filtering>
172+
<includes>
173+
<include>**/*.properties</include>
174+
</includes>
175+
</resource>
176+
<resource>
177+
<directory>src/main/resources</directory>
178+
<filtering>false</filtering>
179+
<excludes>
180+
<exclude>**/*.properties</exclude>
181+
</excludes>
182+
</resource>
183+
</resources>
168184
<plugins>
169185
<plugin>
170186
<groupId>org.apache.maven.plugins</groupId>
@@ -251,7 +267,6 @@
251267
<configuration>
252268
<includes>
253269
<include>smoke</include>
254-
<!-- <include>set-datepicker</include>-->
255270
</includes>
256271
<excludes>
257272
<exclude>not-ready</exclude>

src/main/java/JavaFXLibrary.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838
import org.robotframework.javalib.annotation.Autowired;
3939
import org.robotframework.javalib.library.AnnotationLibrary;
4040
import org.robotframework.remoteserver.RemoteServer;
41-
import org.testfx.util.WaitForAsyncUtils;
4241

4342
import javax.script.ScriptEngine;
4443
import javax.script.ScriptEngineManager;
4544
import javax.script.ScriptException;
4645
import static javafxlibrary.utils.HelperFunctions.*;
4746
import static org.testfx.util.WaitForAsyncUtils.waitFor;
47+
import java.util.ResourceBundle;
4848

4949
public class JavaFXLibrary extends AnnotationLibrary {
5050

@@ -78,6 +78,15 @@ public JavaFXLibrary(boolean headless) {
7878
}
7979
}
8080

81+
public static String loadRobotLibraryVersion() {
82+
try {
83+
return ResourceBundle.getBundle(JavaFXLibrary.class.getCanonicalName().replace(".", File.separator))
84+
.getString("version");
85+
} catch (RuntimeException e) {
86+
return "unknown";
87+
}
88+
}
89+
8190
@Autowired
8291
protected RunOnFailure runOnFailure;
8392

@@ -213,3 +222,4 @@ public static void main(String[] args) throws Exception {
213222
}
214223
}
215224
}
225+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
version=${project.version}

0 commit comments

Comments
 (0)