Merge "OSGi: move plugin localization to subdirectory"

org.eclipse.jgit.ant/META-INF/MANIFEST.MF

@@ -7,7 +7,7 @@ Bundle-Version: 6.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.apache.tools.ant,
   org.eclipse.jgit.storage.file;version="[6.8.0,6.9.0)"
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.jgit.ant;version="6.8.0",
  org.eclipse.jgit.ant.tasks;version="6.8.0";

org.eclipse.jgit.ant/build.properties

@@ -2,8 +2,8 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html
 additional.bundles = org.apache.ant,\
                      org.eclipse.jgit,\

org.eclipse.jgit.archive/META-INF/MANIFEST.MF

@@ -5,7 +5,7 @@ Automatic-Module-Name: org.eclipse.jgit.archive
 Bundle-SymbolicName: org.eclipse.jgit.archive
 Bundle-Version: 6.8.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)",
  org.apache.commons.compress.archivers.tar;version="[1.4,2.0)",

org.eclipse.jgit.archive/build.properties

@@ -1,6 +1,6 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               about.html,\
+               about.html
-               plugin.properties

org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF

@@ -5,7 +5,7 @@ Automatic-Module-Name: org.eclipse.jgit.gpg.bc
 Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true
 Fragment-Host: org.eclipse.jgit;bundle-version="[6.8.0,6.9.0)"
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/gpg_bc
 Bundle-Version: 6.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)",

org.eclipse.jgit.gpg.bc/build.properties

@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html

org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF

@@ -5,7 +5,7 @@ Automatic-Module-Name: org.eclipse.jgit.http.apache
 Bundle-SymbolicName: org.eclipse.jgit.http.apache
 Bundle-Version: 6.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.http;version="[4.3.0,5.0.0)",

org.eclipse.jgit.http.apache/build.properties

@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html

org.eclipse.jgit.http.server/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.http.server
 Bundle-SymbolicName: org.eclipse.jgit.http.server
 Bundle-Version: 6.8.0.qualifier
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.jgit.http.server;version="6.8.0",
  org.eclipse.jgit.http.server.glue;version="6.8.0";

org.eclipse.jgit.http.server/build.properties

@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html

org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.junit.http
 Bundle-SymbolicName: org.eclipse.jgit.junit.http
 Bundle-Version: 6.8.0.qualifier
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11

org.eclipse.jgit.junit.http/build.properties

@@ -1,5 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
+               OSGI-INF/,\
-               plugin.properties
+               .

org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.junit.ssh
 Bundle-SymbolicName: org.eclipse.jgit.junit.ssh
 Bundle-Version: 6.8.0.qualifier
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11

org.eclipse.jgit.junit.ssh/build.properties

@@ -2,5 +2,5 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
+               OSGI-INF/,\
-               plugin.properties
+               .

org.eclipse.jgit.junit/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.junit
 Bundle-SymbolicName: org.eclipse.jgit.junit
 Bundle-Version: 6.8.0.qualifier
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11

org.eclipse.jgit.junit/build.properties

@@ -1,5 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               .,\
+               OSGI-INF/,\
-               plugin.properties
+               .

org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.lfs.server
 Bundle-SymbolicName: org.eclipse.jgit.lfs.server
 Bundle-Version: 6.8.0.qualifier
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.jgit.lfs.server;version="6.8.0";
   uses:="javax.servlet.http,

org.eclipse.jgit.lfs.server/build.properties

@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html

org.eclipse.jgit.lfs/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.lfs
 Bundle-SymbolicName: org.eclipse.jgit.lfs
 Bundle-Version: 6.8.0.qualifier
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.jgit.lfs;version="6.8.0",
  org.eclipse.jgit.lfs.errors;version="6.8.0",

org.eclipse.jgit.lfs/build.properties

@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html

org.eclipse.jgit.pgm/META-INF/MANIFEST.MF

@@ -5,7 +5,7 @@ Automatic-Module-Name: org.eclipse.jgit.pgm
 Bundle-SymbolicName: org.eclipse.jgit.pgm
 Bundle-Version: 6.8.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
  org.apache.commons.logging;version="[1.2,2.0)",

org.eclipse.jgit.pgm/build.properties

@@ -3,7 +3,7 @@ source.. = src/,\
            /
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html,\
                resources/simplelogger.properties

org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true
 Bundle-Version: 6.8.0.qualifier
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/agent
 Bundle-Vendor: %Bundle-Vendor
 Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.8.0,6.9.0)"
 Bundle-ActivationPolicy: lazy

org.eclipse.jgit.ssh.apache.agent/build.properties

@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html

org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit.ssh.apache
 Bundle-SymbolicName: org.eclipse.jgit.ssh.apache
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 6.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11

org.eclipse.jgit.ssh.apache/build.properties

@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html

org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF

@@ -5,7 +5,7 @@ Automatic-Module-Name: org.eclipse.jgit.ssh.jsch
 Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true
 Fragment-Host: org.eclipse.jgit;bundle-version="[6.8.0,6.9.0)"
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/jsch
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 6.8.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11

org.eclipse.jgit.ssh.jsch/build.properties

@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html

org.eclipse.jgit.ui/META-INF/MANIFEST.MF

@@ -1,4 +1,4 @@
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name

org.eclipse.jgit.ui/build.properties

@@ -2,6 +2,6 @@ source.. = src/,\
            resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               plugin.properties,\
                about.html

org.eclipse.jgit/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name
 Automatic-Module-Name: org.eclipse.jgit
 Bundle-SymbolicName: org.eclipse.jgit
 Bundle-Version: 6.8.0.qualifier
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
 Bundle-Vendor: %Bundle-Vendor
 Eclipse-ExtensibleAPI: true
 Export-Package: org.eclipse.jgit.annotations;version="6.8.0",

org.eclipse.jgit/build.properties

@@ -2,6 +2,6 @@ source.. = src/,\
                resources/
 output.. = bin/
 bin.includes = META-INF/,\
+               OSGI-INF/,\
                .,\
-               about.html,\
+               about.html
-               plugin.properties

pom.xml

@@ -439,6 +439,20 @@
               <goal>run</goal>
             </goals>
           </execution>
+          <execution>
+            <id>copy-osgi</id>
+            <phase>generate-resources</phase>
+            <configuration>
+              <target>
+                <copy todir="${project.build.outputDirectory}" >
+                  <fileset dir="." includes="OSGI-INF/**"/>
+                </copy>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>