Build Improvements (Apicurio#5126)

* Update pom.xml * chore: centralize protoc artifact configuration used by protobuf-maven-plugin * chore: exclude lombok from libs --------- Co-authored-by: Nikisha Patil <[email protected]>
jsenko · Sep 5, 2024 · ee48313 · ee48313
1 parent d5f796d
commit ee48313
Showing 14 changed files with 31 additions and 24 deletions.
diff --git a/app/pom.xml b/app/pom.xml
@@ -468,9 +468,7 @@
                         </goals>
                         <configuration>
                             <protoSourceRoot>./src/test/resources/schema</protoSourceRoot>
-                            <protocArtifact>
-                                com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
-                            </protocArtifact>
+                            <protocArtifact>${protoc-artifact-common}</protocArtifact>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/app/src/main/assembly/assembly.xml b/app/src/main/assembly/assembly.xml
@@ -18,6 +18,9 @@
         <include>meta</include>
         <include>meta/*</include>
       </includes>
+      <excludes>
+        <exclude>lib/org.projectlombok.lombok-*.jar</exclude>
+      </excludes>
     </fileSet>
   </fileSets>
 </assembly>
diff --git a/examples/protobuf-bean/pom.xml b/examples/protobuf-bean/pom.xml
@@ -63,9 +63,7 @@
                             <goal>compile</goal>
                         </goals>
                         <configuration>
-                            <protocArtifact>
-                                com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
-                            </protocArtifact>
+                            <protocArtifact>${protoc-artifact-common}</protocArtifact>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/examples/protobuf-find-latest/pom.xml b/examples/protobuf-find-latest/pom.xml
@@ -63,9 +63,7 @@
                             <goal>compile</goal>
                         </goals>
                         <configuration>
-                            <protocArtifact>
-                                com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
-                            </protocArtifact>
+                            <protocArtifact>${protoc-artifact-common}</protocArtifact>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/examples/protobuf-validation/pom.xml b/examples/protobuf-validation/pom.xml
@@ -50,9 +50,7 @@
                             <goal>compile</goal>
                         </goals>
                         <configuration>
-                            <protocArtifact>
-                                com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
-                            </protocArtifact>
+                            <protocArtifact>${protoc-artifact-common}</protocArtifact>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/examples/serdes-with-references/pom.xml b/examples/serdes-with-references/pom.xml
@@ -106,9 +106,7 @@
                         </goals>
                         <configuration>
                             <protoSourceRoot>./src/main/resources/schema</protoSourceRoot>
-                            <protocArtifact>
-                                com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
-                            </protocArtifact>
+                            <protocArtifact>${protoc-artifact-common}</protocArtifact>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/examples/simple-protobuf/pom.xml b/examples/simple-protobuf/pom.xml
@@ -63,9 +63,7 @@
                             <goal>compile</goal>
                         </goals>
                         <configuration>
-                            <protocArtifact>
-                                com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
-                            </protocArtifact>
+                            <protocArtifact>${protoc-artifact-common}</protocArtifact>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/pom.xml b/pom.xml
@@ -258,6 +258,8 @@
         <embedded-postgres.version>2.0.7</embedded-postgres.version>
         <strimzi.version>0.105.0</strimzi.version>
         <wiremock.version>3.7.0</wiremock.version>
+
+        <protoc-artifact-common>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protoc-artifact-common>
     </properties>
 
     <dependencyManagement>
@@ -618,6 +620,12 @@
                 <groupId>com.google.protobuf</groupId>
                 <artifactId>protobuf-java-util</artifactId>
                 <version>${protobuf.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.protobuf</groupId>
+                        <artifactId>protoc</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>com.google.api.grpc</groupId>

diff --git a/serdes/protobuf-serde/pom.xml b/serdes/protobuf-serde/pom.xml
@@ -66,9 +66,7 @@
                             <goal>compile</goal>
                         </goals>
                         <configuration>
-                            <protocArtifact>
-                                com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
-                            </protocArtifact>
+                            <protocArtifact>${protoc-artifact-common}</protocArtifact>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/storage/kafkasql/src/main/assembly/assembly.xml b/storage/kafkasql/src/main/assembly/assembly.xml
@@ -18,6 +18,9 @@
         <include>meta</include>
         <include>meta/*</include>
       </includes>
+      <excludes>
+        <exclude>lib/org.projectlombok.lombok-*.jar</exclude>
+      </excludes>
     </fileSet>
   </fileSets>
 </assembly>
diff --git a/storage/mssql/src/main/assembly/assembly.xml b/storage/mssql/src/main/assembly/assembly.xml
@@ -16,6 +16,9 @@
         <include>lib</include>
         <include>lib/*</include>
       </includes>
+      <excludes>
+        <exclude>lib/org.projectlombok.lombok-*.jar</exclude>
+      </excludes>
     </fileSet>
   </fileSets>
 </assembly>
diff --git a/storage/mysql/src/main/assembly/assembly.xml b/storage/mysql/src/main/assembly/assembly.xml
@@ -16,6 +16,9 @@
         <include>lib</include>
         <include>lib/*</include>
       </includes>
+      <excludes>
+        <exclude>lib/org.projectlombok.lombok-*.jar</exclude>
+      </excludes>
     </fileSet>
   </fileSets>
 </assembly>
diff --git a/storage/sql/src/main/assembly/assembly.xml b/storage/sql/src/main/assembly/assembly.xml
@@ -18,6 +18,9 @@
         <include>meta</include>
         <include>meta/*</include>
       </includes>
+      <excludes>
+        <exclude>lib/org.projectlombok.lombok-*.jar</exclude>
+      </excludes>
     </fileSet>
   </fileSets>
 </assembly>
diff --git a/utils/protobuf-schema-utilities/pom.xml b/utils/protobuf-schema-utilities/pom.xml
@@ -135,9 +135,7 @@
                             <goal>test-compile</goal>
                         </goals>
                         <configuration>
-                            <protocArtifact>
-                                com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
-                            </protocArtifact>
+                            <protocArtifact>${protoc-artifact-common}</protocArtifact>
                         </configuration>
                     </execution>
                 </executions>