Skip to content

Commit 9ad86e3

Browse files
authored
Merge pull request #2 from openhab/update
Upgrade dependencies and switch to Java 11
2 parents fbed007 + 46cc9fc commit 9ad86e3

3 files changed

Lines changed: 27 additions & 14 deletions

File tree

pom.xml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<inceptionYear>2022</inceptionYear>
2525

2626
<properties>
27-
<maven.compiler.source>1.8</maven.compiler.source>
28-
<maven.compiler.target>1.8</maven.compiler.target>
27+
<maven.compiler.source>11</maven.compiler.source>
28+
<maven.compiler.target>11</maven.compiler.target>
2929
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3030
<license.licenseName>apache_v2</license.licenseName>
3131
</properties>
@@ -131,7 +131,7 @@
131131
<dependency>
132132
<groupId>com.thoughtworks.xstream</groupId>
133133
<artifactId>xstream</artifactId>
134-
<version>1.4.19</version>
134+
<version>1.4.20</version>
135135
</dependency>
136136
<dependency>
137137
<groupId>com.google.code.gson</groupId>
@@ -169,13 +169,13 @@
169169
<dependency>
170170
<groupId>org.powermock</groupId>
171171
<artifactId>powermock-module-junit4</artifactId>
172-
<version>1.7.3</version>
172+
<version>1.6.2</version>
173173
<scope>test</scope>
174174
</dependency>
175175
<dependency>
176176
<groupId>org.powermock</groupId>
177177
<artifactId>powermock-api-mockito</artifactId>
178-
<version>1.7.3</version>
178+
<version>1.6.2</version>
179179
<scope>test</scope>
180180
</dependency>
181181
</dependencies>
@@ -194,7 +194,7 @@
194194
<plugin>
195195
<groupId>org.jacoco</groupId>
196196
<artifactId>jacoco-maven-plugin</artifactId>
197-
<version>0.7.9</version>
197+
<version>0.8.6</version>
198198
<executions>
199199
<execution>
200200
<id>prepare-agent</id>
@@ -205,6 +205,20 @@
205205
</executions>
206206
</plugin>
207207
<plugin>
208+
<groupId>org.apache.maven.plugins</groupId>
209+
<artifactId>maven-surefire-plugin</artifactId>
210+
<configuration>
211+
<argLine>
212+
--add-opens java.base/java.lang=ALL-UNNAMED
213+
--add-opens java.base/java.io=ALL-UNNAMED
214+
--add-opens java.base/java.util=ALL-UNNAMED
215+
--add-opens java.base/java.base=ALL-UNNAMED
216+
--add-opens java.base/java.math=ALL-UNNAMED
217+
--add-opens java.base/java.nio=ALL-UNNAMED
218+
</argLine>
219+
</configuration>
220+
</plugin>
221+
<plugin>
208222
<groupId>org.eluder.coveralls</groupId>
209223
<artifactId>coveralls-maven-plugin</artifactId>
210224
<version>4.3.0</version>
@@ -245,14 +259,7 @@
245259
<plugin>
246260
<groupId>org.codehaus.gmaven</groupId>
247261
<artifactId>groovy-maven-plugin</artifactId>
248-
<dependencies>
249-
<dependency>
250-
<groupId>org.codehaus.groovy</groupId>
251-
<artifactId>groovy-all</artifactId>
252-
<version>2.4.13</version>
253-
</dependency>
254-
</dependencies>
255-
<version>2.0</version>
262+
<version>2.1.1</version>
256263
<executions>
257264
<execution>
258265
<phase>generate-resources</phase>

src/test/java/org/openhab/bluetooth/gattparser/GenericCharacteristicParserTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.openhab.bluetooth.gattparser.spec.Field;
3939
import org.openhab.bluetooth.gattparser.spec.FlagUtils;
4040
import org.powermock.api.mockito.PowerMockito;
41+
import org.powermock.core.classloader.annotations.PowerMockIgnore;
4142
import org.powermock.core.classloader.annotations.PrepareForTest;
4243
import org.powermock.modules.junit4.PowerMockRunner;
4344

@@ -63,6 +64,8 @@
6364
import static org.mockito.Matchers.anyByte;
6465
import static org.mockito.Matchers.anyDouble;
6566
import static org.mockito.Matchers.anyFloat;
67+
import static org.mockito.Matchers.anyInt;
68+
import static org.mockito.Matchers.anyList;
6669
import static org.mockito.Matchers.anyLong;
6770
import static org.mockito.Matchers.eq;
6871
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
@@ -75,6 +78,7 @@
7578
import static org.mockito.Mockito.when;
7679

7780
@RunWith(PowerMockRunner.class)
81+
@PowerMockIgnore("jdk.internal.reflect.*")
7882
@PrepareForTest({ BluetoothGattParserFactory.class, FlagUtils.class })
7983
public class GenericCharacteristicParserTest {
8084

src/test/java/org/openhab/bluetooth/gattparser/spec/FlagUtilsTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.openhab.bluetooth.gattparser.spec.FieldFormat;
3232
import org.openhab.bluetooth.gattparser.spec.FlagUtils;
3333
import org.powermock.api.mockito.PowerMockito;
34+
import org.powermock.core.classloader.annotations.PowerMockIgnore;
3435
import org.powermock.core.classloader.annotations.PrepareForTest;
3536
import org.powermock.modules.junit4.PowerMockRunner;
3637

@@ -49,6 +50,7 @@
4950
import static org.mockito.Mockito.when;
5051

5152
@RunWith(PowerMockRunner.class)
53+
@PowerMockIgnore("jdk.internal.reflect.*")
5254
@PrepareForTest(BluetoothGattParserFactory.class)
5355
public class FlagUtilsTest {
5456

0 commit comments

Comments
 (0)