diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2021-12-04 00:43:05 +0100 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2021-12-04 01:26:11 +0100 |
commit | c25e8b3dee5a890fc531f70f64aa85182c85162f (patch) | |
tree | 40a9a0ee1546c060f718b849deb20a71cc188bda /org.eclipse.jgit.packaging | |
parent | 4322dd26a3308b4991fce835d72cc7c0d6d5622e (diff) | |
parent | f1547eec05061f8d21fc1f85a0523d46687f64c9 (diff) | |
download | jgit-c25e8b3dee5a890fc531f70f64aa85182c85162f.tar.gz jgit-c25e8b3dee5a890fc531f70f64aa85182c85162f.zip |
Merge branch 'stable-5.1' into stable-5.2
* stable-5.1:
Update maven plugins
Ignore missing javadoc in test bundles
storage: file: De-duplicate File.exists()+File.isFile()
RefDirectory.scanRef: Re-use file existence check done in snapshot creation
FileSnapshot: Lazy load file store attributes cache
Update eclipse-jarsigner-plugin to 1.3.2
Fix p2 repository URLs
Change-Id: If3ad2cfb6c341b0ff5c2120a5a1646f6368d86e7
Diffstat (limited to 'org.eclipse.jgit.packaging')
-rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target (renamed from org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10-staging.target) | 6 | ||||
-rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd (renamed from org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10-staging.tpd) | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target | 4 | ||||
-rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target | 4 | ||||
-rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target | 4 | ||||
-rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target | 4 | ||||
-rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target | 6 | ||||
-rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.11.tpd | 2 | ||||
-rw-r--r-- | org.eclipse.jgit.packaging/pom.xml | 4 |
10 files changed, 19 insertions, 19 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10-staging.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.target index 55e44b8f7b..268fbc7575 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10-staging.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.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.9-staging" sequenceNumber="1566229361"> +<target name="jgit-4.9-staging" sequenceNumber="1638575042"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/> @@ -20,7 +20,7 @@ <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/> <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/> <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/> - <repository id="jetty-9.4.11" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605"/> + <repository id="jetty-9.4.11" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.11.v20180605/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/> @@ -80,7 +80,7 @@ </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.osgi" version="0.0.0"/> - <repository location="http://download.eclipse.org/staging/2018-12/"/> + <repository location="http://download.eclipse.org/releases/2018-12/"/> </location> </locations> </target> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10-staging.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd index 98bbc2d8ca..71230d705e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10-staging.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.10.tpd @@ -3,6 +3,6 @@ target "jgit-4.9-staging" with source configurePhase include "projects/jetty-9.4.11.tpd" include "orbit/R20190602212107-2019-06.tpd" -location "http://download.eclipse.org/staging/2018-12/" { +location "http://download.eclipse.org/releases/2018-12/" { org.eclipse.osgi lazy }
\ No newline at end of file diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target index 7820a13581..15ee446805 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.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.5" sequenceNumber="1566229356"> +<target name="jgit-4.5" sequenceNumber="1638575045"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/> @@ -20,7 +20,7 @@ <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/> <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/> <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/> - <repository id="jetty-9.4.11" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605"/> + <repository id="jetty-9.4.11" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.11.v20180605/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target index 997d9c9832..bc1c54f52e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.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.6" sequenceNumber="1566229352"> +<target name="jgit-4.6" sequenceNumber="1638575051"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/> @@ -20,7 +20,7 @@ <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/> <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/> <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/> - <repository id="jetty-9.4.11" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605"/> + <repository id="jetty-9.4.11" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.11.v20180605/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target index 03c9a8b528..596e3c4d04 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.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.7" sequenceNumber="1566229348"> +<target name="jgit-4.7" sequenceNumber="1638575047"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/> @@ -20,7 +20,7 @@ <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/> <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/> <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/> - <repository id="jetty-9.4.11" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605"/> + <repository id="jetty-9.4.11" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.11.v20180605/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target index e29620cc11..a0e0948600 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.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.8" sequenceNumber="1566229344"> +<target name="jgit-4.8" sequenceNumber="1638575042"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/> @@ -20,7 +20,7 @@ <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/> <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/> <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/> - <repository id="jetty-9.4.11" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605"/> + <repository id="jetty-9.4.11" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.11.v20180605/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target index 82a64ce3d5..a4dd92c88c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.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.9" sequenceNumber="1566229339"> +<target name="jgit-4.9" sequenceNumber="1638575042"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/> @@ -20,7 +20,7 @@ <unit id="org.eclipse.jetty.servlet.source" version="9.4.11.v20180605"/> <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/> <unit id="org.eclipse.jetty.util.source" version="9.4.11.v20180605"/> - <repository id="jetty-9.4.11" location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605"/> + <repository id="jetty-9.4.11" location="https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.11.v20180605/"/> </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.apache.ant" version="1.10.5.v20190526-1402"/> @@ -80,7 +80,7 @@ </location> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.osgi" version="0.0.0"/> - <repository location="http://download.eclipse.org/releases/2018-09/"/> + <repository location="https://download.eclipse.org/releases/2018-09/"/> </location> </locations> </target> diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd index d5beea3616..6ee4c6a848 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9.tpd @@ -3,6 +3,6 @@ target "jgit-4.9" with source configurePhase include "projects/jetty-9.4.11.tpd" include "orbit/R20190602212107-2019-06.tpd" -location "http://download.eclipse.org/releases/2018-09/" { +location "https://download.eclipse.org/releases/2018-09/" { org.eclipse.osgi lazy }
\ No newline at end of file diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.11.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.11.tpd index d2fd9017b3..4b4612147c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.11.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-9.4.11.tpd @@ -1,6 +1,6 @@ target "jetty-9.4.11" with source configurePhase -location jetty-9.4.11 "http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.11.v20180605" { +location jetty-9.4.11 "https://archive.eclipse.org/jetty/updates/jetty-bundles-9.x/jetty-bundles-9.x/9.4.11.v20180605/" { org.eclipse.jetty.client [9.4.11.v20180605,9.4.11.v20180605] org.eclipse.jetty.client.source [9.4.11.v20180605,9.4.11.v20180605] org.eclipse.jetty.continuation [9.4.11.v20180605,9.4.11.v20180605] diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index d8d061e36e..35fa738c78 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -55,7 +55,7 @@ <name>JGit Tycho Parent</name> <properties> - <tycho-version>1.3.0</tycho-version> + <tycho-version>1.7.0</tycho-version> <tycho-extras-version>${tycho-version}</tycho-extras-version> <target-platform>jgit-4.6</target-platform> </properties> @@ -255,7 +255,7 @@ <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-jarsigner-plugin</artifactId> - <version>1.1.5</version> + <version>1.3.2</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> |