Skip to content

Upgrading jgit to 7.0.0.202409031743-r #7851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lahodaj merged 1 commit into from
Oct 11, 2024
Merged

Upgrading jgit to 7.0.0.202409031743-r #7851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ide/git/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
javac.compilerargs=-Xlint:unchecked
javac.release=11
javac.release=17
nbm.homepage=http://netbeans.org/projects/versioncontrol/pages/Git_main
nbm.module.author=Ondrej Vrabec
nbm.needs.restart=true
Expand Down
2 changes: 1 addition & 1 deletion ide/libs.git/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

is.autoload=true

javac.release=11
javac.release=17

javadoc.arch=${basedir}/arch.xml
javadoc.apichanges=${basedir}/apichanges.xml
Expand Down
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.gpg.bc/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
B957A281EF7E8C6578601F6327BB12F7C5C2C17C org.eclipse.jgit:org.eclipse.jgit.gpg.bc:6.10.0.202406032230-r
792FF306EA46E2734624D5C9176BA9C6E092E43C org.eclipse.jgit:org.eclipse.jgit.gpg.bc:7.0.0.202409031743-r
2 changes: 1 addition & 1 deletion ....gpg.bc-6.10.0.202406032230-r-license.txt → ...t.gpg.bc-7.0.0.202409031743-r-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: JGit Library
Origin: Eclipse
Version: 6.10.0.202406032230-r
Version: 7.0.0.202409031743-r
Description: Integration library for Git client
License: EDL-1.0-jgit
URL: http://www.eclipse.org/jgit/download/
Expand Down
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.gpg.bc/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@

is.autoload=true

release.external/org.eclipse.jgit.gpg.bc-6.10.0.202406032230-r.jar=modules/org-eclipse-jgit-gpg-bc.jar
release.external/org.eclipse.jgit.gpg.bc-7.0.0.202409031743-r.jar=modules/org-eclipse-jgit-gpg-bc.jar
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.gpg.bc/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>org-eclipse-jgit-gpg-bc.jar</runtime-relative-path>
<binary-origin>external/org.eclipse.jgit.gpg.bc-6.10.0.202406032230-r.jar</binary-origin>
<binary-origin>external/org.eclipse.jgit.gpg.bc-7.0.0.202409031743-r.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.lfs/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
10F9FEEBA165C96C899B0181A1ECA7AE18B7DA81 org.eclipse.jgit:org.eclipse.jgit.lfs:6.10.0.202406032230-r
95F28CA36011F9CBA2A95C9829B5844CF83D1493 org.eclipse.jgit:org.eclipse.jgit.lfs:7.0.0.202409031743-r
2 changes: 1 addition & 1 deletion ...git.lfs-6.10.0.202406032230-r-license.txt → ...jgit.lfs-7.0.0.202409031743-r-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: JGit Library
Origin: Eclipse
Version: 6.10.0.202406032230-r
Version: 7.0.0.202409031743-r
Description: Integration library for Git client
License: EDL-1.0-jgit
URL: http://www.eclipse.org/jgit/download/
Expand Down
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.lfs/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@

is.autoload=true

release.external/org.eclipse.jgit.lfs-6.10.0.202406032230-r.jar=modules/org-eclipse-jgit-lfs.jar
release.external/org.eclipse.jgit.lfs-7.0.0.202409031743-r.jar=modules/org-eclipse-jgit-lfs.jar
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.lfs/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>org-eclipse-jgit-lfs.jar</runtime-relative-path>
<binary-origin>external/org.eclipse.jgit.lfs-6.10.0.202406032230-r.jar</binary-origin>
<binary-origin>external/org.eclipse.jgit.lfs-7.0.0.202409031743-r.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.ssh.jsch/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
B6A43BB49E2BD61F5BB0A1DBAE1D8F7883B2BA9D org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:6.10.0.202406032230-r
44AD1B1124EC81AC0ACC2280E27B0239DFFEC41F org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:7.0.0.202409031743-r
2 changes: 1 addition & 1 deletion ...sh.jsch-6.10.0.202406032230-r-license.txt → ...ssh.jsch-7.0.0.202409031743-r-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: JGit Library
Origin: Eclipse
Version: 6.10.0.202406032230-r
Version: 7.0.0.202409031743-r
Description: Integration library for Git client
License: EDL-1.0-jgit
URL: http://www.eclipse.org/jgit/download/
Expand Down
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.ssh.jsch/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@

is.autoload=true

release.external/org.eclipse.jgit.ssh.jsch-6.10.0.202406032230-r.jar=modules/org-eclipse-jgit-ssh-jsch.jar
release.external/org.eclipse.jgit.ssh.jsch-7.0.0.202409031743-r.jar=modules/org-eclipse-jgit-ssh-jsch.jar
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit.ssh.jsch/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>org-eclipse-jgit-ssh-jsch.jar</runtime-relative-path>
<binary-origin>external/org.eclipse.jgit.ssh.jsch-6.10.0.202406032230-r.jar</binary-origin>
<binary-origin>external/org.eclipse.jgit.ssh.jsch-7.0.0.202409031743-r.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
E1166B8B313939890F29A5C611614B67E396B07E org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r
E11135DED2F1F78DA9A028002AD7837CC970EE8E org.eclipse.jgit:org.eclipse.jgit:7.0.0.202409031743-r
2 changes: 1 addition & 1 deletion ...se.jgit-6.10.0.202406032230-r-license.txt → ...pse.jgit-7.0.0.202409031743-r-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: JGit Library
Origin: Eclipse
Version: 6.10.0.202406032230-r
Version: 7.0.0.202409031743-r
Description: Integration library for Git client
License: EDL-1.0-jgit
URL: http://www.eclipse.org/jgit/download/
Expand Down
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@

is.autoload=true

release.external/org.eclipse.jgit-6.10.0.202406032230-r.jar=modules/org-eclipse-jgit.jar
release.external/org.eclipse.jgit-7.0.0.202409031743-r.jar=modules/org-eclipse-jgit.jar
2 changes: 1 addition & 1 deletion ide/o.eclipse.jgit/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>org-eclipse-jgit.jar</runtime-relative-path>
<binary-origin>external/org.eclipse.jgit-6.10.0.202406032230-r.jar</binary-origin>
<binary-origin>external/org.eclipse.jgit-7.0.0.202409031743-r.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ide/db.sql.visualeditor/external/javacc-7.0.10.jar java/performance/external/jav

# bundled maven conflicts with other libraries
java/maven.embedder/external/apache-maven-3.9.9-bin.zip ide/slf4j.api/external/slf4j-api-1.7.36.jar
java/maven.embedder/external/apache-maven-3.9.9-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.16.1.jar
java/maven.embedder/external/apache-maven-3.9.9-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.17.1.jar
java/maven.embedder/external/apache-maven-3.9.9-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.2.jar
java/maven.embedder/external/apache-maven-3.9.9-bin.zip ide/c.google.guava/external/guava-33.2.1-jre.jar
java/maven.embedder/external/apache-maven-3.9.9-bin.zip java/maven.indexer/external/javax.annotation-api-1.3.2.jar
Expand Down Expand Up @@ -56,7 +56,7 @@ extide/gradle/external/gradle-7.4-bin.zip ide/c.google.guava.failureaccess/exter
extide/gradle/external/gradle-7.4-bin.zip ide/c.jcraft.jzlib/external/jzlib-1.1.3.jar
extide/gradle/external/gradle-7.4-bin.zip ide/libs.commons_compress/external/commons-compress-1.26.2.jar
extide/gradle/external/gradle-7.4-bin.zip ide/o.apache.commons.lang/external/commons-lang-2.6.jar
extide/gradle/external/gradle-7.4-bin.zip ide/o.eclipse.jgit/external/org.eclipse.jgit-6.10.0.202406032230-r.jar
extide/gradle/external/gradle-7.4-bin.zip ide/o.eclipse.jgit/external/org.eclipse.jgit-7.0.0.202409031743-r.jar
extide/gradle/external/gradle-7.4-bin.zip java/debugger.jpda.truffle/external/antlr4-runtime-4.7.2.jar
extide/gradle/external/gradle-7.4-bin.zip java/maven.embedder/external/apache-maven-3.9.9-bin.zip
extide/gradle/external/gradle-7.4-bin.zip platform/libs.junit4/external/hamcrest-core-1.3.jar
Expand Down
6 changes: 3 additions & 3 deletions platform/o.apache.commons.codec/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<project name="platform/o.apache.commons.codec" default="build" basedir=".">
<import file="../../nbbuild/templates/projectized.xml"/>
<target name="jar" depends="-define-FileCRC32Calculator">
<FileCRC32Calculator file="external/commons-codec-1.17.0.jar" property="o.apache.commons.codec.crc32" />
<FileCRC32Calculator file="external/commons-codec-1.17.1.jar" property="o.apache.commons.codec.crc32" />
<jar jarfile="${cluster}/${module.jar}">
<zipfileset src="external/commons-codec-1.17.0.jar"/>
<zipfileset src="external/commons-codec-1.17.1.jar"/>
<manifest>
<attribute name="Bundle-SymbolicName" value="org.apache.commons.codec"/>
<attribute name="Bundle-Version" value="1.17.0"/>
<attribute name="Bundle-Version" value="1.17.1"/>
<attribute name="Export-Package" value="org.apache.commons.codec;version=&quot;1.17.0&quot;,org.apache.commons.codec.binary;version=&quot;1.17.0&quot;,org.apache.commons.codec.digest;version=&quot;1.17.0&quot;,org.apache.commons.codec.language;version=&quot;1.17.0&quot;,org.apache.commons.codec.net;version=&quot;1.17.0&quot;"/>
<attribute name="NB-Original-CRC" value="${o.apache.commons.codec.crc32}"/>
</manifest>
Expand Down
2 changes: 1 addition & 1 deletion platform/o.apache.commons.codec/external/binaries-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
0DBE8EEF6E14460E73DA07F7B11BF994D6626355 commons-codec:commons-codec:1.17.0
973638B7149D333563584137EBF13A691BB60579 commons-codec:commons-codec:1.17.1
2 changes: 1 addition & 1 deletion ...external/commons-codec-1.17.0-license.txt → ...external/commons-codec-1.17.1-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Name: Apache Commons Codec
Description: General encoding/decoding algorithms (for example phonetic, base64, URL).
Origin: https://commons.apache.org/proper/commons-codec/
Version: 1.17.0
Version: 1.17.1
License: Apache-2.0

Apache License
Expand Down
0 .../external/commons-codec-1.17.0-notice.txt → .../external/commons-codec-1.17.1-notice.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion platform/o.apache.commons.codec/nbproject/project.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<public-packages/>
<class-path-extension>
<runtime-relative-path>org-apache-commons-codec.jar</runtime-relative-path>
<binary-origin>external/commons-codec-1.17.0.jar</binary-origin>
<binary-origin>external/commons-codec-1.17.1.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
Expand Down