diff options
-rw-r--r-- | org.eclipse.jgit.ant/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.archive/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.gpg.bc/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.http.apache/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.http.server/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.junit.http/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.junit.ssh/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.junit/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.lfs.server/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.lfs/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.packaging/pom.xml | 71 | ||||
-rw-r--r-- | org.eclipse.jgit.pgm/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.ssh.apache/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.ssh.jsch/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.ui/pom.xml | 2 | ||||
-rw-r--r-- | org.eclipse.jgit/pom.xml | 2 | ||||
-rw-r--r-- | pom.xml | 128 |
18 files changed, 211 insertions, 20 deletions
diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 59e7ca6106..b6250c6165 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -69,7 +69,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> + <replacefilter token=".qualifier" value=".${commit.time.version}"/> </replace> </target> </configuration> diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 9a9734f034..dbfd6eebdb 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -77,7 +77,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> + <replacefilter token=".qualifier" value=".${commit.time.version}"/> </replace> </target> </configuration> diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index c81be61c6c..41a3d1ffe6 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -93,7 +93,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true" /> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}" /> + <replacefilter token=".qualifier" value=".${commit.time.version}" /> </replace> </target> </configuration> diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index a1c942ce42..5e67eda461 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -74,7 +74,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> + <replacefilter token=".qualifier" value=".${commit.time.version}"/> </replace> </target> </configuration> diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index b54836cf55..d35ea7f53e 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -76,7 +76,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> + <replacefilter token=".qualifier" value=".${commit.time.version}"/> </replace> </target> </configuration> diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 048dc13488..46c88bb007 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -87,7 +87,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> + <replacefilter token=".qualifier" value=".${commit.time.version}"/> </replace> </target> </configuration> diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 2409ea1bab..0b26edf742 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -101,7 +101,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> + <replacefilter token=".qualifier" value=".${commit.time.version}"/> </replace> </target> </configuration> diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 3bce4808d1..091db6b3da 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -72,7 +72,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> + <replacefilter token=".qualifier" value=".${commit.time.version}"/> </replace> </target> </configuration> diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index fcb91be646..8e8aedffd9 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -91,7 +91,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> + <replacefilter token=".qualifier" value=".${commit.time.version}"/> </replace> </target> </configuration> diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 888076634d..6cddb81bc5 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -71,7 +71,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> + <replacefilter token=".qualifier" value=".${commit.time.version}"/> </replace> </target> </configuration> diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index ba73e9204f..715491d472 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -32,6 +32,7 @@ <java.version>11</java.version> <tycho-version>4.0.2</tycho-version> <target-platform>jgit-4.17</target-platform> + <project.build.outputTimestamp>${git.commit.time}</project.build.outputTimestamp> </properties> <pluginRepositories> @@ -223,7 +224,6 @@ <outputFormat>json</outputFormat> <outputName>cyclonedx</outputName> <outputDirectory>${project.build.directory}</outputDirectory> - <outputTimestamp>${project.build.outputTimestamp}</outputTimestamp> <verbose>false</verbose> </configuration> <executions> @@ -235,6 +235,26 @@ </execution> </executions> </plugin> + <plugin> + <groupId>io.github.git-commit-id</groupId> + <artifactId>git-commit-id-maven-plugin</artifactId> + <version>6.0.0</version> + <executions> + <execution> + <id>get-the-git-infos</id> + <goals> + <goal>revision</goal> + </goals> + <phase>initialize</phase> + </execution> + </executions> + <configuration> + <generateGitPropertiesFile>false</generateGitPropertiesFile> + <injectAllReactorProjects>true</injectAllReactorProjects> + <dateFormat>yyyy-MM-dd'T'HH:mm:ss'Z'</dateFormat> + <dateFormatTimeZone>UTC</dateFormatTimeZone> + </configuration> + </plugin> </plugins> <pluginManagement> <plugins> @@ -256,6 +276,30 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>3.3.0</version> + <configuration> + <archive> + <manifestEntries> + <Implementation-Title>JGit ${project.artifactId}</Implementation-Title> + <Implementation-Version>${project.version}</Implementation-Version> + <Implementation-Vendor>Eclipse.org - JGit</Implementation-Vendor> + <Implementation-Vendor-Id>org.eclipse.jgit</Implementation-Vendor-Id> + <Implementation-Vendor-URL>${jgit-url}</Implementation-Vendor-URL> + <git-describe>${git.commit.id.describe}</git-describe> + <git-commit-id>${git.commit.id}</git-commit-id> + <git-commit-time>${git.commit.time}</git-commit-time> + <git-tags>${git.tags}</git-tags> + <git-remote-origin-url>${git.remote.origin.url}</git-remote-origin-url> + </manifestEntries> + </archive> + <!-- TODO: uncomment this in order to skip empty artifact of test modules as soon as bug 416299 is fixed + <skipIfEmpty>true</skipIfEmpty> + --> + </configuration> + </plugin> + <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> <version>${tycho-version}</version> @@ -318,6 +362,22 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-packaging-plugin</artifactId> <version>${tycho-version}</version> + <dependencies> + <dependency> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-buildtimestamp-jgit</artifactId> + <version>${tycho-version}</version> + </dependency> + </dependencies> + <configuration> + <timestampProvider>jgit</timestampProvider> + <jgit.ignore> + pom.xml + .polyglot.build.properties + target/ + </jgit.ignore> + <format>yyyyMMddHHmm</format> + </configuration> </plugin> <plugin> <groupId>org.eclipse.tycho</groupId> @@ -353,6 +413,15 @@ <artifactId>maven-site-plugin</artifactId> <version>3.12.1</version> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-artifact-plugin</artifactId> + <version>3.5.0</version> + <configuration> + <ignore>**/*cyclonedx.json</ignore> + <reproducible>true</reproducible> + </configuration> + </plugin> </plugins> </pluginManagement> </build> diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index de0548d5c8..776207f866 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -205,7 +205,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> + <replacefilter token=".qualifier" value=".${commit.time.version}"/> </replace> </target> </configuration> diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 5e47633099..ebf23743d6 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -89,7 +89,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true" /> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}" /> + <replacefilter token=".qualifier" value=".${commit.time.version}" /> </replace> </target> </configuration> diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index f0ea60d5e4..4dafa75c62 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -102,7 +102,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true" /> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}" /> + <replacefilter token=".qualifier" value=".${commit.time.version}" /> </replace> </target> </configuration> diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 7237099e9f..a794f627d4 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -83,7 +83,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true" /> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}" /> + <replacefilter token=".qualifier" value=".${commit.time.version}" /> </replace> </target> </configuration> diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 5dd17c6e65..ca19f2bec9 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -70,7 +70,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> + <replacefilter token=".qualifier" value=".${commit.time.version}"/> </replace> </target> </configuration> diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 28ba126414..32638d70fd 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -83,7 +83,7 @@ <target> <copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/> <replace file="${source-bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> + <replacefilter token=".qualifier" value=".${commit.time.version}"/> </replace> </target> </configuration> @@ -113,10 +113,11 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format> <java.version>11</java.version> <bundle-manifest>${project.build.directory}/META-INF/MANIFEST.MF</bundle-manifest> + <project.build.outputTimestamp>${commit.time.iso}</project.build.outputTimestamp> + <jgit-last-release-version>6.7.0.202309050840-r</jgit-last-release-version> <ant-version>1.10.14</ant-version> <apache-sshd-version>2.10.0</apache-sshd-version> @@ -191,6 +192,11 @@ <Implementation-Vendor>Eclipse.org - JGit</Implementation-Vendor> <Implementation-Vendor-Id>org.eclipse.jgit</Implementation-Vendor-Id> <Implementation-Vendor-URL>${jgit-url}</Implementation-Vendor-URL> + <git-describe>${git.commit.id.describe}</git-describe> + <git-commit-id>${git.commit.id}</git-commit-id> + <git-commit-time>${git.commit.time}</git-commit-time> + <git-tags>${git.tags}</git-tags> + <git-remote-origin-url>${git.remote.origin.url}</git-remote-origin-url> </manifestEntries> </archive> <!-- TODO: uncomment this in order to skip empty artifact of test modules as soon as bug 416299 is fixed @@ -358,6 +364,20 @@ <artifactId>license-tool-plugin</artifactId> <version>1.0.2</version> </plugin> + <plugin> + <groupId>org.cyclonedx</groupId> + <artifactId>cyclonedx-maven-plugin</artifactId> + <version>2.7.9</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-artifact-plugin</artifactId> + <version>3.5.0</version> + <configuration> + <ignore>**/*cyclonedx.json</ignore> + <reproducible>true</reproducible> + </configuration> + </plugin> </plugins> </pluginManagement> @@ -398,7 +418,7 @@ <target if="${translate-qualifier}"> <copy file="META-INF/MANIFEST.MF" tofile="${bundle-manifest}" overwrite="true"/> <replace file="${bundle-manifest}"> - <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/> + <replacefilter token=".qualifier" value=".${commit.time.version}"/> </replace> </target> </configuration> @@ -570,7 +590,6 @@ <plugin> <groupId>org.cyclonedx</groupId> <artifactId>cyclonedx-maven-plugin</artifactId> - <version>2.7.9</version> <configuration> <projectType>library</projectType> <schemaVersion>1.4</schemaVersion> @@ -586,6 +605,7 @@ <outputName>cyclonedx</outputName> <outputDirectory>${project.build.directory}</outputDirectory> <verbose>false</verbose> + <detectUnusedForOptionalScope>true</detectUnusedForOptionalScope> </configuration> <executions> <execution> @@ -596,6 +616,108 @@ </execution> </executions> </plugin> + <plugin> + <groupId>io.github.git-commit-id</groupId> + <artifactId>git-commit-id-maven-plugin</artifactId> + <version>6.0.0</version> + <executions> + <execution> + <id>get-the-git-infos</id> + <goals> + <goal>revision</goal> + </goals> + <phase>initialize</phase> + </execution> + </executions> + <configuration> + <generateGitPropertiesFile>false</generateGitPropertiesFile> + <injectAllReactorProjects>true</injectAllReactorProjects> + <dateFormatTimeZone>UTC</dateFormatTimeZone> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> + <version>3.0.2</version> + <dependencies> + <dependency> + <groupId>org.apache.groovy</groupId> + <artifactId>groovy</artifactId> + <version>4.0.15</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.groovy</groupId> + <artifactId>groovy-ant</artifactId> + <version>4.0.15</version> + <scope>runtime</scope> + </dependency> + </dependencies> + <executions> + <execution> + <id>add-dynamic-properties</id> + <phase>initialize</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <bindAllProjectProperties>true</bindAllProjectProperties> + <bindAllSessionUserProperties>true</bindAllSessionUserProperties> + <scripts> + <script><![CDATA[ + @Grapes([ + @Grab(group='org.eclipse.jgit', module='org.eclipse.jgit', version='6.7.0.202309050840-r') + ]) + import java.time.Instant + import java.time.ZoneId + import java.time.format.DateTimeFormatter + import org.eclipse.jgit.lib.Constants + import org.eclipse.jgit.lib.ObjectId + import org.eclipse.jgit.lib.Repository + import org.eclipse.jgit.lib.RepositoryBuilder + import org.eclipse.jgit.revwalk.RevCommit + import org.eclipse.jgit.revwalk.RevObject + import org.eclipse.jgit.revwalk.RevTag + import org.eclipse.jgit.revwalk.RevWalk + + try { + RepositoryBuilder rb = new RepositoryBuilder().setGitDir().readEnvironment().findGitDir() + if (rb.getGitDir() == null) { + throw new Exception("Can't find .git directory") + } + Repository repo = rb.build() + ObjectId objectId = repo.resolve(Constants.HEAD) + try (RevWalk rw = new RevWalk(repo)) { + RevObject obj = rw.parseAny(objectId) + while (obj instanceof RevTag) { + obj = ((RevTag) obj).getObject() + rw.parseBody(obj) + } + + switch (obj.getType()) { + case Constants.OBJ_COMMIT: + RevCommit c = (RevCommit) obj + Instant time = c.getCommitterIdent().getWhenAsInstant() + DateTimeFormatter iso8601Fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss'Z'").withZone(ZoneId.of("UTC")) + DateTimeFormatter versionFmt = DateTimeFormatter.ofPattern("yyyyMMddHHmm").withZone(ZoneId.of("UTC")) + String isoTime = iso8601Fmt.format(time) + String versionTime = versionFmt.format(time) + project.properties.setProperty("commit.time.iso", isoTime) + project.properties.setProperty("commit.time.version", versionTime) + break + default: + throw new Exception("Didn't expect " + obj.name() + ", " + obj.getType()) + } + } + } catch (Exception e) { + e.printStackTrace() + } + ]]></script> + </scripts> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> |