Skip to content

Commit

Permalink
Move common components to registry repo (#5530)
Browse files Browse the repository at this point in the history
* Move common components to registry repo

* Remove auth component

* Remove util component

* Remove web component

* Remove test component

* Move config properties to app

* Remove remaining components from common components

* Add dynamic config source

* Adapt register for reflection

* Use maven plugin from the github repository
  • Loading branch information
carlesarnal authored Nov 20, 2024
1 parent e6ec574 commit cac4810
Show file tree
Hide file tree
Showing 86 changed files with 2,871 additions and 142 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
run: mvn -N io.takari:maven:wrapper -Dmaven=3.8.2

- name: Build Application
run: ./mvnw clean package -pl app,distro/docker -am --no-transfer-progress -Pprod -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.wagon.httpconnectionManager.maxTotal=30 -Dmaven.wagon.http.retryHandler.count=5
run: ./mvnw clean package -am --no-transfer-progress -Pprod -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.wagon.httpconnectionManager.maxTotal=30 -Dmaven.wagon.http.retryHandler.count=5

- name: Build and Push Application image
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
- name: Build Registry
run: |
cd registry
./mvnw clean package -pl app,distro/docker -am --no-transfer-progress -Pprod -DskipTests=true -DskipCommitIdPlugin=false -Dmaven.wagon.httpconnectionManager.maxTotal=30 -Dmaven.wagon.http.retryHandler.count=5 -Dspotless.check.skip=true
./mvnw clean package -am --no-transfer-progress -Pprod -DskipTests=true -DskipCommitIdPlugin=false -Dmaven.wagon.httpconnectionManager.maxTotal=30 -Dmaven.wagon.http.retryHandler.count=5 -Dspotless.check.skip=true
- name: Build Registry UI
working-directory: registry/ui
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ jobs:
( cd /tmp/coreutils-workaround && mvn dependency:get -DremoteRepositories=https://repo1.maven.org/maven2 -Dartifact=com.github.java-json-tools:jackson-coreutils:2.0 )
- name: Build Application
run: ./mvnw clean package -pl app,distro/docker -am -Pprod -DskipTests=true -DskipCommitIdPlugin=false -Dmaven.wagon.httpconnectionManager.maxTotal=30 -Dmaven.wagon.http.retryHandler.count=5 --no-transfer-progress
run: ./mvnw clean package -am -Pprod -DskipTests=true -DskipCommitIdPlugin=false -Dmaven.wagon.httpconnectionManager.maxTotal=30 -Dmaven.wagon.http.retryHandler.count=5 --no-transfer-progress

- name: Build Native executables
env:
Expand Down Expand Up @@ -330,7 +330,7 @@ jobs:
run: make lint-check

- name: Build Registry
run: mvn clean package -pl app -am -Dskip.npm -DskipTests=true --no-transfer-progress
run: mvn clean package -am -Dskip.npm -DskipTests=true --no-transfer-progress

- name: Run the tests
working-directory: python-sdk
Expand All @@ -357,7 +357,7 @@ jobs:
go-version: '1.20'

- name: Build Registry
run: mvn clean package -pl app -am -Dskip.npm -DskipTests=true --no-transfer-progress
run: mvn clean package -am -Dskip.npm -DskipTests=true --no-transfer-progress

- name: Run the tests
working-directory: go-sdk
Expand Down
31 changes: 12 additions & 19 deletions app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,31 +34,16 @@
<artifactId>apicurio-registry-schema-util-provider</artifactId>
</dependency>

<!-- Common App Components -->
<dependency>
<groupId>io.apicurio</groupId>
<artifactId>apicurio-common-app-components-core</artifactId>
<artifactId>apicurio-registry-config-definitions</artifactId>
</dependency>

<dependency>
<groupId>io.apicurio</groupId>
<artifactId>apicurio-common-app-components-logging</artifactId>
<artifactId>apicurio-registry-config-index</artifactId>
</dependency>

<dependency>
<groupId>io.apicurio</groupId>
<artifactId>apicurio-common-app-components-config</artifactId>
</dependency>

<dependency>
<groupId>io.apicurio</groupId>
<artifactId>apicurio-common-app-components-config-index</artifactId>
</dependency>

<dependency>
<groupId>io.apicurio</groupId>
<artifactId>apicurio-common-app-components-auth</artifactId>
</dependency>
<dependency>
<groupId>io.apicurio</groupId>
<artifactId>apicurio-common-rest-client-jdk</artifactId>
Expand Down Expand Up @@ -209,6 +194,15 @@
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${commons-beanutils.version}</version>
</dependency>

<!-- Test Only -->
<dependency>
Expand Down Expand Up @@ -408,8 +402,7 @@
</plugin>
<plugin>
<groupId>io.apicurio</groupId>
<artifactId>apicurio-common-app-components-maven-plugin</artifactId>
<version>${apicurio-common-app-components.version}</version>
<artifactId>apicurio-registry-maven-plugin</artifactId>
<executions>
<execution>
<id>merge-test-properties</id>
Expand Down
Loading

0 comments on commit cac4810

Please sign in to comment.