]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-5.3' into stable-5.4 46/148246/3
authorMatthias Sohn <matthias.sohn@sap.com>
Fri, 23 Aug 2019 15:55:14 +0000 (17:55 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Fri, 23 Aug 2019 15:59:49 +0000 (17:59 +0200)
* stable-5.3:
  Prepare 5.3.5-SNAPSHOT builds
  JGit v5.3.4.201908231101-r
  Prepare 5.1.11-SNAPSHOT builds
  JGit v5.1.10.201908230655-r
  Use AtomicReferences to cache user and system level configs
  Fix copy-paste typo in CloneCommand#cleanup
  SystemReader: Use correct constructor of FileBasedConfig

Change-Id: I4422632766fc5554a20f75346c5480b7fb611484
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
1  2 
org.eclipse.jgit.lfs/.settings/.api_filters
org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF
org.eclipse.jgit/.settings/.api_filters
org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java

index 5b8ece617a943c90636cfd3fc0a964a414df9292,0bdf571d44e456c030ac6f235469f92c2bf038b3..def21cd7fee035bdc153b612c60c21a00217ef3b
@@@ -3,8 -3,14 +3,8 @@@
      <resource path="META-INF/MANIFEST.MF">
          <filter id="924844039">
              <message_arguments>
-                 <message_argument value="5.4.1"/>
 -                <message_argument value="5.3.4"/>
 -                <message_argument value="5.3.0"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="924844039">
 -            <message_arguments>
 -                <message_argument value="5.3.5"/>
 -                <message_argument value="5.3.0"/>
++                <message_argument value="5.4.2"/>
 +                <message_argument value="5.4.0"/>
              </message_arguments>
          </filter>
      </resource>
index 0000000000000000000000000000000000000000,e6c6015c4b1b892e7dea9a54830238b2a4703f9d..ccd83fe883a96de2183ab4a2912187915707c7cb
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,5 +1,5 @@@
 -Bundle-Version: 5.3.5.qualifier
+ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: JGit Target Platform Bundle
+ Bundle-SymbolicName: org.eclipse.jgit.target
++Bundle-Version: 5.4.2.qualifier
index 5ca7c0f6640be8e64ffdf8eea9126c953862820c,1279cf559782efc48e0478b6a6833e9ee0d24412..30ff73be2a0b65bf4113a488c63b9076f2f5ea2c
@@@ -3,8 -3,14 +3,8 @@@
      <resource path="META-INF/MANIFEST.MF">
          <filter id="924844039">
              <message_arguments>
-                 <message_argument value="5.4.1"/>
 -                <message_argument value="5.3.4"/>
 -                <message_argument value="5.3.0"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="924844039">
 -            <message_arguments>
 -                <message_argument value="5.3.5"/>
 -                <message_argument value="5.3.0"/>
++                <message_argument value="5.4.2"/>
 +                <message_argument value="5.4.0"/>
              </message_arguments>
          </filter>
      </resource>