Skip to content

Commit

Permalink
Housekeeping: Update 3rd party dependencies (#3786)
Browse files Browse the repository at this point in the history
  • Loading branch information
@JimTharioAmazon
JimTharioAmazon authored Mar 5, 2025
1 parent 4ada1ae commit a494a84
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 23 deletions.
6 changes: 6 additions & 0 deletions extra/modules/greenbids-real-time-data/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-storage</artifactId>
<version>2.41.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

Expand Down
14 changes: 12 additions & 2 deletions extra/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@
<httpclient.version>4.5.14</httpclient.version>
<ipaddress.version>5.3.1</ipaddress.version>
<oshi.version>6.4.5</oshi.version>
<json-schema-validator.version>1.0.76</json-schema-validator.version>
<json-schema-validator.version>1.4.0</json-schema-validator.version>
<jsonpatch.version>1.13</jsonpatch.version>
<psl.version>2.2.0</psl.version>
<metrics-influxdb.version>1.2.2</metrics-influxdb.version>
<vertx.prometheus.version>0.16.0</vertx.prometheus.version>
<iabtcf.version>2.0.10</iabtcf.version>
<gpp-encoder.version>3.2.0</gpp-encoder.version>
<maxmind-client.version>2.12.0</maxmind-client.version>
<maxmind-client.version>2.17.0</maxmind-client.version>
<protobuf.version>3.25.5</protobuf.version>
<protoc.version>${protobuf.version}</protoc.version>
<json-logic.version>1.0.7</json-logic.version>
Expand Down Expand Up @@ -130,6 +130,12 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.seancfoley</groupId>
Expand Down Expand Up @@ -248,6 +254,10 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
Expand Down
11 changes: 6 additions & 5 deletions src/test/groovy/org/prebid/server/functional/tests/AliasSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,12 @@ class AliasSpec extends BaseSpec {
assert bidResponse.ext?.warnings[PREBID]*.message ==
["WARNING: request.imp[0].ext.prebid.bidder.${APPNEXUS.value} was dropped with a reason: " +
"request.imp[0].ext.prebid.bidder.${APPNEXUS.value} failed validation.\n" +
"\$.placement_id: is missing but it is required\n" +
"\$.member: is missing but it is required\n" +
"\$.placementId: is missing but it is required\n" +
"\$.inv_code: is missing but it is required\n" +
"\$.invCode: is missing but it is required",
"\$: must be valid to one and only one schema, but 0 are valid\n" +
"\$: required property 'placement_id' not found\n" +
"\$: required property 'inv_code' not found\n" +
"\$: required property 'placementId' not found\n" +
"\$: required property 'member' not found\n" +
"\$: required property 'invCode' not found",
"WARNING: request.imp[0].ext must contain at least one valid bidder"]
}

Expand Down
39 changes: 27 additions & 12 deletions src/test/java/org/prebid/server/geolocation/MaxMindGeoLocationServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import org.prebid.server.geolocation.model.GeoInfo;

import java.io.IOException;
import java.util.ArrayList;

import static java.util.Collections.singletonList;
import static java.util.Collections.singletonMap;
Expand Down Expand Up @@ -62,21 +61,37 @@ public void setDatabaseReaderShouldReturnFailedFutureIfDatabaseArchiveNotFound()
public void lookupShouldReturnCountryIsoWhenDatabaseReaderWasSet() throws NoSuchFieldException, IOException,
GeoIp2Exception, IllegalAccessException {
// given
final Country country = new Country(null, null, null, "fr", null);
final Continent continent = new Continent(null, "eu", null, null);
final City city = new City(singletonList("test"), null, null, singletonMap("test", "Paris"));
final Location location = new Location(null, null, 48.8566, 2.3522,
null, null, null);
final ArrayList<Subdivision> subdivisions = new ArrayList<>();
subdivisions.add(new Subdivision(null, null, null, "paris", null));
final CityResponse cityResponse = new CityResponse(city, continent, country, location, null,
null, null, null, subdivisions, null);
final Country country = Mockito.mock(Country.class);
Mockito.when(country.getIsoCode()).thenReturn("fr");

final Continent continent = Mockito.mock(Continent.class);
Mockito.when(continent.getCode()).thenReturn("eu");

final City city = Mockito.mock(City.class);
Mockito.when(city.getNames()).thenReturn(singletonMap("en", "Paris"));
Mockito.when(city.getName()).thenReturn("Paris");

final Location location = Mockito.mock(Location.class);
Mockito.when(location.getLatitude()).thenReturn(48.8566);
Mockito.when(location.getLongitude()).thenReturn(2.3522);

final Subdivision subdivision = Mockito.mock(Subdivision.class);
Mockito.when(subdivision.getIsoCode()).thenReturn("paris");

final CityResponse cityResponse = Mockito.mock(CityResponse.class);
Mockito.when(cityResponse.getCountry()).thenReturn(country);
Mockito.when(cityResponse.getContinent()).thenReturn(continent);
Mockito.when(cityResponse.getCity()).thenReturn(city);
Mockito.when(cityResponse.getLocation()).thenReturn(location);
Mockito.when(cityResponse.getSubdivisions()).thenReturn(singletonList(subdivision));

final DatabaseReader databaseReader = Mockito.mock(DatabaseReader.class);
given(databaseReader.city(any())).willReturn(cityResponse);

new ReflectionMemberAccessor().set(maxMindGeoLocationService.getClass().getDeclaredField("databaseReader"),
maxMindGeoLocationService, databaseReader);
new ReflectionMemberAccessor().set(
maxMindGeoLocationService.getClass().getDeclaredField("databaseReader"),
maxMindGeoLocationService,
databaseReader);

// when
final Future<GeoInfo> future = maxMindGeoLocationService.lookup(TEST_IP, null);
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/org/prebid/server/validation/BidderParamValidatorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public void validateShouldReturnValidationMessagesWhenAppnexusImpExtNotValid() {
final Set<String> messages = bidderParamValidator.validate(APPNEXUS, node);

// then
assertThat(messages.size()).isEqualTo(4);
assertThat(messages.size()).isEqualTo(5);
}

@Test
Expand Down Expand Up @@ -161,7 +161,7 @@ public void validateShouldReturnValidationMessagesWhenAppnexusAliasImpExtNotVali
final Set<String> messages = bidderParamValidator.validate(APPNEXUS_ALIAS, node);

// then
assertThat(messages.size()).isEqualTo(4);
assertThat(messages.size()).isEqualTo(5);
}

@Test
Expand Down Expand Up @@ -201,7 +201,7 @@ public void validateShouldReturnValidationMessagesWhenSovrnExtNotValid() {
final Set<String> messages = bidderParamValidator.validate(SOVRN, node);

// then
assertThat(messages.size()).isEqualTo(2);
assertThat(messages.size()).isEqualTo(3);
}

@Test
Expand Down Expand Up @@ -339,7 +339,7 @@ public void validateShouldReturnValidationMessagesWhenBeachfrontExtNotValid() {
final Set<String> messages = bidderParamValidator.validate(BEACHFRONT, node);

// then
assertThat(messages.size()).isEqualTo(2);
assertThat(messages.size()).isEqualTo(3);
}

@Test
Expand Down

0 comments on commit a494a84

Please sign in to comment.