From f2a4714267e69a93bc4d476e8d7f8530064ea2f1 Mon Sep 17 00:00:00 2001 From: "Dietmar.Birzer (extern)" Date: Tue, 9 Aug 2022 17:12:35 +0200 Subject: [PATCH 1/5] Upgrade dependencies with known vulnerabilities --- pom.xml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 0733349..6c01164 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ UTF-8 - 2.11.1 + 2.13.3 1.20 1.18.12 @@ -170,7 +170,7 @@ reflections org.reflections - 0.9.11 + 0.10.2 validation-api @@ -229,6 +229,11 @@ gentyref 1.2.0 + + com.google.guava + guava + 31.1-jre + org.slf4j slf4j-api @@ -259,7 +264,7 @@ org.json json - 20171018 + 20220320 test @@ -287,7 +292,7 @@ ch.qos.logback logback-classic - 1.2.3 + 1.2.11 test From 5d9faf319ceca1fc659417c18f40c78fd31b9d3a Mon Sep 17 00:00:00 2001 From: "Dietmar.Birzer (extern)" Date: Tue, 9 Aug 2022 17:18:03 +0200 Subject: [PATCH 2/5] Fix deprecation warnings --- .../mercateo/common/rest/schemagen/SchemaGeneratorTest.java | 2 +- .../rest/schemagen/SchemaJsonPropertyGeneratorTest.java | 2 +- .../mercateo/common/rest/schemagen/link/CallScopeTest.java | 2 +- .../mercateo/common/rest/schemagen/link/LinkFactoryTest.java | 4 ++-- .../common/rest/schemagen/link/LinkMetaFactoryTest.java | 2 +- .../rest/schemagen/link/helper/BaseUriCreatorDefaultTest.java | 2 +- .../link/injection/LinkFactoryContextFactoryTest.java | 2 +- .../schemagen/link/injection/LinkMetaFactoryFactoryTest.java | 2 +- .../plugin/common/MethodCheckerForLinkFactoryTest.java | 2 +- .../common/rest/schemagen/types/HyperSchemaCreatorTest.java | 2 +- .../common/rest/schemagen/types/ListResponseTest.java | 2 +- .../com/mercateo/common/rest/schemagen/types/MessageTest.java | 4 ++-- .../rest/schemagen/types/ResponseBuilderAbstractTest.java | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/test/java/com/mercateo/common/rest/schemagen/SchemaGeneratorTest.java b/src/test/java/com/mercateo/common/rest/schemagen/SchemaGeneratorTest.java index 11eb5da..215fcde 100644 --- a/src/test/java/com/mercateo/common/rest/schemagen/SchemaGeneratorTest.java +++ b/src/test/java/com/mercateo/common/rest/schemagen/SchemaGeneratorTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import com.mercateo.common.rest.schemagen.link.LinkFactory; import com.mercateo.common.rest.schemagen.link.SchemaGenerator; diff --git a/src/test/java/com/mercateo/common/rest/schemagen/SchemaJsonPropertyGeneratorTest.java b/src/test/java/com/mercateo/common/rest/schemagen/SchemaJsonPropertyGeneratorTest.java index 95063c8..7ba9634 100644 --- a/src/test/java/com/mercateo/common/rest/schemagen/SchemaJsonPropertyGeneratorTest.java +++ b/src/test/java/com/mercateo/common/rest/schemagen/SchemaJsonPropertyGeneratorTest.java @@ -14,7 +14,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import javax.ws.rs.PathParam; import java.lang.reflect.Type; diff --git a/src/test/java/com/mercateo/common/rest/schemagen/link/CallScopeTest.java b/src/test/java/com/mercateo/common/rest/schemagen/link/CallScopeTest.java index f49f0f0..01d575e 100644 --- a/src/test/java/com/mercateo/common/rest/schemagen/link/CallScopeTest.java +++ b/src/test/java/com/mercateo/common/rest/schemagen/link/CallScopeTest.java @@ -4,7 +4,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import com.mercateo.reflection.Call; diff --git a/src/test/java/com/mercateo/common/rest/schemagen/link/LinkFactoryTest.java b/src/test/java/com/mercateo/common/rest/schemagen/link/LinkFactoryTest.java index c03bbf9..b09d3e8 100644 --- a/src/test/java/com/mercateo/common/rest/schemagen/link/LinkFactoryTest.java +++ b/src/test/java/com/mercateo/common/rest/schemagen/link/LinkFactoryTest.java @@ -4,8 +4,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; import com.mercateo.common.rest.schemagen.ResourceClass; diff --git a/src/test/java/com/mercateo/common/rest/schemagen/link/LinkMetaFactoryTest.java b/src/test/java/com/mercateo/common/rest/schemagen/link/LinkMetaFactoryTest.java index b1f5475..e553162 100644 --- a/src/test/java/com/mercateo/common/rest/schemagen/link/LinkMetaFactoryTest.java +++ b/src/test/java/com/mercateo/common/rest/schemagen/link/LinkMetaFactoryTest.java @@ -13,7 +13,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class LinkMetaFactoryTest { diff --git a/src/test/java/com/mercateo/common/rest/schemagen/link/helper/BaseUriCreatorDefaultTest.java b/src/test/java/com/mercateo/common/rest/schemagen/link/helper/BaseUriCreatorDefaultTest.java index e00d9c5..ac92f74 100644 --- a/src/test/java/com/mercateo/common/rest/schemagen/link/helper/BaseUriCreatorDefaultTest.java +++ b/src/test/java/com/mercateo/common/rest/schemagen/link/helper/BaseUriCreatorDefaultTest.java @@ -12,7 +12,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class BaseUriCreatorDefaultTest { diff --git a/src/test/java/com/mercateo/common/rest/schemagen/link/injection/LinkFactoryContextFactoryTest.java b/src/test/java/com/mercateo/common/rest/schemagen/link/injection/LinkFactoryContextFactoryTest.java index e0b9544..023e4ae 100644 --- a/src/test/java/com/mercateo/common/rest/schemagen/link/injection/LinkFactoryContextFactoryTest.java +++ b/src/test/java/com/mercateo/common/rest/schemagen/link/injection/LinkFactoryContextFactoryTest.java @@ -8,7 +8,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MultivaluedMap; diff --git a/src/test/java/com/mercateo/common/rest/schemagen/link/injection/LinkMetaFactoryFactoryTest.java b/src/test/java/com/mercateo/common/rest/schemagen/link/injection/LinkMetaFactoryFactoryTest.java index 8a28b5c..b4c78d0 100644 --- a/src/test/java/com/mercateo/common/rest/schemagen/link/injection/LinkMetaFactoryFactoryTest.java +++ b/src/test/java/com/mercateo/common/rest/schemagen/link/injection/LinkMetaFactoryFactoryTest.java @@ -11,7 +11,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import com.mercateo.common.rest.schemagen.JsonSchemaGenerator; import com.mercateo.common.rest.schemagen.link.LinkFactoryContext; diff --git a/src/test/java/com/mercateo/common/rest/schemagen/plugin/common/MethodCheckerForLinkFactoryTest.java b/src/test/java/com/mercateo/common/rest/schemagen/plugin/common/MethodCheckerForLinkFactoryTest.java index 03fc378..c4eebb9 100644 --- a/src/test/java/com/mercateo/common/rest/schemagen/plugin/common/MethodCheckerForLinkFactoryTest.java +++ b/src/test/java/com/mercateo/common/rest/schemagen/plugin/common/MethodCheckerForLinkFactoryTest.java @@ -5,7 +5,7 @@ import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import javax.ws.rs.core.SecurityContext; diff --git a/src/test/java/com/mercateo/common/rest/schemagen/types/HyperSchemaCreatorTest.java b/src/test/java/com/mercateo/common/rest/schemagen/types/HyperSchemaCreatorTest.java index 2aa6e75..80e5d84 100644 --- a/src/test/java/com/mercateo/common/rest/schemagen/types/HyperSchemaCreatorTest.java +++ b/src/test/java/com/mercateo/common/rest/schemagen/types/HyperSchemaCreatorTest.java @@ -15,7 +15,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class HyperSchemaCreatorTest { diff --git a/src/test/java/com/mercateo/common/rest/schemagen/types/ListResponseTest.java b/src/test/java/com/mercateo/common/rest/schemagen/types/ListResponseTest.java index 3f22a90..cec9631 100644 --- a/src/test/java/com/mercateo/common/rest/schemagen/types/ListResponseTest.java +++ b/src/test/java/com/mercateo/common/rest/schemagen/types/ListResponseTest.java @@ -70,7 +70,7 @@ public void shouldSerialize() throws Exception { @Test public void shouldDeserialize() throws Exception { final ObjectMapper mapper = new ObjectMapper(); - mapper.disableDefaultTyping(); + mapper.deactivateDefaultTyping(); final String content = "{\"members\": [{\"value\": \"foo\", \"_schema\":{\"links\":[]}}, {\"value\": \"bar\", \"_schema\":{\"links\":[]}}], \"_schema\":{\"links\":[]}}"; diff --git a/src/test/java/com/mercateo/common/rest/schemagen/types/MessageTest.java b/src/test/java/com/mercateo/common/rest/schemagen/types/MessageTest.java index 869a040..e0c68bb 100644 --- a/src/test/java/com/mercateo/common/rest/schemagen/types/MessageTest.java +++ b/src/test/java/com/mercateo/common/rest/schemagen/types/MessageTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import com.fasterxml.jackson.databind.ObjectMapper; @@ -82,7 +82,7 @@ public void shouldSerialize() throws Exception { @Test public void shouldDeserialize() throws Exception { final ObjectMapper mapper = new ObjectMapper(); - mapper.disableDefaultTyping(); + mapper.deactivateDefaultTyping(); final String content = "{\"type\":\"INFO\",\"code\":\"\",\"data\":{\"value\":\"\"}}"; diff --git a/src/test/java/com/mercateo/common/rest/schemagen/types/ResponseBuilderAbstractTest.java b/src/test/java/com/mercateo/common/rest/schemagen/types/ResponseBuilderAbstractTest.java index 35b3eb5..33abb41 100644 --- a/src/test/java/com/mercateo/common/rest/schemagen/types/ResponseBuilderAbstractTest.java +++ b/src/test/java/com/mercateo/common/rest/schemagen/types/ResponseBuilderAbstractTest.java @@ -13,7 +13,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) public class ResponseBuilderAbstractTest { From bef5dc066a6611a890c578563060c04080c3abae Mon Sep 17 00:00:00 2001 From: "Dietmar.Birzer (extern)" Date: Wed, 10 Aug 2022 09:25:07 +0200 Subject: [PATCH 3/5] Update mockito * also update assertj-core --- pom.xml | 9 +++++++-- .../injection/LinkMetaFactoryFactoryTest.java | 15 +++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 6c01164..2db7fe8 100644 --- a/pom.xml +++ b/pom.xml @@ -252,13 +252,13 @@ org.assertj assertj-core - 3.9.1 + 3.23.1 test org.mockito mockito-core - 2.15.0 + 4.6.1 test @@ -301,6 +301,11 @@ ${lombok.version} provided + + net.bytebuddy + byte-buddy + 1.12.12 + diff --git a/src/test/java/com/mercateo/common/rest/schemagen/link/injection/LinkMetaFactoryFactoryTest.java b/src/test/java/com/mercateo/common/rest/schemagen/link/injection/LinkMetaFactoryFactoryTest.java index b4c78d0..86b4957 100644 --- a/src/test/java/com/mercateo/common/rest/schemagen/link/injection/LinkMetaFactoryFactoryTest.java +++ b/src/test/java/com/mercateo/common/rest/schemagen/link/injection/LinkMetaFactoryFactoryTest.java @@ -2,10 +2,11 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verifyZeroInteractions; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.verifyNoInteractions; -import java.net.URI; +import com.mercateo.common.rest.schemagen.JsonSchemaGenerator; +import com.mercateo.common.rest.schemagen.link.LinkFactoryContext; +import com.mercateo.common.rest.schemagen.link.LinkMetaFactory; import org.junit.Test; import org.junit.runner.RunWith; @@ -13,12 +14,6 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import com.mercateo.common.rest.schemagen.JsonSchemaGenerator; -import com.mercateo.common.rest.schemagen.link.LinkFactoryContext; -import com.mercateo.common.rest.schemagen.link.LinkMetaFactory; -import com.mercateo.common.rest.schemagen.plugin.FieldCheckerForSchema; -import com.mercateo.common.rest.schemagen.plugin.MethodCheckerForLink; - @RunWith(MockitoJUnitRunner.class) public class LinkMetaFactoryFactoryTest { @@ -44,6 +39,6 @@ public void disposeShouldDoNothing() throws Exception { final LinkMetaFactory linkMetaFactory = mock(LinkMetaFactory.class); linkMetaFactoryFactory.dispose(linkMetaFactory); - verifyZeroInteractions(schemaGenerator, linkFactoryContext, linkMetaFactory); + verifyNoInteractions(schemaGenerator, linkFactoryContext, linkMetaFactory); } } \ No newline at end of file From 25dbbd8a2c4786130b52466eccfcd21f7ada2b51 Mon Sep 17 00:00:00 2001 From: "Dietmar.Birzer (extern)" Date: Wed, 10 Aug 2022 09:37:07 +0200 Subject: [PATCH 4/5] Upgrade to reflection 2.0.0 --- pom.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 2db7fe8..67521f9 100644 --- a/pom.xml +++ b/pom.xml @@ -165,7 +165,7 @@ com.mercateo reflection - 1.2.14 + 2.0.0 reflections @@ -301,11 +301,6 @@ ${lombok.version} provided - - net.bytebuddy - byte-buddy - 1.12.12 - From ab9184a9b588f5079cb1ea54a744b518588f4fc7 Mon Sep 17 00:00:00 2001 From: "Dietmar.Birzer (extern)" Date: Wed, 10 Aug 2022 09:42:52 +0200 Subject: [PATCH 5/5] Update project version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 67521f9..0757762 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ common.rest.schemagen com.mercateo - 0.19.4-SNAPSHOT + 0.20.0-SNAPSHOT jar rest-schemagen Jersey add-on for dynamic link and schema building