Skip to content

Commit 3b577a8

Browse files
committed
Merge remote-tracking branch 'upstream/main' into standardize-configuration-properties
2 parents ef64a41 + 5658a15 commit 3b577a8

File tree

176 files changed

+11690
-1528
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+11690
-1528
lines changed

.github/workflows/integration-tests.yaml

+23
Original file line numberDiff line numberDiff line change
@@ -355,3 +355,26 @@ jobs:
355355
with:
356356
name: tests-logs-legacy-v2
357357
path: artifacts
358+
359+
build-examples:
360+
name: Build and Run Application examples
361+
runs-on: ubuntu-20.04
362+
needs: prepare-integration-tests
363+
steps:
364+
- name: Checkout Code with Ref '${{ github.ref }}'
365+
uses: actions/checkout@v2
366+
with:
367+
path: apicurio-registry
368+
369+
- name: Set up JDK 17
370+
uses: actions/setup-java@v3
371+
with:
372+
java-version: '17'
373+
distribution: 'temurin'
374+
cache: 'maven'
375+
376+
- name: Run Apicurio Registry application
377+
run: docker run -d -p 8080:8080 -it ttl.sh/${{ github.sha }}/apicurio/apicurio-registry:1d
378+
379+
- name: Build Apicurio Registry with Examples
380+
run: cd apicurio-registry && mvn clean install -DskipTests -Pexamples

.github/workflows/tag-registry-examples.yaml

-116
This file was deleted.

app/pom.xml

+6-2
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@
9393
<groupId>io.quarkus</groupId>
9494
<artifactId>quarkus-resteasy-jackson</artifactId>
9595
</dependency>
96+
<dependency>
97+
<groupId>io.quarkus</groupId>
98+
<artifactId>quarkus-smallrye-jwt</artifactId>
99+
</dependency>
96100
<dependency>
97101
<groupId>io.quarkus</groupId>
98102
<artifactId>quarkus-smallrye-health</artifactId>
@@ -123,11 +127,11 @@
123127
</dependency>
124128
<dependency>
125129
<groupId>io.quarkus</groupId>
126-
<artifactId>quarkus-rest-client</artifactId>
130+
<artifactId>quarkus-resteasy-client</artifactId>
127131
</dependency>
128132
<dependency>
129133
<groupId>io.quarkus</groupId>
130-
<artifactId>quarkus-rest-client-jackson</artifactId>
134+
<artifactId>quarkus-resteasy-client-jackson</artifactId>
131135
</dependency>
132136
<dependency>
133137
<groupId>io.quarkus</groupId>

app/src/main/java/io/apicurio/registry/ccompat/rest/v7/impl/ConfigResourceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private <X extends Exception> void updateCompatibilityLevel(CompatibilityLevelDt
5959
}
6060

6161
@Override
62-
@Authorized(style = AuthorizedStyle.None, level = AuthorizedLevel.Admin)
62+
@Authorized(style = AuthorizedStyle.None, level = AuthorizedLevel.Read)
6363
public CompatibilityLevelParamDto getGlobalCompatibilityLevel() {
6464
return getCompatibilityLevel(() -> storage.getGlobalRule(RuleType.COMPATIBILITY).getConfiguration());
6565
}

app/src/main/java/io/apicurio/registry/rest/v2/AdminResourceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public class AdminResourceImpl implements AdminResource {
8686
HttpServletRequest request;
8787

8888
@Dynamic(label = "Download link expiry", description = "The number of seconds that a generated link to a .zip download file is active before expiring.")
89-
@ConfigProperty(name = "registry.download.href.ttl", defaultValue = "30")
89+
@ConfigProperty(name = "apicurio.download.href.ttl", defaultValue = "30")
9090
@Info(category = "download", description = "Download link expiry", availableSince = "2.1.2.Final")
9191
Supplier<Long> downloadHrefTtl;
9292

app/src/main/java/io/apicurio/registry/rest/v3/AdminResourceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public class AdminResourceImpl implements AdminResource {
105105
HttpServletRequest request;
106106

107107
@Dynamic(label = "Download link expiry", description = "The number of seconds that a generated link to a .zip download file is active before expiring.")
108-
@ConfigProperty(name = "registry.download.href.ttl", defaultValue = "30")
108+
@ConfigProperty(name = "apicurio.download.href.ttl", defaultValue = "30")
109109
@Info(category = "download", description = "Download link expiry", availableSince = "2.1.2.Final")
110110
Supplier<Long> downloadHrefTtl;
111111

0 commit comments

Comments
 (0)