Skip to content

Commit a5271c8

Browse files
author
Dan Geabunea
committed
Released version 0.9.21; Updated Spring to 1.4.2; Removed dependency on logback that had conflicts with newer versions; Simplified dependencies;
1 parent 5547035 commit a5271c8

File tree

4 files changed

+5
-50
lines changed

4 files changed

+5
-50
lines changed

pom.xml

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>jlg-consulting</groupId>
77
<artifactId>jade</artifactId>
8-
<version>0.9.20</version>
8+
<version>0.9.21</version>
99
<packaging>jar</packaging>
1010

1111
<name>jade</name>
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>org.springframework.boot</groupId>
1818
<artifactId>spring-boot-starter-parent</artifactId>
19-
<version>1.3.3.RELEASE</version>
19+
<version>1.4.2.RELEASE</version>
2020
<relativePath/>
2121
</parent>
2222

@@ -38,31 +38,21 @@
3838
<artifactId>spring-boot-starter</artifactId>
3939
</dependency>
4040
<dependency>
41-
<groupId>junit</groupId>
42-
<artifactId>junit</artifactId>
43-
<version>4.12</version>
41+
<groupId>org.springframework.boot</groupId>
42+
<artifactId>spring-boot-starter-test</artifactId>
4443
<scope>test</scope>
4544
</dependency>
4645
<dependency>
4746
<groupId>pl.pragmatists</groupId>
4847
<artifactId>JUnitParams</artifactId>
4948
<version>1.0.3</version>
49+
<scope>test</scope>
5050
</dependency>
5151
<dependency>
5252
<groupId>jlg-consulting</groupId>
5353
<artifactId>final-frame-api</artifactId>
5454
<version>1.0</version>
5555
</dependency>
56-
<dependency>
57-
<groupId>org.springframework</groupId>
58-
<artifactId>spring-core</artifactId>
59-
<version>4.2.5.RELEASE</version>
60-
</dependency>
61-
<dependency>
62-
<groupId>org.mockito</groupId>
63-
<artifactId>mockito-all</artifactId>
64-
<version>1.9.5</version>
65-
</dependency>
6656
</dependencies>
6757

6858
<build>

src/main/java/jlg/jade/common/Constants.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
package jlg.jade.common;
88

99
public class Constants {
10-
public static final String LOGGER_NAME = "jlg.jade.logger";
1110
public static final int BYTE_TO_BITS = 8;
1211
public static final double LAT_LONG_WGS_PRECISION_CAT062 = 0.000005364; //180 divided by 2^25
1312
public static final double LAT_LONG_WGS_PRECISION_CAT034_CAT048 = 0.00002145767; //180 divided by 2^23

src/main/java/jlg/jade/example/DatagramConvertor.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,13 @@
1919
class DatagramConvertor implements Runnable {
2020
private final BlockingQueue<byte[]> rawQueue;
2121
private boolean isLogEnabled = false;
22-
private final Log logger;
2322
private int numberOfQueueItems;
2423
private int numberOfReceivedBytes;
2524
private int numberOfReceivedBytesFinalFrame;
2625
private final String allowedCategories;
2726

2827
DatagramConvertor(BlockingQueue<byte[]> rawQueue, String[] args) {
2928
this.rawQueue = rawQueue;
30-
this.logger = LogFactory.getLog("jlg.jade");
3129
this.isLogEnabled = Boolean.parseBoolean(args[1]);
3230
this.allowedCategories = args[3];
3331
}
@@ -39,7 +37,6 @@ public void run() {
3937

4038

4139
System.out.println("Start Datagram Convertor");
42-
logger.debug("Start Datagram Convertor");
4340

4441
//init asterix decoder
4542
List<Integer> categoriesToDecode = new ArrayList<>();
@@ -81,12 +78,10 @@ public void run() {
8178
numberOfReceivedBytesFinalFrame += rawData.length + 12;
8279
if (isLogEnabled) {
8380
for (AsterixDataBlock adb : dataBlocks) {
84-
logger.debug(adb.getDebugString());
8581
asterixDecodingReport.update(adb);
8682

8783
//item counters are printed every 100 data blocks
8884
if(index % 100 == 0) {
89-
logger.debug(asterixDecodingReport.toDebugString());
9085
}
9186
}
9287
index++;

src/main/resources/logback.xml

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)