Skip to content

Commit b666338

Browse files
committed
Fix build process
1 parent 1e1aade commit b666338

File tree

4 files changed

+29
-14
lines changed

4 files changed

+29
-14
lines changed

app/src/main/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ quarkus.datasource.jdbc.enable-metrics=true
5050

5151
# Native
5252
quarkus.native.resources.includes=io/apicurio/registry/storage/impl/sql/h2.ddl,i18n/*.properties,io/apicurio/registry/storage/impl/sql/postgresql.ddl
53-
quarkus.native.additional-build-args=--initialize-at-run-time=org.apache.kafka.common.security.authenticator.SaslClientAuthenticator\\,org.eclipse.jgit\\,org.h2\\,org.postgres\\,com.microsoft.sqlserver\\,\
53+
quarkus.native.additional-build-args=--initialize-at-run-time=org.apache.kafka.common.security.authenticator.SaslClientAuthenticator\\,org.eclipse.jgit\\,org.h2\\,org.postgres\\,com.microsoft.sqlserver\\,io.api.sample\\,\
5454
--allow-incomplete-classpath
5555

5656
# Package

integration-tests/pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
<groupId>io.apicurio</groupId>
6868
<artifactId>apicurio-registry-utils-tests</artifactId>
6969
</dependency>
70+
<dependency>
71+
<groupId>io.apicurio</groupId>
72+
<artifactId>apicurio-registry-old-protobuf-serializer</artifactId>
73+
</dependency>
7074
<dependency>
7175
<groupId>io.apicurio</groupId>
7276
<artifactId>apicurio-registry-maven-plugin</artifactId>
@@ -88,11 +92,6 @@
8892
<artifactId>apicurio-registry-protobuf-serde-kafka</artifactId>
8993
<scope>test</scope>
9094
</dependency>
91-
<dependency>
92-
<groupId>io.apicurio</groupId>
93-
<artifactId>apicurio-registry-old-protobuf-serializer</artifactId>
94-
<scope>test</scope>
95-
</dependency>
9695
<dependency>
9796
<groupId>io.apicurio</groupId>
9897
<artifactId>apicurio-registry-avro-serde-pulsar</artifactId>

integration-tests/protobuf-backward-compat/old-serializer/pom.xml

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,26 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<parent>
5-
<groupId>io.apicurio</groupId>
6-
<artifactId>apicurio-registry</artifactId>
7-
<version>3.1.4-SNAPSHOT</version>
8-
<relativePath>../../../pom.xml</relativePath>
9-
</parent>
104

5+
<!--
6+
This module is intentionally standalone (no parent) to avoid parent POM
7+
resolution issues in CI where the integration-tests profile activates
8+
additional modules. All required properties are defined locally.
9+
-->
10+
<groupId>io.apicurio</groupId>
1111
<artifactId>apicurio-registry-old-protobuf-serializer</artifactId>
12+
<version>3.1.5-SNAPSHOT</version>
1213
<packaging>jar</packaging>
1314
<name>apicurio-registry-old-protobuf-serializer</name>
1415
<description>Shaded old protobuf serializer (v3.1.2) for backward compatibility testing</description>
1516

1617
<properties>
17-
<projectRoot>${project.basedir}/../../..</projectRoot>
18+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19+
<maven.compiler.source>17</maven.compiler.source>
20+
<maven.compiler.target>17</maven.compiler.target>
21+
<maven.compiler.release>17</maven.compiler.release>
1822
<old.registry.version>3.1.2</old.registry.version>
23+
<kafka-clients.version>3.9.1</kafka-clients.version>
1924
</properties>
2025

2126
<dependencyManagement>
@@ -95,11 +100,22 @@
95100
<dependency>
96101
<groupId>org.apache.kafka</groupId>
97102
<artifactId>kafka-clients</artifactId>
103+
<version>${kafka-clients.version}</version>
98104
</dependency>
99105
</dependencies>
100106

101107
<build>
102108
<plugins>
109+
<plugin>
110+
<groupId>org.apache.maven.plugins</groupId>
111+
<artifactId>maven-compiler-plugin</artifactId>
112+
<version>3.13.0</version>
113+
<configuration>
114+
<source>${maven.compiler.source}</source>
115+
<target>${maven.compiler.target}</target>
116+
<release>${maven.compiler.release}</release>
117+
</configuration>
118+
</plugin>
103119
<plugin>
104120
<groupId>org.apache.maven.plugins</groupId>
105121
<artifactId>maven-shade-plugin</artifactId>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1191,8 +1191,8 @@
11911191
<profile>
11921192
<id>integration-tests</id>
11931193
<modules>
1194-
<module>integration-tests</module>
11951194
<module>integration-tests/protobuf-backward-compat/old-serializer</module>
1195+
<module>integration-tests</module>
11961196
</modules>
11971197
</profile>
11981198
<profile>

0 commit comments

Comments
 (0)