branch develop updated (8508ede -> b250b86)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from 8508ede [jgitflow-maven-plugin]Updating develop poms back to pre merge state new d0f77d9 Update libs new b250b86 Update libs The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b250b867166efbfc34c12a8fa9c8ec3df06cd8a6 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Feb 27 17:57:06 2017 +0100 Update libs commit d0f77d9964204b9c1a31b34ff15f7705d0edf7c8 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Feb 27 16:08:59 2017 +0100 Update libs Summary of changes: pom.xml | 10 +++++----- src/main/java/org/chorem/jtimer/system/unix/Xss.java | 3 ++- src/main/java/org/chorem/jtimer/system/win32/User32.java | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit d0f77d9964204b9c1a31b34ff15f7705d0edf7c8 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Feb 27 16:08:59 2017 +0100 Update libs --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index e66f7f0..c53738a 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.1.1</version> + <version>3.2</version> <scope>compile</scope> <exclusions> <exclusion> @@ -176,19 +176,19 @@ <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> - <version>4.2.2</version> + <version>4.3.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.7</version> + <version>2.8</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>2.7</version> + <version>2.8</version> <scope>runtime</scope> </dependency> <dependency> @@ -199,7 +199,7 @@ <dependency> <groupId>org.yaml</groupId> <artifactId>snakeyaml</artifactId> - <version>1.17</version> + <version>1.18</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit b250b867166efbfc34c12a8fa9c8ec3df06cd8a6 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Feb 27 17:57:06 2017 +0100 Update libs --- src/main/java/org/chorem/jtimer/system/unix/Xss.java | 3 ++- src/main/java/org/chorem/jtimer/system/win32/User32.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/system/unix/Xss.java b/src/main/java/org/chorem/jtimer/system/unix/Xss.java index 44c10c6..345591c 100644 --- a/src/main/java/org/chorem/jtimer/system/unix/Xss.java +++ b/src/main/java/org/chorem/jtimer/system/unix/Xss.java @@ -59,9 +59,10 @@ public interface Xss extends Library { public NativeLong eventMask; /* currently selected events for this client */ @Override - protected List<?> getFieldOrder() { + protected List<String> getFieldOrder() { return Arrays.asList("window", "state", "kind", "til_or_since", "idle", "eventMask"); } + } /** diff --git a/src/main/java/org/chorem/jtimer/system/win32/User32.java b/src/main/java/org/chorem/jtimer/system/win32/User32.java index 6361181..1f9af38 100644 --- a/src/main/java/org/chorem/jtimer/system/win32/User32.java +++ b/src/main/java/org/chorem/jtimer/system/win32/User32.java @@ -57,7 +57,7 @@ public interface User32 extends StdCallLibrary { public int dwTime; @Override - protected List<?> getFieldOrder() { + protected List<String> getFieldOrder() { return Arrays.asList("cbSize", "dwTime"); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm