motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge changes I0d10aeac,I9aced1b7,Ied394859,Ibb61f63f,I20498746, ... 

* changes:
  Use try-with-resource to ensure UploadPack is closed
  Fix hiding field warning
  Fix warning for empty code blocks
  Fix boxing warnings
  errorprone: remove unnecessary parentheses
  Update mockito to 5.7.0 and bytebuddy to 1.14.9
  Enable Maven reproducible builds
  Upgrade bazlets to the latest revision
This commit is contained in:
Matthias Sohn 2023-11-10 03:03:36 -05:00 committed by Gerrit Code Review @ Eclipse.org
parent c2c61a88f9 b761a0fc3e
commit 1b28c2d001
38 changed files with 324 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
WORKSPACE
View File

@ -3,7 +3,7 @@ workspace(name = "jgit")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("//tools:bazlets.bzl", "load_bazlets")
load_bazlets(commit = "f30a992da9fc855dce819875afb59f9dd6f860cd")
load_bazlets(commit = "f9c119e45d9a241bee720b7fbd6c7fdbc952da5f")
load(
"@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl",
@ -178,8 +178,8 @@ maven_jar(
maven_jar(
name = "mockito",
artifact = "org.mockito:mockito-core:5.5.0",
sha1 = "1660ec3ce0af7f713af923817b225a37cc5cf965",
artifact = "org.mockito:mockito-core:5.7.0",
sha1 = "a1c258331ab91d66863c983aff7136357e9de056",
)
maven_jar(

2
org.eclipse.jgit.ant/pom.xml
View File

@ -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>

2
org.eclipse.jgit.archive/pom.xml
View File

@ -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>

2
org.eclipse.jgit.gpg.bc/pom.xml
View File

@ -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>

2
org.eclipse.jgit.http.apache/pom.xml
View File

@ -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>

2
org.eclipse.jgit.http.server/pom.xml
View File

@ -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>

2
org.eclipse.jgit.junit.http/pom.xml
View File

@ -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>

2
org.eclipse.jgit.junit.ssh/pom.xml
View File

@ -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>

2
org.eclipse.jgit.junit/pom.xml
View File

@ -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>

2
org.eclipse.jgit.lfs.server/pom.xml
View File

@ -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>

2
org.eclipse.jgit.lfs/pom.xml
View File

@ -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>

10
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.17" sequenceNumber="1697184841">
<target name="jgit-4.17" sequenceNumber="1699482561">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>

10
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.18" sequenceNumber="1697184841">
<target name="jgit-4.18" sequenceNumber="1699482561">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>

10
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.19-staging" sequenceNumber="1697184840">
<target name="jgit-4.19-staging" sequenceNumber="1699482561">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>

10
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.20" sequenceNumber="1697184840">
<target name="jgit-4.20" sequenceNumber="1699482561">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>

10
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.21" sequenceNumber="1697184841">
<target name="jgit-4.21" sequenceNumber="1699482561">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>

10
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.22" sequenceNumber="1697184839">
<target name="jgit-4.22" sequenceNumber="1699482561">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>

10
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.23" sequenceNumber="1697184839">
<target name="jgit-4.23" sequenceNumber="1699482561">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>

10
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.24" sequenceNumber="1697184839">
<target name="jgit-4.24" sequenceNumber="1699482561">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>

10
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.25" sequenceNumber="1697184839">
<target name="jgit-4.25" sequenceNumber="1699482561">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>

10
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.26" sequenceNumber="1697184839">
<target name="jgit-4.26" sequenceNumber="1699482561">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>

10
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.27" sequenceNumber="1697184839">
<target name="jgit-4.27" sequenceNumber="1699482561">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>

10
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.28" sequenceNumber="1697184840">
<target name="jgit-4.28" sequenceNumber="1699482561">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>

10
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.29" sequenceNumber="1697184839">
<target name="jgit-4.29" sequenceNumber="1699482561">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>

8
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
<target name="jgit-4.30" sequenceNumber="1697185706">
<target name="jgit-4.30" sequenceNumber="1699482561">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
<version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.8</version>
<version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>

6
org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd
View File

@ -87,12 +87,12 @@ maven bytebuddy
dependency {
groupId = "net.bytebuddy"
artifactId = "byte-buddy"
version = "1.14.8"
version = "1.14.9"
}
dependency {
groupId = "net.bytebuddy"
artifactId = "byte-buddy-agent"
version = "1.14.8"
version = "1.14.9"
}
}
@ -210,7 +210,7 @@ maven mockito
dependency {
groupId = "org.mockito"
artifactId = "mockito-core"
version = "5.5.0"
version = "5.7.0"
}
}

71
org.eclipse.jgit.packaging/pom.xml
View File

@ -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>
@ -255,6 +275,30 @@
<encoding>ISO-8859-1</encoding>
</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>
@ -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>

2
org.eclipse.jgit.pgm/pom.xml
View File

@ -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>

2
org.eclipse.jgit.ssh.apache.agent/pom.xml
View File

@ -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>

2
org.eclipse.jgit.ssh.apache/pom.xml
View File

@ -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>

2
org.eclipse.jgit.ssh.jsch/pom.xml
View File

@ -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>

1
org.eclipse.jgit.test/pom.xml
View File

@ -73,7 +73,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.5.0</version>
</dependency>
<dependency>

3
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriterTest.java
View File

@ -159,6 +159,7 @@ private static class NonNestedTasksProgressMonitor
@Override
public void start(int totalTasks) {
// empty
}
@Override
@ -169,6 +170,7 @@ public void beginTask(String title, int totalWork) {
@Override
public void update(int completed) {
// empty
}
@Override
@ -184,6 +186,7 @@ public boolean isCancelled() {
@Override
public void showDuration(boolean enabled) {
// empty
}
}

19
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java
View File

@ -3015,12 +3015,13 @@ private PackStatistics uploadPackV2SetupStats(String... inputLines)
String version = TransferConfig.ProtocolVersion.V2.version();
server.getConfig().setString(ConfigConstants.CONFIG_PROTOCOL_SECTION,
null, ConfigConstants.CONFIG_KEY_VERSION, version);
UploadPack up = new UploadPack(server);
up.setExtraParameters(Sets.of("version=".concat(version)));
try (UploadPack up = new UploadPack(server)) {
up.setExtraParameters(Sets.of("version=".concat(version)));
ByteArrayOutputStream recv = new ByteArrayOutputStream();
up.upload(send, recv, null);
return up.getStatistics();
ByteArrayOutputStream recv = new ByteArrayOutputStream();
up.upload(send, recv, null);
return up.getStatistics();
}
}
@Test
@ -3037,10 +3038,10 @@ public void testUseWantedRefsAsAdvertisedSetV2_onlyWantedRefs()
remote.update("three", three);
server.getConfig().setBoolean("uploadpack", null, "allowrefinwant",
true);
PackStatistics stats = uploadPackV2SetupStats("command=fetch\n",
PackStatistics packStats = uploadPackV2SetupStats("command=fetch\n",
PacketLineIn.delimiter(), "want-ref refs/heads/one\n",
"want-ref refs/heads/two\n", "done\n", PacketLineIn.end());
assertEquals("only wanted-refs", 2, stats.getAdvertised());
assertEquals("only wanted-refs", 2, packStats.getAdvertised());
assertEquals(0, ((RefCallsCountingRepository) server).numRefCalls());
}
@ -3058,10 +3059,10 @@ public void testUseWantedRefsAsAdvertisedSetV2_withWantId()
remote.update("three", three);
server.getConfig().setBoolean("uploadpack", null, "allowrefinwant",
true);
PackStatistics stats = uploadPackV2SetupStats("command=fetch\n",
PackStatistics packStats = uploadPackV2SetupStats("command=fetch\n",
PacketLineIn.delimiter(), "want-ref refs/heads/one\n",
"want " + one.getName() + "\n", "done\n", PacketLineIn.end());
assertEquals("all refs", 3, stats.getAdvertised());
assertEquals("all refs", 3, packStats.getAdvertised());
assertEquals(1, ((RefCallsCountingRepository) server).numRefCalls());
}

2
org.eclipse.jgit.ui/pom.xml
View File

@ -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>

2
org.eclipse.jgit/pom.xml
View File

@ -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>

7
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackObjectSizeIndexLoader.java
View File

@ -36,14 +36,15 @@ public static PackObjectSizeIndex load(InputStream in) throws IOException {
if (!Arrays.equals(header, PackObjectSizeIndexWriter.HEADER)) {
throw new IOException(MessageFormat.format(
JGitText.get().unreadableObjectSizeIndex,
header.length, Arrays.toString(header)));
Integer.valueOf(header.length),
Arrays.toString(header)));
}
int version = in.readNBytes(1)[0];
if (version != 1) {
throw new IOException((MessageFormat.format(
throw new IOException(MessageFormat.format(
JGitText.get().unsupportedObjectSizeIndexVersion,
version)));
Integer.valueOf(version)));
}
return PackObjectSizeIndexV1.parse(in);
}

149
pom.xml
View File

@ -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>
@ -147,6 +148,7 @@
<hamcrest-version>2.2</hamcrest-version>
<assertj-version>3.24.2</assertj-version>
<jna-version>5.13.0</jna-version>
<byte-buddy-version>1.14.9</byte-buddy-version>
<!-- Properties to enable jacoco code coverage analysis -->
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
@ -191,6 +193,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 +365,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 +419,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 +591,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 +606,7 @@
<outputName>cyclonedx</outputName>
<outputDirectory>${project.build.directory}</outputDirectory>
<verbose>false</verbose>
<detectUnusedForOptionalScope>true</detectUnusedForOptionalScope>
</configuration>
<executions>
<execution>
@ -596,6 +617,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>
@ -853,6 +976,26 @@
<artifactId>jna-platform</artifactId>
<version>${jna-version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.7.0</version>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>${byte-buddy-version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>${byte-buddy-version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
</dependencyManagement>