mbien commented on PR #6500: URL: https://github.com/apache/netbeans/pull/6500#issuecomment-1748106265
with the help of @matthiasblaesing https://github.com/apache/netbeans/pull/6517#issuecomment-1747507971 I tried in a second attempt to use the jars as osgi modules and can confirm my suspicion that each wrapped osgi jar requires one lib wrapper module: ``` Cannot include other files with an OSGi bundle: modules/org-eclipse-jgit-gpg-bc.jar ``` I don't really want to do that tbh. would a normal lib wrapper module be ok, like currently in this PR? I suppose we could make this a friend API and/or keep the sig check disabled. here the diff to this PR which attempts to use osgi modules: <details> ```diff diff --git a/ide/o.eclipse.jgit/build.xml b/ide/o.eclipse.jgit/build.xml index ee6dc3c..93944ef 100644 --- a/ide/o.eclipse.jgit/build.xml +++ b/ide/o.eclipse.jgit/build.xml @@ -21,4 +21,6 @@ --> <project name="ide/o.eclipse.jgit" default="build" basedir="."> <import file="../../nbbuild/templates/projectized.xml"/> + <!-- dissable target, wrapped osgi libs are copied into ./modules/ --> + <target name="jar"/> </project> diff --git a/ide/o.eclipse.jgit/manifest.mf b/ide/o.eclipse.jgit/manifest.mf index 15c0419..da52db2 100644 --- a/ide/o.eclipse.jgit/manifest.mf +++ b/ide/o.eclipse.jgit/manifest.mf @@ -1,6 +1 @@ -Manifest-Version: 1.0 -AutoUpdate-Show-In-Client: false OpenIDE-Module: org.eclipse.jgit -OpenIDE-Module-Localizing-Bundle: org/eclipse/jgit/Bundle.properties -OpenIDE-Module-Specification-Version: 6.7 -OpenIDE-Module-Java-Dependencies: Java > 11 diff --git a/ide/o.eclipse.jgit/nbproject/project.properties b/ide/o.eclipse.jgit/nbproject/project.properties index 74ca827..7e6798e 100644 --- a/ide/o.eclipse.jgit/nbproject/project.properties +++ b/ide/o.eclipse.jgit/nbproject/project.properties @@ -21,7 +21,7 @@ is.autoload=true sigtest.gen.fail.on.error=false -release.external/org.eclipse.jgit-6.7.0.202309050840-r.jar=modules/ext/org.eclipse.jgit-6.7.0.202309050840-r.jar -release.external/org.eclipse.jgit.gpg.bc-6.7.0.202309050840-r.jar=modules/ext/org.eclipse.jgit.gpg.bc-6.7.0.202309050840-r.jar -release.external/org.eclipse.jgit.lfs-6.7.0.202309050840-r.jar=modules/ext/org.eclipse.jgit.lfs-6.7.0.202309050840-r.jar -release.external/org.eclipse.jgit.ssh.jsch-6.7.0.202309050840-r.jar=modules/ext/org.eclipse.jgit.ssh.jsch-6.7.0.202309050840-r.jar +release.external/org.eclipse.jgit-6.7.0.202309050840-r.jar=modules/org-eclipse-jgit.jar +release.external/org.eclipse.jgit.gpg.bc-6.7.0.202309050840-r.jar=modules/org-eclipse-jgit-gpg-bc.jar +release.external/org.eclipse.jgit.lfs-6.7.0.202309050840-r.jar=modules/org-eclipse-jgit-lfs.jar +release.external/org.eclipse.jgit.ssh.jsch-6.7.0.202309050840-r.jar=modules/org-eclipse-jgit-ssh.jsch.jar diff --git a/ide/o.eclipse.jgit/nbproject/project.xml b/ide/o.eclipse.jgit/nbproject/project.xml index d888629..4531c9d 100644 --- a/ide/o.eclipse.jgit/nbproject/project.xml +++ b/ide/o.eclipse.jgit/nbproject/project.xml @@ -78,86 +78,21 @@ </run-dependency> </dependency> </module-dependencies> - <public-packages> - <package>org.eclipse.jgit.annotations</package> - <package>org.eclipse.jgit.api</package> - <package>org.eclipse.jgit.api.errors</package> - <package>org.eclipse.jgit.attributes</package> - <package>org.eclipse.jgit.blame</package> - <package>org.eclipse.jgit.diff</package> - <package>org.eclipse.jgit.dircache</package> - <package>org.eclipse.jgit.errors</package> - <package>org.eclipse.jgit.events</package> - <package>org.eclipse.jgit.fnmatch</package> - <package>org.eclipse.jgit.gitrepo</package> - <package>org.eclipse.jgit.gitrepo.internal</package> - <package>org.eclipse.jgit.gpg.bc</package> - <package>org.eclipse.jgit.gpg.bc.internal</package> - <package>org.eclipse.jgit.gpg.bc.internal.keys</package> - <package>org.eclipse.jgit.hooks</package> - <package>org.eclipse.jgit.ignore</package> - <package>org.eclipse.jgit.ignore.internal</package> - <package>org.eclipse.jgit.internal</package> - <package>org.eclipse.jgit.internal.diff</package> - <package>org.eclipse.jgit.internal.diffmergetool</package> - <package>org.eclipse.jgit.internal.fsck</package> - <package>org.eclipse.jgit.internal.revwalk</package> - <package>org.eclipse.jgit.internal.storage.commitgraph</package> - <package>org.eclipse.jgit.internal.storage.dfs</package> - <package>org.eclipse.jgit.internal.storage.file</package> - <package>org.eclipse.jgit.internal.storage.io</package> - <package>org.eclipse.jgit.internal.storage.memory</package> - <package>org.eclipse.jgit.internal.storage.pack</package> - <package>org.eclipse.jgit.internal.storage.reftable</package> - <package>org.eclipse.jgit.internal.submodule</package> - <package>org.eclipse.jgit.internal.transport.connectivity</package> - <package>org.eclipse.jgit.internal.transport.http</package> - <package>org.eclipse.jgit.internal.transport.parser</package> - <package>org.eclipse.jgit.internal.transport.ssh</package> - <package>org.eclipse.jgit.internal.transport.ssh.jsch</package> - <package>org.eclipse.jgit.internal.util</package> - <package>org.eclipse.jgit.lfs</package> - <package>org.eclipse.jgit.lfs.errors</package> - <package>org.eclipse.jgit.lfs.internal</package> - <package>org.eclipse.jgit.lfs.lib</package> - <package>org.eclipse.jgit.lib</package> - <package>org.eclipse.jgit.lib.internal</package> - <package>org.eclipse.jgit.logging</package> - <package>org.eclipse.jgit.merge</package> - <package>org.eclipse.jgit.nls</package> - <package>org.eclipse.jgit.notes</package> - <package>org.eclipse.jgit.patch</package> - <package>org.eclipse.jgit.revplot</package> - <package>org.eclipse.jgit.revwalk</package> - <package>org.eclipse.jgit.revwalk.filter</package> - <package>org.eclipse.jgit.storage.file</package> - <package>org.eclipse.jgit.storage.pack</package> - <package>org.eclipse.jgit.submodule</package> - <package>org.eclipse.jgit.transport</package> - <package>org.eclipse.jgit.transport.http</package> - <package>org.eclipse.jgit.transport.resolver</package> - <package>org.eclipse.jgit.transport.ssh.jsch</package> - <package>org.eclipse.jgit.treewalk</package> - <package>org.eclipse.jgit.treewalk.filter</package> - <package>org.eclipse.jgit.util</package> - <package>org.eclipse.jgit.util.io</package> - <package>org.eclipse.jgit.util.sha1</package> - <package>org.eclipse.jgit.util.time</package> - </public-packages> + <public-packages/> <class-path-extension> - <runtime-relative-path>ext/org.eclipse.jgit-6.7.0.202309050840-r.jar</runtime-relative-path> + <runtime-relative-path>org-eclipse-jgit.jar</runtime-relative-path> <binary-origin>external/org.eclipse.jgit-6.7.0.202309050840-r.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/org.eclipse.jgit.gpg.bc-6.7.0.202309050840-r.jar</runtime-relative-path> + <runtime-relative-path>org-eclipse-jgit-gpg-bc.jar</runtime-relative-path> <binary-origin>external/org.eclipse.jgit.gpg.bc-6.7.0.202309050840-r.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/org.eclipse.jgit.ssh.jsch-6.7.0.202309050840-r.jar</runtime-relative-path> + <runtime-relative-path>org-eclipse-jgit-ssh-jsch.jar</runtime-relative-path> <binary-origin>external/org.eclipse.jgit.ssh.jsch-6.7.0.202309050840-r.jar</binary-origin> </class-path-extension> <class-path-extension> - <runtime-relative-path>ext/org.eclipse.jgit.lfs-6.7.0.202309050840-r.jar</runtime-relative-path> + <runtime-relative-path>org-eclipse-jgit-lfs.jar</runtime-relative-path> <binary-origin>external/org.eclipse.jgit.lfs-6.7.0.202309050840-r.jar</binary-origin> </class-path-extension> </data> diff --git a/ide/o.eclipse.jgit/src/org/eclipse/jgit/Bundle.properties b/ide/o.eclipse.jgit/src/org/eclipse/jgit/Bundle.properties deleted file mode 100644 index 53bacf5..0000000 --- a/ide/o.eclipse.jgit/src/org/eclipse/jgit/Bundle.properties +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -OpenIDE-Module-Name=JGit Libraries ``` </details> -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
