Reverted POM changes

Moved version information utils and removed build-timestamp (will break reproducable builds)
hypfvieh · Aug 25, 2024 · 366f70e · 366f70e
1 parent 6681bbd
commit 366f70e
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 21 deletions.
diff --git a/dbus-java-core/pom.xml b/dbus-java-core/pom.xml
@@ -19,6 +19,7 @@
     </parent>
 
     <properties>
+        <parentDir>${project.parent.basedir}</parentDir>
         <project.build.outputTimestamp>2024-08-01T04:58:15Z</project.build.outputTimestamp>
         <dateFormatTimeZone>UTC</dateFormatTimeZone>
     </properties>

diff --git a/dbus-java-examples/pom.xml b/dbus-java-examples/pom.xml
@@ -19,13 +19,14 @@
     </parent>
 
     <properties>
+        <parentDir>${project.parent.basedir}</parentDir>
         <project.build.outputTimestamp>2024-08-01T04:58:15Z</project.build.outputTimestamp>
         <dateFormatTimeZone>UTC</dateFormatTimeZone>
     </properties>
 
     <build>
         <plugins>
-           <!-- exclude this module from release/snapshots, it is only for showing sample code -->
+            <!-- exclude this module from release/snapshots, it is only for showing sample code -->
            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>

diff --git a/dbus-java-tests/pom.xml b/dbus-java-tests/pom.xml
@@ -19,17 +19,18 @@
     </parent>
 
     <properties>
+        <parentDir>${project.parent.basedir}</parentDir>
         <project.build.outputTimestamp>2024-08-01T04:58:15Z</project.build.outputTimestamp>
         <dateFormatTimeZone>UTC</dateFormatTimeZone>
     </properties>
 
     <build>
         <plugins>
             <plugin>
-				<!--
-					For debugging with maven:
-					mvn clean test-compile surefire:test@native-tests -Dtest=TestAll -Dmaven.surefire.debug 
-				-->
+                <!--
+                    For debugging with maven:
+                    mvn clean test-compile surefire:test@native-tests -Dtest=TestAll -Dmaven.surefire.debug 
+                -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <executions>

diff --git a/dbus-java-transport-jnr-unixsocket/pom.xml b/dbus-java-transport-jnr-unixsocket/pom.xml
@@ -19,6 +19,7 @@
     </parent>
 
     <properties>
+        <parentDir>${project.parent.basedir}</parentDir>
         <project.build.outputTimestamp>2024-08-01T04:58:15Z</project.build.outputTimestamp>
         <dateFormatTimeZone>UTC</dateFormatTimeZone>
     </properties>

diff --git a/dbus-java-transport-junixsocket/pom.xml b/dbus-java-transport-junixsocket/pom.xml
@@ -19,6 +19,7 @@
     </parent>
 
     <properties>
+        <parentDir>${project.parent.basedir}</parentDir>
         <project.build.outputTimestamp>2024-08-01T04:58:15Z</project.build.outputTimestamp>
         <dateFormatTimeZone>UTC</dateFormatTimeZone>
     </properties>

diff --git a/dbus-java-transport-tcp/pom.xml b/dbus-java-transport-tcp/pom.xml
@@ -19,6 +19,7 @@
     </parent>
 
     <properties>
+        <parentDir>${project.parent.basedir}</parentDir>
         <project.build.outputTimestamp>2024-08-01T04:58:15Z</project.build.outputTimestamp>
         <dateFormatTimeZone>UTC</dateFormatTimeZone>
     </properties>

diff --git a/dbus-java-utils/pom.xml b/dbus-java-utils/pom.xml
@@ -19,11 +19,22 @@
     </parent>
 
     <properties>
+        <parentDir>${project.parent.basedir}</parentDir>
         <project.build.outputTimestamp>2024-08-01T04:58:15Z</project.build.outputTimestamp>
         <dateFormatTimeZone>UTC</dateFormatTimeZone>
     </properties>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources/</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>**/dbus-java.version</include>
+                </includes>
+            </resource>
+        </resources>
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/src/main/resources/dbus-java.version → ...tils/src/main/resources/dbus-java.version b/src/main/resources/dbus-java.version → ...tils/src/main/resources/dbus-java.version
@@ -1,5 +1,4 @@
 version=${project.version}
 revision=${git.commit.id.abbrev}
-built=${buildTimestamp}
 user=${git.build.user.name}
 jdk=${java.vm.version}
diff --git a/pom.xml b/pom.xml
@@ -60,8 +60,6 @@
         <parentDir>${maven.multiModuleProjectDirectory}</parentDir>
         <project.build.outputTimestamp>2024-08-01T04:58:15Z</project.build.outputTimestamp>
         <dateFormatTimeZone>UTC</dateFormatTimeZone>
-        <buildTimestamp>${maven.build.timestamp}</buildTimestamp>
-   		<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss.SSS</maven.build.timestamp.format>
     </properties>
 
     <modules>
@@ -78,16 +76,6 @@
     </modules>
 
     <build>
-        <resources>
-	        <resource>
-	            <directory>${parentDir}/src/main/resources/</directory>
-	            <filtering>true</filtering>
-	            <includes>
-	                <include>**/dbus-java.version</include>
-	            </includes>
-	        </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -208,9 +196,9 @@
                                 <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                             </manifest>
                             <manifestEntries>
-								<Build-Time>${git.commit.time}</Build-Time>
-								<Git-Revision>${git.commit.id.abbrev}</Git-Revision>
-								<Git-Author>${git.commit.user.name} &lt;${git.commit.user.email}&gt;</Git-Author>
+                                <Build-Time>${git.commit.time}</Build-Time>
+                                <Git-Revision>${git.commit.id.abbrev}</Git-Revision>
+                                <Git-Author>${git.commit.user.name} &lt;${git.commit.user.email}&gt;</Git-Author>
                             </manifestEntries>
                         </archive>
                     </configuration>