Skip to content

Schema registry docker build shaded #411

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.

Sign up for GitHub

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

Merged
jfallows merged 3 commits into from
Sep 14, 2023
Merged

Schema registry docker build shaded #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d27d940
Fix kafka binding jpms module dependencies via shade
jfallows Sep 14, 2023
9544b9a
Exclude ignored local zilla.yaml from license check
jfallows Sep 14, 2023
0a4b4c9
Skip copying dependencies that are no longer needed during docker ima…
jfallows Sep 14, 2023
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
3 changes: 1 addition & 2 deletions cloud/docker-image/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@
<exclude>src/main/docker/*/zpmw</exclude>
<exclude>src/main/docker/*/zilla</exclude>
<exclude>src/main/docker/*/zilla.properties</exclude>
<exclude>src/main/docker/*/zilla.yaml</exclude>
<exclude>src/main/docker/*/.zilla/**</exclude>
<exclude>src/main/docker/*/zpm.json.template</exclude>
<exclude>src/main/docker/*/zpm.json</exclude>
Expand Down Expand Up @@ -297,8 +298,6 @@
<include>com/fasterxml/jackson/**</include>
<include>org/yaml/snakeyaml/**</include>
<include>org/junit/**</include>
<include>org/apache/commons/**</include>
<include>org/apache/avro/**</include>
</includes>
</fileSet>
</fileSets>
Expand Down
2 changes: 1 addition & 1 deletion incubator/catalog-schema-registry/src/main/moditect/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
with io.aklivity.zilla.runtime.catalog.schema.registry.internal.SchemaRegistryCatalogFactorySpi;

provides io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi
with io.aklivity.zilla.runtime.catalog.schema.registry.internal.config.SchemaRegistryCatalogConfigAdapter;
with io.aklivity.zilla.runtime.catalog.schema.registry.internal.config.SchemaRegistryOptionsConfigAdapter;
}
8 changes: 8 additions & 0 deletions incubator/command-log/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>**/module-info.class</exclude>
</excludes>
</filter>
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
Expand Down
22 changes: 22 additions & 0 deletions manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,28 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>**/module-info.class</exclude>
<exclude>META-INF/plexus/**</exclude>
<exclude>META-INF/LICENSE</exclude>
<exclude>META-INF/LICENSE.md</exclude>
<exclude>META-INF/LICENSE.txt</exclude>
<exclude>META-INF/NOTICE</exclude>
<exclude>META-INF/NOTICE.md</exclude>
<exclude>META-INF/NOTICE.txt</exclude>
<exclude>META-INF/MANIFEST.MF</exclude>
</excludes>
</filter>
<filter>
<artifact>org.apache.ivy:ivy</artifact>
<excludes>
<exclude>org/apache/ivy/util/url/IvyAuthenticator.class</exclude>
</excludes>
</filter>
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>io.aklivity.zilla.manager.internal.ZpmMain</mainClass>
Expand Down
35 changes: 13 additions & 22 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,19 @@
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
Expand Down Expand Up @@ -425,28 +438,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>**/module-info.class</exclude>
</excludes>
</filter>
</filters>
</configuration>
<executions>
<execution>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.gatling</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand Down
27 changes: 27 additions & 0 deletions runtime/binding-kafka/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,33 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<includes>
<include>org.apache.avro:avro</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>org.apache.avro</pattern>
<shadedPattern>io.aklivity.zilla.runtime.binding.kafka.internal.validator.avro</shadedPattern>
</relocation>
</relocations>
<keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
<useDependencyReducedPomInJar>true</useDependencyReducedPomInJar>
<minimizeJar>true</minimizeJar>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.moditect</groupId>
<artifactId>moditect-maven-plugin</artifactId>
Expand Down
1 change: 0 additions & 1 deletion runtime/binding-kafka/src/main/moditect/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
module io.aklivity.zilla.runtime.binding.kafka
{
requires org.apache.avro;
requires io.aklivity.zilla.runtime.engine;

exports io.aklivity.zilla.runtime.binding.kafka.config;
Expand Down