diff options
17 files changed, 182 insertions, 74 deletions
@@ -178,8 +178,8 @@ maven_jar( maven_jar( name = "mockito", - artifact = "org.mockito:mockito-core:4.8.1", - sha1 = "d8eb9dec8747d08645347bb8c69088ac83197975", + artifact = "org.mockito:mockito-core:5.4.0", + sha1 = "30bcbe79f7bd51b53debfc4c6014d0bea4935e37", ) maven_jar( @@ -188,18 +188,18 @@ maven_jar( sha1 = "ebbf338e33f893139459ce5df023115971c2786f", ) -BYTE_BUDDY_VERSION = "1.12.18" +BYTE_BUDDY_VERSION = "1.14.5" maven_jar( name = "bytebuddy", artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, - sha1 = "875a9c3f29d2f6f499dfd60d76e97a343f9b1233", + sha1 = "28a424c0c4f362568e904d992c239c996cf7adc7", ) maven_jar( name = "bytebuddy-agent", artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, - sha1 = "417a7310a7bf1c1aae5ca502d26515f9c2f94396", + sha1 = "20f4e9b9d0ffb953657bfa4b92c0cceb27907d58", ) maven_jar( diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target index 4c66b6109f..eba283cee3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target @@ -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="1688195613"> +<target name="jgit-4.17" sequenceNumber="1688222406"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -22,8 +22,6 @@ <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> <unit id="org.junit" version="4.13.2.v20211018-1956"/> <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.mockito.mockito-core" version="4.8.1.v20221103-2317"/> - <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/> @@ -74,6 +72,16 @@ </dependency> </dependencies> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.4.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> <dependencies> <dependency> @@ -177,13 +185,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target index 741a15a991..0b4acdf939 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target @@ -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="1688195613"> +<target name="jgit-4.18" sequenceNumber="1688222406"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -22,8 +22,6 @@ <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> <unit id="org.junit" version="4.13.2.v20211018-1956"/> <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.mockito.mockito-core" version="4.8.1.v20221103-2317"/> - <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/> @@ -74,6 +72,16 @@ </dependency> </dependencies> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.4.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> <dependencies> <dependency> @@ -177,13 +185,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target index 68af044a3a..f224ad25fa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target @@ -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="1688195613"> +<target name="jgit-4.19-staging" sequenceNumber="1688222406"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -22,8 +22,6 @@ <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> <unit id="org.junit" version="4.13.2.v20211018-1956"/> <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.mockito.mockito-core" version="4.8.1.v20221103-2317"/> - <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/> @@ -74,6 +72,16 @@ </dependency> </dependencies> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.4.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> <dependencies> <dependency> @@ -177,13 +185,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target index 74a2955ba7..fafedc8427 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target @@ -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="1688195613"> +<target name="jgit-4.20" sequenceNumber="1688222406"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -22,8 +22,6 @@ <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> <unit id="org.junit" version="4.13.2.v20211018-1956"/> <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.mockito.mockito-core" version="4.8.1.v20221103-2317"/> - <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/> @@ -74,6 +72,16 @@ </dependency> </dependencies> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.4.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> <dependencies> <dependency> @@ -177,13 +185,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target index b4c99652e5..1cfc310200 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target @@ -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="1688195613"> +<target name="jgit-4.21" sequenceNumber="1688222406"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -22,8 +22,6 @@ <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> <unit id="org.junit" version="4.13.2.v20211018-1956"/> <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.mockito.mockito-core" version="4.8.1.v20221103-2317"/> - <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/> @@ -74,6 +72,16 @@ </dependency> </dependencies> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.4.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> <dependencies> <dependency> @@ -177,13 +185,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target index c2e2e8e9c9..70626ec745 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target @@ -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="1688195612"> +<target name="jgit-4.22" sequenceNumber="1688222404"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -22,8 +22,6 @@ <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> <unit id="org.junit" version="4.13.2.v20211018-1956"/> <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.mockito.mockito-core" version="4.8.1.v20221103-2317"/> - <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/> @@ -74,6 +72,16 @@ </dependency> </dependencies> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.4.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> <dependencies> <dependency> @@ -177,13 +185,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target index 7013fcfa63..57662a37d1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target @@ -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="1688195612"> +<target name="jgit-4.23" sequenceNumber="1688222404"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -22,8 +22,6 @@ <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> <unit id="org.junit" version="4.13.2.v20211018-1956"/> <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.mockito.mockito-core" version="4.8.1.v20221103-2317"/> - <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/> @@ -74,6 +72,16 @@ </dependency> </dependencies> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.4.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> <dependencies> <dependency> @@ -177,13 +185,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target index 6662ae1c27..17916c955a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target @@ -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="1688195612"> +<target name="jgit-4.24" sequenceNumber="1688222405"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -22,8 +22,6 @@ <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> <unit id="org.junit" version="4.13.2.v20211018-1956"/> <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.mockito.mockito-core" version="4.8.1.v20221103-2317"/> - <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/> @@ -74,6 +72,16 @@ </dependency> </dependencies> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.4.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> <dependencies> <dependency> @@ -177,13 +185,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target index 3755cfd8c0..79d81ab128 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target @@ -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="1688195612"> +<target name="jgit-4.25" sequenceNumber="1688222404"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -22,8 +22,6 @@ <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> <unit id="org.junit" version="4.13.2.v20211018-1956"/> <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.mockito.mockito-core" version="4.8.1.v20221103-2317"/> - <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/> @@ -74,6 +72,16 @@ </dependency> </dependencies> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.4.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> <dependencies> <dependency> @@ -177,13 +185,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target index ab3e503d6f..65ae60af74 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target @@ -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="1688195610"> +<target name="jgit-4.26" sequenceNumber="1688222404"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -22,8 +22,6 @@ <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> <unit id="org.junit" version="4.13.2.v20211018-1956"/> <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.mockito.mockito-core" version="4.8.1.v20221103-2317"/> - <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/> @@ -74,6 +72,16 @@ </dependency> </dependencies> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.4.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> <dependencies> <dependency> @@ -177,13 +185,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 917656a2dc..0f0099371f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -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="1688195610"> +<target name="jgit-4.27" sequenceNumber="1688222404"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -22,8 +22,6 @@ <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> <unit id="org.junit" version="4.13.2.v20211018-1956"/> <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.mockito.mockito-core" version="4.8.1.v20221103-2317"/> - <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/> @@ -74,6 +72,16 @@ </dependency> </dependencies> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.4.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> <dependencies> <dependency> @@ -177,13 +185,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 224caf6070..3fcb72a3b9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -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="1688195610"> +<target name="jgit-4.28" sequenceNumber="1688222404"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> @@ -22,8 +22,6 @@ <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> <unit id="org.junit" version="4.13.2.v20211018-1956"/> <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.mockito.mockito-core" version="4.8.1.v20221103-2317"/> - <unit id="org.mockito.mockito-core.source" version="4.8.1.v20221103-2317"/> <unit id="org.objenesis" version="3.3.0.v20221103-2317"/> <unit id="org.objenesis.source" version="3.3.0.v20221103-2317"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository"/> @@ -74,6 +72,16 @@ </dependency> </dependencies> </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.4.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> <dependencies> <dependency> @@ -177,13 +185,13 @@ <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> <dependency> <groupId>net.bytebuddy</groupId> <artifactId>byte-buddy-agent</artifactId> - <version>1.12.18</version> + <version>1.14.5</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index 8bf4a3e529..cc7ea6104f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -87,12 +87,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.12.18" + version = "1.14.5" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.12.18" + version = "1.14.5" } } @@ -201,6 +201,19 @@ maven jna } } +maven mockito + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "org.mockito" + artifactId = "mockito-core" + version = "5.4.0" + } +} + maven sshd scope = compile dependencyDepth = none diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230531010532-2023-06.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230531010532-2023-06.tpd index 089981c95e..46055d3728 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230531010532-2023-06.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230531010532-2023-06.tpd @@ -20,8 +20,6 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/R202305310105 org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246] org.junit [4.13.2.v20211018-1956,4.13.2.v20211018-1956] org.junit.source [4.13.2.v20211018-1956,4.13.2.v20211018-1956] - org.mockito.mockito-core [4.8.1.v20221103-2317,4.8.1.v20221103-2317] - org.mockito.mockito-core.source [4.8.1.v20221103-2317,4.8.1.v20221103-2317] org.objenesis [3.3.0.v20221103-2317,3.3.0.v20221103-2317] org.objenesis.source [3.3.0.v20221103-2317,3.3.0.v20221103-2317] } diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index da39b7a2ff..d4d84bcd90 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -8,6 +8,7 @@ Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", + net.bytebuddy.agent;version="[1.9.0,2.0.0)", net.bytebuddy.dynamic.loading;version="[1.9.0,2.0.0)", org.apache.commons.compress.archivers;version="[1.15.0,2.0)", org.apache.commons.compress.archivers.tar;version="[1.15.0,2.0)", @@ -82,10 +83,10 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)", - org.mockito;version="[4.8.0,5.0.0)", - org.mockito.invocation;version="[4.8.0,5.0.0)", - org.mockito.junit;version="[4.8.0,5.0.0)", - org.mockito.stubbing;version="[4.8.0,5.0.0)", + org.mockito;version="[5.4.0,6.0.0)", + org.mockito.invocation;version="[5.4.0,6.0.0)", + org.mockito.junit;version="[5.4.0,6.0.0)", + org.mockito.stubbing;version="[5.4.0,6.0.0)", org.objenesis;version="[3.3.0,4.0.0)", org.slf4j;version="[1.7.0,2.0.0)", org.tukaani.xz diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 82cb80963d..f7322596a1 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -73,7 +73,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>4.8.1</version> + <version>5.4.0</version> </dependency> <dependency> |