From 827e83336cdbb0f34b2b9c3c728be9c79ef9a37a Mon Sep 17 00:00:00 2001 From: Henry Avetisyan Date: Thu, 3 Aug 2017 13:04:39 -0700 Subject: [PATCH] #199 update dependent packages --- assembly/zms/pom.xml | 2 +- assembly/zts/pom.xml | 2 +- .../com/yahoo/athenz/zpe/TestZpeMetric.java | 6 +- clients/java/zts/pom.xml | 2 +- containers/jetty/pom.xml | 2 +- .../com/yahoo/athenz/zms/ZMSCoreTest.java | 2 +- .../yahoo/athenz/zts/DomainMetricTest.java | 20 +++-- libs/java/auth_core/pom.xml | 2 +- libs/java/server_common/pom.xml | 8 +- pom.xml | 17 +++-- servers/zms/pom.xml | 2 +- .../com/yahoo/athenz/zms/DBServiceTest.java | 11 ++- .../com/yahoo/athenz/zms/ZMSImplTest.java | 73 ++++++++++--------- .../zms/store/jdbc/JDBCConnectionTest.java | 12 ++- servers/zts/pom.xml | 8 +- .../JDBCCertRecordStoreConnectionTest.java | 9 ++- utils/zpe_policy_updater/pom.xml | 2 +- 17 files changed, 101 insertions(+), 79 deletions(-) diff --git a/assembly/zms/pom.xml b/assembly/zms/pom.xml index bbfc8ccf05f..0edeac11801 100644 --- a/assembly/zms/pom.xml +++ b/assembly/zms/pom.xml @@ -40,7 +40,7 @@ ch.qos.logback logback-classic - 1.1.3 + ${logback.version} runtime diff --git a/assembly/zts/pom.xml b/assembly/zts/pom.xml index 5897fe411b4..95c5abc2985 100644 --- a/assembly/zts/pom.xml +++ b/assembly/zts/pom.xml @@ -40,7 +40,7 @@ ch.qos.logback logback-classic - 1.1.3 + ${logback.version} runtime diff --git a/clients/java/zpe/src/test/java/com/yahoo/athenz/zpe/TestZpeMetric.java b/clients/java/zpe/src/test/java/com/yahoo/athenz/zpe/TestZpeMetric.java index 33637d817a1..a79d9885869 100644 --- a/clients/java/zpe/src/test/java/com/yahoo/athenz/zpe/TestZpeMetric.java +++ b/clients/java/zpe/src/test/java/com/yahoo/athenz/zpe/TestZpeMetric.java @@ -16,7 +16,6 @@ package com.yahoo.athenz.zpe; import java.io.IOException; -import junit.framework.TestCase; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -31,7 +30,10 @@ import com.yahoo.athenz.zts.DomainMetrics; import com.yahoo.rdl.JSON; -public class TestZpeMetric extends TestCase { +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.assertEquals; + +public class TestZpeMetric { @Test public void testZpeMetric() throws IOException { diff --git a/clients/java/zts/pom.xml b/clients/java/zts/pom.xml index 8e72df36996..006a67773e4 100644 --- a/clients/java/zts/pom.xml +++ b/clients/java/zts/pom.xml @@ -30,7 +30,7 @@ com.amazonaws aws-java-sdk-bom - 1.11.135 + ${aws.version} pom import diff --git a/containers/jetty/pom.xml b/containers/jetty/pom.xml index bcd19d97ed7..47206959933 100644 --- a/containers/jetty/pom.xml +++ b/containers/jetty/pom.xml @@ -106,7 +106,7 @@ ch.qos.logback logback-classic - 1.1.3 + ${logback.version} diff --git a/core/zms/src/test/java/com/yahoo/athenz/zms/ZMSCoreTest.java b/core/zms/src/test/java/com/yahoo/athenz/zms/ZMSCoreTest.java index 30f463e867f..9d8c55b7b2e 100644 --- a/core/zms/src/test/java/com/yahoo/athenz/zms/ZMSCoreTest.java +++ b/core/zms/src/test/java/com/yahoo/athenz/zms/ZMSCoreTest.java @@ -300,7 +300,7 @@ public void testSignedDomainsMethod() { //assertTrue(result.valid, result.error); assertEquals(e.getName(), "test.entity"); - assertEquals(e.getValue(), new Struct().with("key", (Object) "test")); + assertTrue(e.getValue().equals(new Struct().with("key", (Object) "test"))); Entity e2 = new Entity().setName("test.entity").setValue(new Struct().with("key", "test")); assertTrue(e2.equals(e)); diff --git a/core/zts/src/test/java/com/yahoo/athenz/zts/DomainMetricTest.java b/core/zts/src/test/java/com/yahoo/athenz/zts/DomainMetricTest.java index 6a20ff2f502..a229dd4c8d5 100644 --- a/core/zts/src/test/java/com/yahoo/athenz/zts/DomainMetricTest.java +++ b/core/zts/src/test/java/com/yahoo/athenz/zts/DomainMetricTest.java @@ -25,8 +25,6 @@ import org.testng.annotations.Test; -import junit.framework.Assert; - public class DomainMetricTest { @Test @@ -36,9 +34,9 @@ public void testsetgetMetricType() { dm.setMetricType(DomainMetricType.ACCESS_ALLOWED); dm.setMetricVal(1); - Assert.assertEquals(DomainMetricType.ACCESS_ALLOWED, dm.getMetricType()); - Assert.assertEquals(1, dm.getMetricVal()); - Assert.assertEquals(DomainMetricType.ACCESS_ALLOWED, DomainMetricType.fromString("ACCESS_ALLOWED")); + assertEquals(DomainMetricType.ACCESS_ALLOWED, dm.getMetricType()); + assertEquals(1, dm.getMetricVal()); + assertEquals(DomainMetricType.ACCESS_ALLOWED, DomainMetricType.fromString("ACCESS_ALLOWED")); } @Test(expectedExceptions = { java.lang.IllegalArgumentException.class }) @@ -56,17 +54,17 @@ public void testMetricTypeEqualsTrueFalse() { dm2.setMetricType(DomainMetricType.ACCESS_ALLOWED); dm2.setMetricVal(1); - Assert.assertTrue(dm1.equals(dm2)); + assertTrue(dm1.equals(dm2)); // change value dm2.setMetricVal(0); - Assert.assertFalse(dm1.equals(dm2)); + assertFalse(dm1.equals(dm2)); // change type dm1.setMetricType(DomainMetricType.ACCESS_ALLOWED_DENY); - Assert.assertFalse(dm1.equals(dm2)); + assertFalse(dm1.equals(dm2)); - Assert.assertFalse(dm1.equals(new String())); + assertFalse(dm1.equals(new String())); } @Test @@ -90,12 +88,12 @@ public void testDomainMetrics() { //// equals // true case - Assert.assertTrue(dms1.equals(dms1)); + assertTrue(dms1.equals(dms1)); assertTrue(dms1.equals(dms2)); // false case dms2.setMetricList(new ArrayList()); - Assert.assertFalse(dms1.equals(dms2)); + assertFalse(dms1.equals(dms2)); dms2.setDomainName("test.net"); assertFalse(dms1.equals(dms2)); diff --git a/libs/java/auth_core/pom.xml b/libs/java/auth_core/pom.xml index fedcbbc6016..9cb5fd768c2 100644 --- a/libs/java/auth_core/pom.xml +++ b/libs/java/auth_core/pom.xml @@ -35,7 +35,7 @@ org.kohsuke libpam4j - 1.6 + 1.8 diff --git a/libs/java/server_common/pom.xml b/libs/java/server_common/pom.xml index 529bc5a8ec7..454f664962f 100644 --- a/libs/java/server_common/pom.xml +++ b/libs/java/server_common/pom.xml @@ -106,22 +106,22 @@ mysql mysql-connector-java - 5.1.41 + 5.1.43 org.apache.commons commons-dbcp2 - 2.0.1 + 2.1.1 org.apache.commons commons-pool2 - 2.2 + 2.4.2 commons-logging commons-logging - 1.1.3 + 1.2 diff --git a/pom.xml b/pom.xml index 61b30683656..cab4bdb7b37 100644 --- a/pom.xml +++ b/pom.xml @@ -70,10 +70,13 @@ 9.4.6.v20170531 - 2.23.2 - 2.5.4 + 2.25.1 + 2.9.0 1.4.14 - 1.55 + 1.57 + 1.11.172 + 22.0 + 1.2.3 UTF-8 UTF-8 @@ -171,24 +174,24 @@ org.slf4j slf4j-api - 1.7.5 + 1.7.25 ch.qos.logback logback-classic - 1.1.3 + ${logback.version} test org.testng testng - 6.3.1 + 6.11 test org.mockito mockito-all - 1.9.5 + 1.10.19 test diff --git a/servers/zms/pom.xml b/servers/zms/pom.xml index 322c7700030..a336f498dd0 100644 --- a/servers/zms/pom.xml +++ b/servers/zms/pom.xml @@ -91,7 +91,7 @@ com.google.guava guava - 18.0 + ${guava.version} org.glassfish.jersey.containers diff --git a/servers/zms/src/test/java/com/yahoo/athenz/zms/DBServiceTest.java b/servers/zms/src/test/java/com/yahoo/athenz/zms/DBServiceTest.java index 7f22fc23dae..58cc9bf0d6e 100644 --- a/servers/zms/src/test/java/com/yahoo/athenz/zms/DBServiceTest.java +++ b/servers/zms/src/test/java/com/yahoo/athenz/zms/DBServiceTest.java @@ -46,9 +46,14 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import junit.framework.TestCase; - -public class DBServiceTest extends TestCase { +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.fail; + +public class DBServiceTest { @Mock FileConnection mockFileConn; @Mock ObjectStore mockObjStore; diff --git a/servers/zms/src/test/java/com/yahoo/athenz/zms/ZMSImplTest.java b/servers/zms/src/test/java/com/yahoo/athenz/zms/ZMSImplTest.java index 6a0b9dee629..c9311bea484 100644 --- a/servers/zms/src/test/java/com/yahoo/athenz/zms/ZMSImplTest.java +++ b/servers/zms/src/test/java/com/yahoo/athenz/zms/ZMSImplTest.java @@ -34,8 +34,13 @@ import org.mockito.MockitoAnnotations; import org.testng.annotations.*; -import static org.testng.Assert.*; -import junit.framework.TestCase; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotEquals; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.fail; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -64,7 +69,7 @@ import com.yahoo.rdl.Struct; import com.yahoo.rdl.Timestamp; -public class ZMSImplTest extends TestCase { +public class ZMSImplTest { public static final String ZMS_PROP_PUBLIC_KEY = "athenz.zms.publickey"; @@ -133,7 +138,7 @@ public AuditLogMsgBuilder getMsgBuilder() { } } - @BeforeClass(alwaysRun=true) + @BeforeMethod public void setUp() throws Exception { MockitoAnnotations.initMocks(this); @@ -575,7 +580,7 @@ public void testGetAuditLogMsgBuilderTokenWithSig() { String who = msgBldr.who(); assertNotNull(who); assertTrue(who.contains(userId)); - assertTrue("Should not contain the signature: " + who, !who.contains(signature)); + assertTrue(!who.contains(signature), "Should not contain the signature: " + who); } @Test @@ -2003,11 +2008,11 @@ public void testCreateRole() { if (msg.indexOf("WHAT-api=(putrole)") == -1) { continue; } - assertTrue(msg, msg.indexOf("CLIENT-IP=(" + MOCKCLIENTADDR + ")") != -1); + assertTrue(msg.indexOf("CLIENT-IP=(" + MOCKCLIENTADDR + ")") != -1, msg); int index = msg.indexOf("WHAT-details=("); - assertTrue(msg, index != -1); + assertTrue(index != -1, msg); int index2 = msg.indexOf("\"name\": \"role1\", \"trust\": \"null\", \"added-members\": ["); - assertTrue(msg, index2 > index); + assertTrue(index2 > index, msg); foundError = true; break; } @@ -2032,11 +2037,11 @@ public void testCreateRole() { if (msg.indexOf("WHAT-api=(putrole)") == -1) { continue; } - assertTrue(msg, msg.indexOf("CLIENT-IP=(" + MOCKCLIENTADDR + ")") != -1); + assertTrue(msg.indexOf("CLIENT-IP=(" + MOCKCLIENTADDR + ")") != -1, msg); int index = msg.indexOf("WHAT-details=("); - assertTrue(msg, index != -1); + assertTrue(index != -1, msg); int index2 = msg.indexOf("\"name\": \"role1\", \"trust\": \"null\", \"deleted-members\": [\"user.jane\"], \"added-members\": []"); - assertTrue(msg, index2 > index); + assertTrue(index2 > index, msg); foundError = true; break; } @@ -2589,9 +2594,9 @@ public void testPutMembership() { continue; } int index = msg.indexOf("WHAT-details=("); - assertTrue(msg, index != -1); + assertTrue(index != -1, msg); int index2 = msg.indexOf("{\"member\": \"user.doe\"}"); - assertTrue(msg, index2 > index); + assertTrue(index2 > index, msg); foundError = true; break; } @@ -2622,9 +2627,9 @@ public void testPutMembership() { continue; } int index = msg.indexOf("WHAT-details=("); - assertTrue(msg, index != -1); + assertTrue(index != -1, msg); int index2 = msg.indexOf("{\"member\": \"coretech.storage\"}"); - assertTrue(msg, index2 > index); + assertTrue(index2 > index, msg); foundError = true; break; } @@ -3406,13 +3411,13 @@ public void testGetPolicy() { if (msg.indexOf("WHAT-api=(putpolicy)") == -1) { continue; } - assertTrue(msg, msg.indexOf("CLIENT-IP=(" + MOCKCLIENTADDR + ")") != -1); + assertTrue(msg.indexOf("CLIENT-IP=(" + MOCKCLIENTADDR + ")") != -1, msg); int index = msg.indexOf("WHAT-details=("); - assertTrue(msg, index != -1); + assertTrue(index != -1, msg); int index2 = msg.indexOf("\"added-assertions\": [{\"role\": \"policygetdom1:role.role1\", \"action\": \"*\", \"effect\": \"ALLOW\", \"resource\": \"policygetdom1:*\"}]"); - assertTrue(msg, index < index2); + assertTrue(index < index2, msg); index2 = msg.indexOf("ERROR"); - assertTrue(msg, index2 == -1); + assertTrue(index2 == -1, msg); foundError = true; break; } @@ -3434,14 +3439,14 @@ public void testGetPolicy() { if (msg.indexOf("WHAT-api=(putpolicy)") == -1) { continue; } - assertTrue(msg, msg.indexOf("CLIENT-IP=(" + MOCKCLIENTADDR + ")") != -1); + assertTrue(msg.indexOf("CLIENT-IP=(" + MOCKCLIENTADDR + ")") != -1, msg); int index = msg.indexOf("WHAT-details=("); - assertTrue(msg, index != -1); + assertTrue(index != -1, msg); int index2 = msg.indexOf("\"added-assertions\": [{\"role\": \"policygetdom1:role.role1\", \"action\": \"layup\", \"effect\": \"DENY\", \"resource\": \"policygetdom1:*\"}]"); - assertTrue(msg, index < index2); + assertTrue(index < index2, msg); index2 = msg.indexOf("\"deleted-assertions\": [{\"role\": \"policygetdom1:role.role1\", \"action\": \"*\", \"effect\": \"ALLOW\", \"resource\": \"policygetdom1:*\"}]"); index2 = msg.indexOf("ERROR"); - assertTrue(msg, index2 == -1); + assertTrue(index2 == -1, msg); foundError = true; break; } @@ -3672,7 +3677,7 @@ public void testPutAdminPolicyRejection() { fail(); } catch (ResourceException ex) { assertTrue(ex.getCode() == 400); - assertTrue(ex.getMessage(), ex.getMessage().contains("admin policy cannot be modified")); + assertTrue(ex.getMessage().contains("admin policy cannot be modified"), ex.getMessage()); } zms.deleteTopLevelDomain(mockDomRsrcCtx, domain, auditRef); } @@ -8577,7 +8582,7 @@ public void testGetDomainDataCheck() { // tenant sees that the subdomain provider isnt provisioned yet // for the resource group: testgetdomaindatacheckprovider.sub.storage.ravers ddc = zms.getDomainDataCheck(mockDomRsrcCtx, tenantDomainName); - assertNotNull(ddc.toString(), ddc); + assertNotNull(ddc, ddc.toString()); assertEquals(7, ddc.getPolicyCount()); assertEquals(12, ddc.getAssertionCount()); assertEquals(2, ddc.getRoleWildCardCount()); @@ -9418,7 +9423,7 @@ public void testProcessListRequestUnknownType() { @Test public void testProcessListRequestSkipNoMatch() { - String domainName = "listrequest"; + String domainName = "listrequestskipnomatch"; List adminUsers = new ArrayList<>(); adminUsers.add("user.user"); zms.dbService.makeDomain(mockDomRsrcCtx, domainName, "Test Domain", "org", @@ -9452,7 +9457,7 @@ public void testProcessListRequestSkipNoMatch() { @Test public void testProcessListRequestSkipMatch() { - String domainName = "listrequest"; + String domainName = "listrequestskipmatch"; List adminUsers = new ArrayList<>(); adminUsers.add("user.user"); zms.dbService.makeDomain(mockDomRsrcCtx, domainName, "Test Domain", "org", @@ -9480,7 +9485,7 @@ public void testProcessListRequestSkipMatch() { @Test public void testProcessListRequestLimitExceeded() { - String domainName = "listrequest"; + String domainName = "listrequestlimitexceeded"; List adminUsers = new ArrayList<>(); adminUsers.add("user.user"); zms.dbService.makeDomain(mockDomRsrcCtx, domainName, "Test Domain", "org", @@ -9510,7 +9515,7 @@ public void testProcessListRequestLimitExceeded() { @Test public void testProcessListRequestLimitNotExceeded() { - String domainName = "listrequest"; + String domainName = "listrequestlimitnotexceeded"; List adminUsers = new ArrayList<>(); adminUsers.add("user.user"); zms.dbService.makeDomain(mockDomRsrcCtx, domainName, "Test Domain", "org", @@ -9544,8 +9549,7 @@ public void testProcessListRequestLimitNotExceeded() { @Test public void testProcessListRequestLimitAndSkip() { - - String domainName = "listrequest"; + String domainName = "listrequestlimitandskip"; List adminUsers = new ArrayList<>(); adminUsers.add("user.user"); zms.dbService.makeDomain(mockDomRsrcCtx, domainName, "Test Domain", "org", @@ -9583,7 +9587,7 @@ public void testProcessListRequestLimitAndSkip() { @Test public void testProcessListRequestLimitAndSkipLessThanLimitLeft() { - String domainName = "listrequest"; + String domainName = "listrequestlimitskiplessthanlimitleft"; List adminUsers = new ArrayList<>(); adminUsers.add("user.user"); zms.dbService.makeDomain(mockDomRsrcCtx, domainName, "Test Domain", "org", @@ -9613,6 +9617,7 @@ public void testProcessListRequestLimitAndSkipLessThanLimitLeft() { assertNull(zms.processListRequest(domainName, AthenzObject.ROLE, 2, "role4", names)); assertEquals(names.size(), 1); assertTrue(names.contains("role5")); + zms.dbService.executeDeleteDomain(mockDomRsrcCtx, domainName, auditRef, "unittest"); } @Test @@ -14044,7 +14049,7 @@ public void testPutAssertionAdminReject() { zms.putAssertion(mockDomRsrcCtx, domainName, "admin", auditRef, assertion); fail(); } catch (ResourceException ex) { - assertTrue(ex.getMessage(), ex.getMessage().contains("admin policy cannot be modified")); + assertTrue(ex.getMessage().contains("admin policy cannot be modified"), ex.getMessage()); } zms.deleteTopLevelDomain(mockDomRsrcCtx, domainName, auditRef); @@ -14149,7 +14154,7 @@ public void testDeleteAssertionAdminReject() { zms.deleteAssertion(mockDomRsrcCtx, domainName, "admin", Long.valueOf(101), auditRef); fail(); } catch (ResourceException ex) { - assertTrue(ex.getMessage(), ex.getMessage().contains("admin policy cannot be modified")); + assertTrue(ex.getMessage().contains("admin policy cannot be modified"), ex.getMessage()); } zms.deleteTopLevelDomain(mockDomRsrcCtx, domainName, auditRef); diff --git a/servers/zms/src/test/java/com/yahoo/athenz/zms/store/jdbc/JDBCConnectionTest.java b/servers/zms/src/test/java/com/yahoo/athenz/zms/store/jdbc/JDBCConnectionTest.java index 8e93ecb76bd..52a8085bd76 100644 --- a/servers/zms/src/test/java/com/yahoo/athenz/zms/store/jdbc/JDBCConnectionTest.java +++ b/servers/zms/src/test/java/com/yahoo/athenz/zms/store/jdbc/JDBCConnectionTest.java @@ -62,11 +62,17 @@ import static org.mockito.Mockito.times; import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import junit.framework.TestCase; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.fail; -public class JDBCConnectionTest extends TestCase { +public class JDBCConnectionTest { @Mock PoolableDataSource mockDataSrc; @Mock Statement mockStmt; @@ -79,7 +85,7 @@ public class JDBCConnectionTest extends TestCase { String domainData; String domainChangedData; - @BeforeClass + @BeforeMethod public void setUp() throws Exception { MockitoAnnotations.initMocks(this); Mockito.doReturn(mockConn).when(mockDataSrc).getConnection(); diff --git a/servers/zts/pom.xml b/servers/zts/pom.xml index a7eb63d0de0..f719312a02e 100644 --- a/servers/zts/pom.xml +++ b/servers/zts/pom.xml @@ -32,7 +32,7 @@ com.amazonaws aws-java-sdk-bom - 1.11.135 + ${aws.version} pom import @@ -89,17 +89,17 @@ com.google.guava guava - 16.0.1 + ${guava.version} org.bouncycastle bcprov-jdk15on - 1.53 + ${bouncycastle.version} org.bouncycastle bcpkix-jdk15on - 1.53 + ${bouncycastle.version} org.glassfish.jersey.containers diff --git a/servers/zts/src/test/java/com/yahoo/athenz/zts/cert/impl/JDBCCertRecordStoreConnectionTest.java b/servers/zts/src/test/java/com/yahoo/athenz/zts/cert/impl/JDBCCertRecordStoreConnectionTest.java index 0fad42f678d..82e6bbf6dd0 100644 --- a/servers/zts/src/test/java/com/yahoo/athenz/zts/cert/impl/JDBCCertRecordStoreConnectionTest.java +++ b/servers/zts/src/test/java/com/yahoo/athenz/zts/cert/impl/JDBCCertRecordStoreConnectionTest.java @@ -33,13 +33,16 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + import com.yahoo.athenz.common.server.db.PoolableDataSource; import com.yahoo.athenz.zts.ResourceException; import com.yahoo.athenz.zts.cert.X509CertRecord; -import junit.framework.TestCase; - -public class JDBCCertRecordStoreConnectionTest extends TestCase { +public class JDBCCertRecordStoreConnectionTest { @Mock PoolableDataSource mockDataSrc; @Mock Statement mockStmt; diff --git a/utils/zpe_policy_updater/pom.xml b/utils/zpe_policy_updater/pom.xml index 6fee8841cb9..53a848f0d7a 100644 --- a/utils/zpe_policy_updater/pom.xml +++ b/utils/zpe_policy_updater/pom.xml @@ -80,7 +80,7 @@ ch.qos.logback logback-classic - 1.1.3 + ${logback.version}