Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Housekeeping: Remove PG leftovers #3112

Merged
merged 6 commits into from
May 2, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions docs/config-app.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,6 @@ Also, each bidder could have its own bidder-specific options.
- `admin-endpoints.tracelog.on-application-port` - when equals to `false` endpoint will be bound to `admin.port`.
- `admin-endpoints.tracelog.protected` - when equals to `true` endpoint will be protected by basic authentication configured in `admin-endpoints.credentials`

- `admin-endpoints.e2eadmin.enabled` - if equals to `true` the endpoint will be available.
- `admin-endpoints.e2eadmin.path` - the server context path where the endpoint will be accessible.
- `admin-endpoints.e2eadmin.on-application-port` - when equals to `false` endpoint will be bound to `admin.port`.
- `admin-endpoints.e2eadmin.protected` - when equals to `true` endpoint will be protected by basic authentication configured in `admin-endpoints.credentials`

- `admin-endpoints.collected-metrics.enabled` - if equals to `true` the endpoint will be available.
- `admin-endpoints.collected-metrics.path` - the server context path where the endpoint will be accessible.
- `admin-endpoints.collected-metrics.on-application-port` - when equals to `false` endpoint will be bound to `admin.port`.
Expand Down
22 changes: 0 additions & 22 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,13 @@
<mockito.version>4.11.0</mockito.version>
<assertj.version>3.24.2</assertj.version>
<wiremock.version>2.35.1</wiremock.version>
<awaitility.version>4.2.0</awaitility.version>
<jetty.version>9.4.53.v20231009</jetty.version>
<restassured.version>5.4.0</restassured.version>
<h2.version>2.2.220</h2.version>
<spock.version>2.4-M2-groovy-4.0</spock.version>
<groovy.version>4.0.15</groovy.version>
<testcontainers.version>1.17.4</testcontainers.version>
<mockserver.version>5.14.0</mockserver.version>
<aspectj.version>1.9.9.1</aspectj.version>
<bytebuddy.version>1.12.14</bytebuddy.version>

<!-- plugin versions -->
Expand Down Expand Up @@ -127,10 +125,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
Expand Down Expand Up @@ -409,12 +403,6 @@
<version>${assertj.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>${awaitility.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
Expand Down Expand Up @@ -914,9 +902,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<argLine>
-javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar"
</argLine>
<systemPropertyVariables>
<mockserver.version>${mockserver.version}</mockserver.version>
<pbs.version>${project.version}</pbs.version>
Expand Down Expand Up @@ -953,13 +938,6 @@
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>${aspectj.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
38 changes: 0 additions & 38 deletions src/main/java/org/prebid/server/health/HealthMonitor.java

This file was deleted.

This file was deleted.

5 changes: 0 additions & 5 deletions src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@ admin-endpoints:
path: /pbs-admin/tracelog
on-application-port: false
protected: true
e2eadmin:
enabled: false
path: /pbs-admin/e2eAdmin/*
on-application-port: false
protected: true
collected-metrics:
enabled: false
path: /collected-metrics
Expand Down
54 changes: 0 additions & 54 deletions src/test/java/org/prebid/server/health/HealthMonitorTest.java

This file was deleted.

3 changes: 0 additions & 3 deletions src/test/java/org/prebid/server/it/IntegrationTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ public abstract class IntegrationTest extends VertxTest {
private static final String HOST_AND_PORT = "localhost:" + WIREMOCK_PORT;
private static final String CACHE_PATH = "/cache";
private static final String CACHE_ENDPOINT = "http://" + HOST_AND_PORT + CACHE_PATH;
private static final String USER_SERVICE_PATH = "/user-data-details";
private static final String USER_SERVICE_ENDPOINT = "http://" + HOST_AND_PORT + USER_SERVICE_PATH;

@BeforeClass
public static void setUp() throws IOException {
Expand Down Expand Up @@ -252,7 +250,6 @@ private static String replaceStaticInfo(String json) {
.replaceAll("\\{\\{ cache.resource_url }}", CACHE_ENDPOINT + "?uuid=")
.replaceAll("\\{\\{ cache.host }}", HOST_AND_PORT)
.replaceAll("\\{\\{ cache.path }}", CACHE_PATH)
.replaceAll("\\{\\{ userservice_uri }}", USER_SERVICE_ENDPOINT)
.replaceAll("\\{\\{ event.url }}", "http://localhost:8080/event?");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,6 @@ admin-endpoints.logging-changelevel.enabled=true
admin-endpoints.logging-changelevel.protected=false
admin-endpoints.tracelog.enabled=true
admin-endpoints.tracelog.protected=false
admin-endpoints.e2eadmin.enabled=false
status-response=ok
analytics.log.enabled=true
gdpr.host-vendor-id=1
Expand Down
Loading