This is an automated email from the ASF dual-hosted git repository.
tzimanyi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-apps.git
The following commit(s) were added to refs/heads/main by this push:
new 5c9341b24 [kie-issues#843] Make Java binaries reproducible (#1981)
5c9341b24 is described below
commit 5c9341b24e2098052328413b4d429757c1a60926
Author: Tibor Zimányi <[email protected]>
AuthorDate: Mon Feb 12 09:27:51 2024 +0100
[kie-issues#843] Make Java binaries reproducible (#1981)
---
.../kogito/index/jpa/mapper/JobEntityMapper.java | 2 +-
.../jpa/mapper/ProcessDefinitionEntityMapper.java | 2 +-
.../jpa/mapper/ProcessInstanceEntityMapper.java | 2 +-
.../jpa/mapper/UserTaskInstanceEntityMapper.java | 2 +-
kogito-apps-build-parent/pom.xml | 48 ++++++++++++++++++++++
5 files changed, 52 insertions(+), 4 deletions(-)
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/JobEntityMapper.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/JobEntityMapper.java
index 94aeae2d0..526f5f255 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/JobEntityMapper.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/JobEntityMapper.java
@@ -23,7 +23,7 @@ import org.kie.kogito.index.model.Job;
import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.Mapper;
-@Mapper(componentModel = "cdi")
+@Mapper(componentModel = "cdi", suppressTimestampInGenerated = true)
public interface JobEntityMapper {
JobEntity mapToEntity(Job job);
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessDefinitionEntityMapper.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessDefinitionEntityMapper.java
index 065dfbddc..1cf04b7ab 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessDefinitionEntityMapper.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessDefinitionEntityMapper.java
@@ -25,7 +25,7 @@ import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.Mapper;
import org.mapstruct.MappingTarget;
-@Mapper(componentModel = "cdi")
+@Mapper(componentModel = "cdi", suppressTimestampInGenerated = true)
public interface ProcessDefinitionEntityMapper {
ProcessDefinitionEntity mapToEntity(ProcessDefinition pd);
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessInstanceEntityMapper.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessInstanceEntityMapper.java
index ec4bd23b6..f241c4d85 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessInstanceEntityMapper.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessInstanceEntityMapper.java
@@ -27,7 +27,7 @@ import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.Mapper;
import org.mapstruct.MappingTarget;
-@Mapper(componentModel = "cdi")
+@Mapper(componentModel = "cdi", suppressTimestampInGenerated = true)
public interface ProcessInstanceEntityMapper {
MilestoneEntity mapMilestoneToEntity(Milestone mi);
diff --git
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/UserTaskInstanceEntityMapper.java
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/UserTaskInstanceEntityMapper.java
index b0006a1e1..364478e75 100644
---
a/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/UserTaskInstanceEntityMapper.java
+++
b/data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/UserTaskInstanceEntityMapper.java
@@ -25,7 +25,7 @@ import org.mapstruct.InheritInverseConfiguration;
import org.mapstruct.Mapper;
import org.mapstruct.MappingTarget;
-@Mapper(componentModel = "cdi")
+@Mapper(componentModel = "cdi", suppressTimestampInGenerated = true)
public interface UserTaskInstanceEntityMapper {
UserTaskInstanceEntity mapToEntity(UserTaskInstance ut);
diff --git a/kogito-apps-build-parent/pom.xml b/kogito-apps-build-parent/pom.xml
index 65d2d4f38..bdaa224b0 100644
--- a/kogito-apps-build-parent/pom.xml
+++ b/kogito-apps-build-parent/pom.xml
@@ -80,6 +80,7 @@
<!-- Mutiny Zero Flow Adapters -->
<version.io.smallrye.reactive.mutiny-zero>1.0.0</version.io.smallrye.reactive.mutiny-zero>
+ <version.drools.util>${project.version}</version.drools.util>
</properties>
<build>
@@ -135,6 +136,53 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- Remove comments from META-INF/quarkus-javadoc.properties
-->
+ <!-- This is needed because the file generated by quarkus
contains a timestamp in a comment that makes the build not reproducible -->
+ <!-- This workaround can be removed when drools will be
migrated to quarkus release containing this fix
https://github.com/quarkusio/quarkus/pull/38365 -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-util</artifactId>
+ <version>${version.drools.util}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>Remove comments from generated files</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+
<includeProjectDependencies>false</includeProjectDependencies>
+
<includePluginDependencies>true</includePluginDependencies>
+ <executableDependency>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-util</artifactId>
+ </executableDependency>
+
<mainClass>org.drools.util.RemoveCommentsMain</mainClass>
+ <arguments>
+ <argument>true</argument>
+
<argument>${project.basedir}/target/classes/META-INF/quarkus-javadoc.properties</argument>
+
<argument>${project.basedir}/target/classes/META-INF/quarkus-extension.properties</argument>
+
<argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/job/http/recipient/JobHttpRecipientRuntimeConfiguration.jdp</argument>
+
<argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/job/sink/recipient/JobSinkRecipientRuntimeConfiguration.jdp</argument>
+
<argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/addons/quarkus/jobs/service/embedded/KogitoAddonsQuarkusJobsServiceEmbeddedRuntimeConfig.jdp</argument>
+
<argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/index/addon/config/DataIndexBuildConfig.jdp</argument>
+
<argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/index/addon/config/DataIndexRuntimeConfig.jdp</argument>
+
<argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/index/addon/config/DataIndexUIClientRuntimeConfig.jdp</argument>
+
<argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/DevConsoleRuntimeConfig.jdp</argument>
+
<argument>${project.basedir}/target/generated-sources/annotations/org/kie/kogito/runtime/tools/quarkus/extension/runtime/config/UserConfig.jdp</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<dependencyManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
