diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2025-05-28 15:46:13 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2025-05-28 15:46:13 +0200 |
commit | d35c45ec8b4929fba9030c067f9e9552e35dbc24 (patch) | |
tree | ea6f54fe2b15fe0dfacffc33040b34f68dcf5ca1 | |
parent | 1d83aa4bbfe8b59b72448b9123640b8fd2e2ceb6 (diff) | |
parent | 53de3c6ed7bdfa7187f207bb2714aeb036850a0f (diff) | |
download | jgit-d35c45ec8b4929fba9030c067f9e9552e35dbc24.tar.gz jgit-d35c45ec8b4929fba9030c067f9e9552e35dbc24.zip |
Merge branch 'master' into stable-7.3
* master:
Prepare 7.1.2-SNAPSHOT builds
JGit v7.1.1.202505221757-r
Prepare 7.0.2-SNAPSHOT builds
JGit v7.0.1.202505221510-r
Prepare 6.10.2-SNAPSHOT builds
JGit v6.10.1.202505221210-r
AmazonS3: Do not accept DOCTYPE and entities
ManifestParser: Do not accept DOCTYPE and entities
Update mockito to 5.18.0
Update Jetty to 12.0.21
Update com.google.code.gson:gson to 2.13.1
Change-Id: I15e7f9c057dc70d5aff7fb6b6f486f63e897ccb8
8 files changed, 71 insertions, 71 deletions
diff --git a/MODULE.bazel b/MODULE.bazel index b3598271c4..dc2bfbc0ae 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -31,7 +31,7 @@ BOUNCYCASTLE_VERSION = "1.80" BYTE_BUDDY_VERSION = "1.17.5" -JETTY_VERSION = "12.0.19" +JETTY_VERSION = "12.0.21" JMH_VERSION = "1.37" @@ -46,7 +46,7 @@ maven.install( name = "jgit_deps", artifacts = [ "args4j:args4j:2.37", - "com.google.code.gson:gson:2.13.0", + "com.google.code.gson:gson:2.13.1", "com.google.errorprone:error_prone_type_annotations:2.38.0", "com.googlecode.javaewah:JavaEWAH:1.2.3", "com.jcraft:jsch:0.1.55", @@ -82,7 +82,7 @@ maven.install( "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VERSION, "org.eclipse.jetty:jetty-util:" + JETTY_VERSION, "org.hamcrest:hamcrest:2.2", - "org.mockito:mockito-core:5.17.0", + "org.mockito:mockito-core:5.18.0", "org.objenesis:objenesis:3.4", "org.openjdk.jmh:jmh-core:" + JMH_VERSION, "org.openjdk.jmh:jmh-generator-annprocess:" + JMH_VERSION, diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 25717372df..58c083418b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.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.32" sequenceNumber="1745251294"> +<target name="jgit-4.32" sequenceNumber="1747840563"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -77,7 +77,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.17.0</version> + <version>5.18.0</version> <type>jar</type> </dependency> </dependencies> @@ -103,49 +103,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> @@ -181,7 +181,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.13.0</version> + <version>2.13.1</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 687c19fb3d..41d2027446 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.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.33" sequenceNumber="1745251294"> +<target name="jgit-4.33" sequenceNumber="1747840563"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -77,7 +77,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.17.0</version> + <version>5.18.0</version> <type>jar</type> </dependency> </dependencies> @@ -103,49 +103,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> @@ -181,7 +181,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.13.0</version> + <version>2.13.1</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index cd776c6f31..8914402696 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.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.34" sequenceNumber="1745251294"> +<target name="jgit-4.34" sequenceNumber="1747840563"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -77,7 +77,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.17.0</version> + <version>5.18.0</version> <type>jar</type> </dependency> </dependencies> @@ -103,49 +103,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> @@ -181,7 +181,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.13.0</version> + <version>2.13.1</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index d9f16e12aa..1e7a8df50c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.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.35" sequenceNumber="1745251294"> +<target name="jgit-4.35" sequenceNumber="1747840563"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -77,7 +77,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.17.0</version> + <version>5.18.0</version> <type>jar</type> </dependency> </dependencies> @@ -103,49 +103,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> @@ -181,7 +181,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.13.0</version> + <version>2.13.1</version> <type>jar</type> </dependency> </dependencies> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target index 754706fe37..9e3c33b241 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.36.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.36" sequenceNumber="1745251294"> +<target name="jgit-4.36" sequenceNumber="1747840563"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> @@ -77,7 +77,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.17.0</version> + <version>5.18.0</version> <type>jar</type> </dependency> </dependencies> @@ -103,49 +103,49 @@ <dependency> <groupId>org.eclipse.jetty.ee10</groupId> <artifactId>jetty-ee10-servlet</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-http</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-io</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-server</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-session</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util-ajax</artifactId> - <version>12.0.19</version> + <version>12.0.21</version> <type>jar</type> </dependency> <dependency> @@ -181,7 +181,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.13.0</version> + <version>2.13.1</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 3a6065eefa..03f1c0ef06 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 @@ -115,7 +115,7 @@ maven gson dependency { groupId = "com.google.code.gson" artifactId = "gson" - version = "2.13.0" + version = "2.13.1" } } @@ -154,42 +154,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.0.19" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.0.19" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.0.19" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.0.19" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.0.19" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.0.19" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.0.19" + version = "12.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.0.19" + version = "12.0.21" } dependency { groupId = "jakarta.servlet" @@ -225,7 +225,7 @@ maven mockito dependency { groupId = "org.mockito" artifactId = "mockito-core" - version = "5.17.0" + version = "5.18.0" } } @@ -130,13 +130,13 @@ <commons-compress-version>1.27.1</commons-compress-version> <osgi-core-version>6.0.0</osgi-core-version> <servlet-api-version>6.1.0</servlet-api-version> - <jetty-version>12.0.19</jetty-version> + <jetty-version>12.0.21</jetty-version> <japicmp-version>0.23.1</japicmp-version> <httpclient-version>4.5.14</httpclient-version> <httpcore-version>4.4.16</httpcore-version> <slf4j-version>1.7.36</slf4j-version> <maven-javadoc-plugin-version>3.11.2</maven-javadoc-plugin-version> - <gson-version>2.13.0</gson-version> + <gson-version>2.13.1</gson-version> <bouncycastle-version>1.80</bouncycastle-version> <spotbugs-maven-plugin-version>4.9.2.0</spotbugs-maven-plugin-version> <maven-project-info-reports-plugin-version>3.8.0</maven-project-info-reports-plugin-version> @@ -1007,7 +1007,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>5.17.0</version> + <version>5.18.0</version> </dependency> <dependency> |