diff options
281 files changed, 5461 insertions, 6738 deletions
diff --git a/.gitignore b/.gitignore index 6ae94c5a41..03aa51bc30 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ # class files */bin/ -*/target/ +target/ # SWTBot screenshots */screenshots/
\ No newline at end of file diff --git a/DEPENDENCIES b/DEPENDENCIES deleted file mode 100644 index cf6b36d39c..0000000000 --- a/DEPENDENCIES +++ /dev/null @@ -1,326 +0,0 @@ -maven/mavencentral/org.eclipse.egit.feature/org.eclipse.egit.gitflow.feature/6.2.0-SNAPSHOT, EPL-2.0, approved, technology.egit -maven/mavencentral/org.eclipse.egit.feature/org.eclipse.egit.mylyn/6.2.0-SNAPSHOT, EPL-2.0, approved, technology.egit -maven/mavencentral/org.eclipse.egit.feature/org.eclipse.egit.source/6.2.0-SNAPSHOT, EPL-2.0, approved, technology.egit -maven/mavencentral/org.eclipse.egit.feature/org.eclipse.egit/6.2.0-SNAPSHOT, EPL-2.0, approved, technology.egit -maven/mavencentral/org.eclipse.egit/org.eclipse.egit.core.junit/6.2.0-SNAPSHOT, EPL-2.0, approved, technology.egit -maven/mavencentral/org.eclipse.egit/org.eclipse.egit.core/6.2.0-SNAPSHOT, EPL-2.0, approved, technology.egit -maven/mavencentral/org.eclipse.egit/org.eclipse.egit.doc/6.2.0-SNAPSHOT, EPL-2.0, approved, technology.egit -maven/mavencentral/org.eclipse.egit/org.eclipse.egit.gitflow.ui/6.2.0-SNAPSHOT, EPL-2.0, approved, technology.egit -maven/mavencentral/org.eclipse.egit/org.eclipse.egit.gitflow/6.2.0-SNAPSHOT, EPL-2.0, approved, technology.egit -maven/mavencentral/org.eclipse.egit/org.eclipse.egit.mylyn.ui/6.2.0-SNAPSHOT, EPL-2.0, approved, technology.egit -maven/mavencentral/org.eclipse.egit/org.eclipse.egit.ui/6.2.0-SNAPSHOT, EPL-2.0, approved, technology.egit -maven/mavencentral/org.eclipse.egit/org.eclipse.egit/6.2.0-SNAPSHOT, EPL-2.0, approved, technology.egit -p2/orbit/p2.eclipse.feature/org.eclipse.e4.rcp/4.17.0.v20200831-1002, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.feature/org.eclipse.emf.common/2.20.0.v20200822-0801, , approved, eclipse -p2/orbit/p2.eclipse.feature/org.eclipse.emf.ecore/2.23.0.v20200630-0516, , approved, eclipse -p2/orbit/p2.eclipse.feature/org.eclipse.jdt/3.18.500.v20200902-1800, , approved, eclipse -p2/orbit/p2.eclipse.feature/org.eclipse.jgit.gpg.bc/6.2.0.202206062057, , approved, eclipse -p2/orbit/p2.eclipse.feature/org.eclipse.jgit.http.apache/6.2.0.202206062057, , approved, eclipse -p2/orbit/p2.eclipse.feature/org.eclipse.jgit.junit/6.2.0.202206062057, , approved, eclipse -p2/orbit/p2.eclipse.feature/org.eclipse.jgit.ssh.apache/6.2.0.202206062057, , approved, eclipse -p2/orbit/p2.eclipse.feature/org.eclipse.jgit/6.2.0.202206062057, , approved, eclipse -p2/orbit/p2.eclipse.feature/org.eclipse.license/2.0.2.v20181016-2210, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.feature/org.eclipse.mylyn.commons.identity/1.17.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.feature/org.eclipse.mylyn.commons.notifications/1.17.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.feature/org.eclipse.mylyn.commons.repositories/1.17.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.feature/org.eclipse.mylyn.commons/3.25.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.feature/org.eclipse.mylyn.context_feature/3.25.2.v20200828-1617, , approved, eclipse -p2/orbit/p2.eclipse.feature/org.eclipse.mylyn.discovery/3.25.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.feature/org.eclipse.mylyn.monitor/3.25.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.feature/org.eclipse.mylyn.team_feature/3.25.2.v20200828-1617, , approved, eclipse -p2/orbit/p2.eclipse.feature/org.eclipse.mylyn_feature/3.25.2.v20200814-0512, , approved, eclipse -p2/orbit/p2.eclipse.feature/org.eclipse.pde/3.14.500.v20200902-1800, , approved, eclipse -p2/orbit/p2.eclipse.plugin/com.google.gson/2.8.9.v20220111-1409, , approved, orbit -p2/orbit/p2.eclipse.plugin/com.google.guava/21.0.0.v20170206-1425, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ12563 -p2/orbit/p2.eclipse.plugin/com.ibm.icu/67.1.0.v20200706-1749, , approved, orbit -p2/orbit/p2.eclipse.plugin/com.jcraft.jsch/0.1.55.v20190404-1902, BSD-3-Clause, approved, CQ19435 -p2/orbit/p2.eclipse.plugin/com.sun.jna.platform/5.8.0.v20210406-1004, , approved, orbit -p2/orbit/p2.eclipse.plugin/com.sun.jna/5.8.0.v20210503-0343, , approved, orbit -p2/orbit/p2.eclipse.plugin/com.sun.xml.bind/2.2.0.v201505121915, CDDL-1.0, approved, CQ3671 -p2/orbit/p2.eclipse.plugin/jakarta.servlet-api/4.0.0, , approved, eclipse -p2/orbit/p2.eclipse.plugin/javaewah/1.1.13.v20211029-0839, , approved, orbit -p2/orbit/p2.eclipse.plugin/javax.activation/1.1.0.v201211130549, Apache-2.0, approved, CQ2059 -p2/orbit/p2.eclipse.plugin/javax.annotation/1.3.5.v20200504-1837, , approved, orbit -p2/orbit/p2.eclipse.plugin/javax.inject/1.0.0.v20091030, Apache-2.0, approved, CQ3555 -p2/orbit/p2.eclipse.plugin/javax.xml.bind/2.2.0.v201105210648, CDDL-1.0, approved, CQ3670 -p2/orbit/p2.eclipse.plugin/javax.xml.stream/1.0.1.v201004272200, Apache-2.0, approved, CQ1106 -p2/orbit/p2.eclipse.plugin/javax.xml/1.3.4.v201005080400, Apache-2.0 OR LicenseRef-Public-Domain OR W3C, approved, CQ1448 -p2/orbit/p2.eclipse.plugin/net.bytebuddy.byte-buddy-agent/1.9.0.v20181106-1534, Apache-2.0, approved, CQ17978 -p2/orbit/p2.eclipse.plugin/net.bytebuddy.byte-buddy/1.9.0.v20181107-1410, Apache-2.0 AND BSD-3-Clause, approved, CQ17977 -p2/orbit/p2.eclipse.plugin/net.i2p.crypto.eddsa/0.3.0.v20220506-1020, CC0-1.0, approved, CQ22537 -p2/orbit/p2.eclipse.plugin/org.apache.ant/1.10.12.v20211102-1452, , approved, orbit -p2/orbit/p2.eclipse.plugin/org.apache.batik.constants/1.13.0.v20200622-2037, Apache-2.0, approved, CQ22304 -p2/orbit/p2.eclipse.plugin/org.apache.batik.css/1.13.0.v20200622-2037, Apache-2.0, approved, CQ22303 -p2/orbit/p2.eclipse.plugin/org.apache.batik.i18n/1.13.0.v20200622-2037, Apache-2.0, approved, CQ22301 -p2/orbit/p2.eclipse.plugin/org.apache.batik.util/1.13.0.v20200622-2037, Apache-2.0, approved, CQ22302 -p2/orbit/p2.eclipse.plugin/org.apache.commons.codec/1.14.0.v20200818-1422, , approved, orbit -p2/orbit/p2.eclipse.plugin/org.apache.commons.compress/1.21.0.v20211103-2100, , approved, orbit -p2/orbit/p2.eclipse.plugin/org.apache.commons.httpclient/3.1.0.v201012070820, Apache-2.0, approved, CQ1765 -p2/orbit/p2.eclipse.plugin/org.apache.commons.io/2.6.0.v20190123-2029, Apache-2.0, approved, CQ16712 -p2/orbit/p2.eclipse.plugin/org.apache.commons.jxpath/1.3.0.v200911051830, Apache-2.0, approved, CQ10790 -p2/orbit/p2.eclipse.plugin/org.apache.commons.lang/2.6.0.v201404270220, Apache-2.0, approved, CQ6183 -p2/orbit/p2.eclipse.plugin/org.apache.commons.logging/1.2.0.v20180409-1502, Apache-2.0, approved, CQ10162 -p2/orbit/p2.eclipse.plugin/org.apache.felix.gogo.command/1.0.2.v20170914-1324, Apache-2.0, approved, CQ14022 -p2/orbit/p2.eclipse.plugin/org.apache.felix.gogo.runtime/1.1.0.v20180713-1646, Apache-2.0, approved, CQ16863 -p2/orbit/p2.eclipse.plugin/org.apache.felix.gogo.shell/1.1.0.v20180713-1646, Apache-2.0, approved, CQ16862 -p2/orbit/p2.eclipse.plugin/org.apache.felix.scr/2.1.16.v20200110-1820, Apache-2.0 AND MIT, approved, CQ21362 -p2/orbit/p2.eclipse.plugin/org.apache.httpcomponents.httpclient/4.5.13.v20210128-2225, , approved, orbit -p2/orbit/p2.eclipse.plugin/org.apache.httpcomponents.httpcore/4.4.15.v20220209-2345, , approved, orbit -p2/orbit/p2.eclipse.plugin/org.apache.log4j/1.2.19.v20220208-1728, , approved, orbit -p2/orbit/p2.eclipse.plugin/org.apache.lucene.analyzers-common/6.1.0.v20161115-1612, Apache-2.0 OR BSD-2-Clause OR W3C, approved, CQ12060 -p2/orbit/p2.eclipse.plugin/org.apache.lucene.core/6.1.0.v20170814-1820, , approved, CQ12024 -p2/orbit/p2.eclipse.plugin/org.apache.lucene.queryparser/6.1.0.v20161115-1612, Apache-2.0, approved, CQ12063 -p2/orbit/p2.eclipse.plugin/org.apache.sshd.osgi/2.8.0.v20211227-1750, , approved, orbit -p2/orbit/p2.eclipse.plugin/org.apache.sshd.sftp/2.8.0.v20211227-1750, , approved, orbit -p2/orbit/p2.eclipse.plugin/org.apache.xerces/2.9.0.v201101211617, Apache-2.0, approved, CQ1148 -p2/orbit/p2.eclipse.plugin/org.apache.xml.resolver/1.2.0.v201005080400, Apache-2.0, approved, CQ1441 -p2/orbit/p2.eclipse.plugin/org.apache.xml.serializer/2.7.1.v201005080400, Apache-2.0, approved, CQ1443 -p2/orbit/p2.eclipse.plugin/org.apache.xmlgraphics/2.4.0.v20200622-2037, Apache-2.0, approved, CQ22305 -p2/orbit/p2.eclipse.plugin/org.apiguardian/1.1.0.v20190826-0900, EPL-2.0 AND Apache-2.0, approved, CQ20556 -p2/orbit/p2.eclipse.plugin/org.bouncycastle.bcpg/1.70.0.v20220507-1208, , approved, orbit -p2/orbit/p2.eclipse.plugin/org.bouncycastle.bcprov/1.70.0.v20220507-1208, , approved, orbit -p2/orbit/p2.eclipse.plugin/org.eclipse.ant.core/3.5.800.v20200608-1251, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ant.launching/1.2.1000.v20200610-1458, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ant.ui/3.7.900.v20200724-1008, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.compare.core/3.6.900.v20200412-2017, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.compare/3.7.1100.v20200611-0145, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.core.commands/3.9.700.v20191217-1850, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.core.contenttype/3.7.800.v20200724-0804, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.core.databinding.beans/1.7.0.v20200717-1533, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.core.databinding.observable/1.10.0.v20200730-0848, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.core.databinding.property/1.8.100.v20200619-0651, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.core.databinding/1.10.0.v20200815-1752, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.core.expressions/3.7.0.v20200720-1126, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.core.externaltools/1.1.700.v20200416-1310, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.core.filebuffers/3.6.1000.v20200409-1035, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.core.filesystem/1.7.700.v20200110-1734, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.core.jobs/3.10.800.v20200421-0950, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.core.net/1.3.1000.v20200715-0827, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.core.resources/3.13.800.v20200706-2152, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.core.runtime/3.19.0.v20200724-1004, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.core.variables/3.4.800.v20200120-1101, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.debug.core/3.16.0.v20200828-0817, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.debug.ui/3.14.600.v20200828-0817, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.core.commands/0.12.900.v20200110-1732, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.core.contexts/1.8.400.v20191217-1710, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.core.di.annotations/1.6.600.v20191216-2352, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.core.di.extensions.supplier/0.15.700.v20200622-1247, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.core.di.extensions/0.16.0.v20200507-0938, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.core.di/1.7.600.v20200428-0912, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.core.services/2.2.400.v20200622-1247, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.emf.xpath/0.2.800.v20200609-0849, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.bindings/0.12.900.v20200513-0930, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.css.core/0.12.1300.v20200615-1701, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.css.swt.theme/0.12.700.v20200527-0719, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.css.swt/0.13.1100.v20200819-0632, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.di/1.2.800.v20200128-0855, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.dialogs/1.2.0.v20200807-0944, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.ide/3.15.100.v20200323-2111, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.model.workbench/2.1.800.v20200828-0938, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.services/1.3.700.v20190930-1643, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.swt.gtk/1.0.600.v20190627-0755, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.swt.win32/1.0.700.v20200607-1314, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.widgets/1.2.700.v20191222-1048, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.workbench.addons.swt/1.3.1100.v20200703-0611, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.workbench.renderers.swt.cocoa/0.12.600.v20200416-0656, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.workbench.renderers.swt/0.14.1300.v20200829-1411, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.workbench.swt/0.14.1100.v20200619-0644, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.workbench/1.11.400.v20200828-0938, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.e4.ui.workbench3/0.15.400.v20191216-0805, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.emf.common/2.20.0.v20200822-0801, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.emf.ecore.change/2.14.0.v20190528-0725, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.emf.ecore.xmi/2.16.0.v20190528-0725, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.emf.ecore/2.23.0.v20200630-0516, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.app/1.5.0.v20200717-0620, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.bidi/1.3.0.v20200612-1624, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.common/3.13.0.v20200828-1034, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.console/1.4.200.v20200828-1034, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.event/1.5.500.v20200616-0800, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.frameworkadmin.equinox/1.1.400.v20200319-1546, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.frameworkadmin/2.1.400.v20191002-0702, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/1.1.1300.v20200819-0940, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.launcher.gtk.linux.x86_64/1.1.1300.v20200819-0940, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.launcher.win32.win32.x86_64/1.1.1300.v20200819-0940, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.launcher/1.5.800.v20200727-1323, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.p2.artifact.repository/1.3.500.v20200406-2025, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.p2.core/2.6.300.v20200211-1504, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.p2.director.app/1.1.600.v20200511-1530, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.p2.director/2.4.700.v20200511-1530, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.p2.engine/2.6.700.v20200511-1530, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.p2.garbagecollector/1.1.400.v20200221-1022, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.p2.jarprocessor/1.1.600.v20200217-1130, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.p2.metadata.repository/1.3.400.v20191211-1528, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.p2.metadata/2.5.0.v20200511-1530, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.p2.operations/2.5.900.v20200808-1311, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.p2.publisher.eclipse/1.3.700.v20200828-0839, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.p2.publisher/1.5.400.v20200511-1530, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.p2.repository.tools/2.2.500.v20200110-2121, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.p2.repository/2.4.800.v20200813-0739, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.p2.touchpoint.eclipse/2.2.700.v20200813-0739, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.p2.ui/2.6.100.v20200731-1005, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.preferences/3.8.0.v20200422-1833, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.registry/3.9.0.v20200625-1425, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.security.ui/1.2.700.v20200807-1518, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.security/1.3.500.v20200114-1637, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.simpleconfigurator.manipulator/2.1.500.v20200211-1505, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.equinox.simpleconfigurator/1.3.600.v20200721-1308, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.help/3.8.800.v20200525-0755, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.annotation/2.2.600.v20200408-1511, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.apt.core/3.6.700.v20200828-0941, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.apt.pluggable.core/1.2.500.v20200322-1447, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.apt.ui/3.6.500.v20200828-1336, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.compiler.apt/1.3.1100.v20200828-0941, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.compiler.tool/1.2.1000.v20200828-0941, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.core.formatterapp/1.0.0.v20200119-0748, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.core.manipulation/1.14.100.v20200817-2001, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.core/3.23.0.v20200828-0941, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.debug.ui/3.12.0.v20200828-0821, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.debug/3.16.0.v20200828-0821, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.doc.user/3.15.800.v20200828-1432, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.junit.core/3.10.800.v20200817-1957, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.junit.runtime/3.5.300.v20200720-0748, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.junit/3.11.900.v20200828-0853, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.junit4.runtime/1.1.1300.v20200720-0748, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.junit5.runtime/1.0.1000.v20200720-0748, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.launching.macosx/3.4.500.v20200116-2251, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.launching.ui.macosx/1.2.600.v20200204-1737, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.launching/3.18.0.v20200824-1854, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt.ui/3.21.200.v20200828-0853, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jdt/3.18.500.v20200902-1800, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jetty.http/10.0.6, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jetty.io/10.0.6, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jetty.security/10.0.6, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jetty.server/10.0.6, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jetty.servlet/10.0.6, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jetty.util/10.0.6, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jface.databinding/1.12.0.v20200717-1533, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.jface.notifications/0.2.0.v20200810-0826, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.jface.text/3.16.400.v20200807-0831, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.jface/3.21.0.v20200821-1458, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.jgit.archive/6.2.0.202206062009, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jgit.gpg.bc/6.2.0.202206062009, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jgit.http.apache/6.2.0.202206062009, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jgit.http.server/6.2.0.202206062009, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jgit.junit.http/6.2.0.202206062009, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jgit.junit.ssh/6.2.0.202206062009, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jgit.junit/6.2.0.202206062009, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jgit.lfs/6.2.0.202206062009, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jgit.ssh.apache.agent/6.2.0.202206062009, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jgit.ssh.apache/6.2.0.202206062009, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.jgit/6.2.0.202206062009, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.ltk.core.refactoring/3.11.100.v20200720-0748, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ltk.ui.refactoring/3.11.100.v20200817-1715, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.commons.core/3.25.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.commons.identity.core/1.17.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.commons.net/3.25.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.commons.notifications.core/1.17.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.commons.notifications.feed/1.17.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.commons.notifications.ui/1.17.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.commons.repositories.core/1.17.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.commons.repositories.ui/1.17.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.commons.screenshots/3.25.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.commons.ui/3.25.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.commons.workbench/3.25.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.context.core/3.25.2.v20200828-1617, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.context.tasks.ui/3.25.2.v20200828-1617, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.context.ui/3.25.2.v20200828-1617, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.discovery.core/3.25.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.discovery.ui/3.25.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.monitor.core/3.25.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.monitor.ui/3.25.2.v20200813-0821, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.resources.ui/3.25.2.v20200828-1617, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.tasks.core/3.25.2.v20200814-0512, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.tasks.index.core/3.25.2.v20200814-0512, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.tasks.index.ui/3.25.2.v20200814-0512, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.tasks.search/3.25.2.v20200814-0512, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.tasks.ui/3.25.2.v20200814-0512, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.mylyn.team.ui/3.25.2.v20200828-1617, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.osgi.compatibility.state/1.2.100.v20200811-1344, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.osgi.services/3.9.0.v20200511-1725, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.osgi.util/3.5.300.v20190708-1141, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.osgi/3.16.0.v20200828-0759, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.api.tools.annotations/1.1.400.v20190929-1236, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.api.tools.ui/1.2.0.v20200813-0523, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.api.tools/1.2.0.v20200813-0522, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.build/3.10.800.v20200410-1419, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.core/3.14.0.v20200817-1143, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.doc.user/3.14.900.v20200902-1022, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.ds.annotations/1.2.0.v20200813-0526, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.ds.core/1.2.0.v20200813-0526, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.ds.lib/1.1.400.v20191119-0943, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.ds.ui/1.2.0.v20200813-0954, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.ds1_2.lib/1.0.400.v20191119-0943, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.genericeditor.extension/1.1.0.v20200828-0858, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.junit.runtime/3.5.900.v20200810-0835, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.launching/3.9.0.v20200812-1037, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.runtime/3.6.900.v20200612-1330, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.ua.core/1.2.0.v20200813-0518, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.ua.ui/1.2.0.v20200813-0519, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.ui.templates/3.7.0.v20200812-1812, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde.ui/3.12.0.v20200824-1258, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.pde/3.13.1200.v20200902-1800, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.search/3.12.0.v20200727-2017, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.swt.browser.chromium.cocoa.macosx.x86_64/3.115.0.v20200831-1002, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.swt.browser.chromium.gtk.linux.x86_64/3.115.0.v20200831-1002, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.swt.browser.chromium.win32.win32.x86_64/3.115.0.v20200831-1002, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.swt.cocoa.macosx.x86_64/3.115.0.v20200831-1002, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.swt.gtk.linux.x86_64/3.115.0.v20200831-1002, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.swt.win32.win32.x86_64/3.115.0.v20200831-1002, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.swt/3.115.0.v20200831-1002, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.swtbot.eclipse.finder/4.0.0.202206011610, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.swtbot.junit4_x/4.0.0.202206011610, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.swtbot.swt.finder/4.0.0.202206011610, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.team.core/3.8.1100.v20200806-0621, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.team.ui/3.8.1000.v20200806-0621, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.text/3.10.300.v20200807-0831, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.tools.layout.spy/1.0.600.v20200608-0818, , approved, eclipse -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.browser/3.6.900.v20200807-1330, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.cheatsheets/3.7.0.v20200805-2057, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.console/3.9.300.v20200828-0817, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.editors/3.13.300.v20200812-2334, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.externaltools/3.4.800.v20200612-0848, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.forms/3.10.0.v20200727-0948, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.genericeditor/1.1.800.v20200828-1000, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.ide.application/1.3.800.v20200713-0938, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.ide/3.17.200.v20200808-0622, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.intro/3.5.1100.v20200828-0803, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.navigator.resources/3.7.400.v20200722-0751, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.navigator/3.9.400.v20200723-2304, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.trace/1.1.800.v20200106-1301, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.views.log/1.2.1200.v20200828-0938, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.views.properties.tabbed/3.8.1000.v20200609-0849, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.views/3.10.400.v20200611-1719, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.workbench.texteditor/3.15.0.v20200812-2334, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui.workbench/3.120.0.v20200829-1411, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.ui/3.118.0.v20200807-0902, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.eclipse.urischeme/1.1.100.v20200729-2048, EPL-2.0, approved, eclipse.platform -p2/orbit/p2.eclipse.plugin/org.hamcrest.core/1.3.0.v20180420-1519, BSD-2-Clause, approved, CQ7063 -p2/orbit/p2.eclipse.plugin/org.hamcrest.integration/1.3.0.v201305210900, BSD-2-Clause, approved, CQ7219 -p2/orbit/p2.eclipse.plugin/org.hamcrest.library/1.3.0.v20180524-2246, BSD-2-Clause, approved, CQ7219 -p2/orbit/p2.eclipse.plugin/org.hamcrest.text/1.1.0.v20090501071000, BSD-2-Clause, approved, CQ2860 -p2/orbit/p2.eclipse.plugin/org.hamcrest/1.1.0.v20090501071000, BSD-2-Clause, approved, CQ2860 -p2/orbit/p2.eclipse.plugin/org.junit.jupiter.api/5.6.0.v20200203-2009, EPL-2.0, approved, CQ21546 -p2/orbit/p2.eclipse.plugin/org.junit.jupiter.engine/5.6.0.v20200203-2009, EPL-2.0, approved, CQ21546 -p2/orbit/p2.eclipse.plugin/org.junit.jupiter.migrationsupport/5.6.0.v20200203-2009, EPL-2.0, approved, CQ21546 -p2/orbit/p2.eclipse.plugin/org.junit.jupiter.params/5.6.0.v20200203-2009, EPL-2.0, approved, CQ21546 -p2/orbit/p2.eclipse.plugin/org.junit.platform.commons/1.6.0.v20200203-2009, EPL-2.0, approved, CQ21546 -p2/orbit/p2.eclipse.plugin/org.junit.platform.engine/1.6.0.v20200203-2009, EPL-2.0, approved, CQ21546 -p2/orbit/p2.eclipse.plugin/org.junit.platform.launcher/1.6.0.v20200203-2009, EPL-2.0, approved, CQ21546 -p2/orbit/p2.eclipse.plugin/org.junit.platform.runner/1.6.0.v20200203-2009, EPL-2.0, approved, CQ21546 -p2/orbit/p2.eclipse.plugin/org.junit.platform.suite.api/1.6.0.v20200203-2009, EPL-2.0, approved, CQ21546 -p2/orbit/p2.eclipse.plugin/org.junit.vintage.engine/5.6.0.v20200203-2009, EPL-2.0, approved, CQ21546 -p2/orbit/p2.eclipse.plugin/org.junit/4.13.0.v20200204-1500, EPL-1.0, approved, CQ21439 -p2/orbit/p2.eclipse.plugin/org.junit/4.13.2.v20211018-1956, , approved, orbit -p2/orbit/p2.eclipse.plugin/org.mockito/2.23.0.v20200310-1642, MIT, approved, CQ17976 -p2/orbit/p2.eclipse.plugin/org.objectweb.asm.tree/8.0.1.v20200420-1007, BSD-3-Clause, approved, CQ21853 -p2/orbit/p2.eclipse.plugin/org.objectweb.asm/8.0.1.v20200420-1007, BSD-3-Clause, approved, #1989 -p2/orbit/p2.eclipse.plugin/org.objenesis/2.6.0.v20180420-1519, Apache-2.0, approved, CQ15482 -p2/orbit/p2.eclipse.plugin/org.opentest4j/1.2.0.v20190826-0900, EPL-2.0 AND Apache-2.0, approved, CQ20556 -p2/orbit/p2.eclipse.plugin/org.sat4j.core/2.3.5.v201308161310, EPL-1.0, approved, CQ7311 -p2/orbit/p2.eclipse.plugin/org.sat4j.pb/2.3.5.v201404071733, EPL-1.0, approved, CQ7311 -p2/orbit/p2.eclipse.plugin/org.slf4j.api/1.7.30.v20200204-2150, , approved, orbit -p2/orbit/p2.eclipse.plugin/org.tukaani.xz/1.9.0.v20210624-1259, , approved, orbit -p2/orbit/p2.eclipse.plugin/org.w3c.css.sac/1.3.1.v200903091627, Apache-2.0 OR LicenseRef-Public-Domain OR W3C, approved, CQ1448 -p2/orbit/p2.eclipse.plugin/org.w3c.dom.events/3.0.0.draft20060413_v201105210656, Apache-2.0, approved, CQ208 -p2/orbit/p2.eclipse.plugin/org.w3c.dom.smil/1.0.1.v200903091627, Apache-2.0 OR LicenseRef-Public-Domain OR W3C, approved, CQ1448 -p2/orbit/p2.eclipse.plugin/org.w3c.dom.svg/1.1.0.v201011041433, Apache-2.0, approved, CQ208 @@ -20,10 +20,6 @@ This package is composed of the following major components. branching model. - __org.eclipse.egit.gitflow.ui__: bundle implementing a user interface for the gitflow branching model. -- __org.eclipse.egit.mylyn__: bundle integrating _EGit_ with _Eclipse Mylyn_ - which provides integration for Eclipse with task tracking systems. -- __org.eclipse.egit.mylyn.ui__: bundle integrating _EGit_ user interface with - _Eclipse Mylyn_ task based user interface. - __org.eclipse.egit.target__: Eclipse target platform providing EGit 3rd party dependencies for the build and for running EGit in Eclipse workspace. @@ -37,7 +33,6 @@ This package is composed of the following major components. - __org.eclipse.egit.core.junit__: Reusable classes used by _EGit_ tests - __org.eclipse.egit.core.test__: Unit tests for org.eclipse.egit.core. - __org.eclipse.egit.gitflow.test__: Unit tests for org.eclipse.egit.gitflow. -- __org.eclipse.egit.mylyn.ui.test__: UI tests for org.eclipse.egit.mylyn.ui. - __org.eclipse.egit.ui.importer.test__: UI tests for org.eclipse.egit.ui.smartimport. - __org.eclipse.egit.ui.test__: UI tests for org.eclipse.egit.ui. @@ -49,8 +44,6 @@ This package is composed of the following major components. implementation bundles - __org.eclipse.egit.gitflow-feature__: Eclipse feature for installing the optional gitflow bundle. -- __org.eclipse.egit.mylyn-feature__: Eclipse feature for installing the EGit - task based interface integration. - __org.eclipse.egit.repository__: Definitions for the EGit p2 repository which can be used to install and upgrade EGit, includes all the features and plugins from the JGit p2 repository. @@ -10,9 +10,6 @@ <project reference="1.0,https://git.eclipse.org/r/egit/egit,master,org.eclipse.egit.gitflow"/> <project reference="1.0,https://git.eclipse.org/r/egit/egit,master,org.eclipse.egit.gitflow-feature"/> <project reference="1.0,https://git.eclipse.org/r/egit/egit,master,org.eclipse.egit.gitflow.ui"/> -<project reference="1.0,https://git.eclipse.org/r/egit/egit,master,org.eclipse.egit.mylyn-feature"/> -<project reference="1.0,https://git.eclipse.org/r/egit/egit,master,org.eclipse.egit.mylyn.ui"/> -<project reference="1.0,https://git.eclipse.org/r/egit/egit,master,org.eclipse.egit.mylyn.ui.test"/> <project reference="1.0,https://git.eclipse.org/r/egit/egit,master,org.eclipse.egit.repository"/> <project reference="1.0,https://git.eclipse.org/r/egit/egit,master,org.eclipse.egit.source-feature"/> <project reference="1.0,https://git.eclipse.org/r/egit/egit,master,org.eclipse.egit.target"/> diff --git a/org.eclipse.egit-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit-feature/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit-feature/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit-feature/feature.properties b/org.eclipse.egit-feature/feature.properties index 9233b2a4bb..e186b9eca6 100644 --- a/org.eclipse.egit-feature/feature.properties +++ b/org.eclipse.egit-feature/feature.properties @@ -19,7 +19,7 @@ description=Versioning with Git, integration with Gerrit, Gitflow, and Task repo # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2005, 2021 Shawn Pearce, Robin Rosenberg, et.al.\n\ +Copyright (c) 2005, 2023 Shawn Pearce, Robin Rosenberg, et.al.\n\ All rights reserved. This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License 2.0\n\ which accompanies this distribution, and is available at\n\ diff --git a/org.eclipse.egit-feature/feature.xml b/org.eclipse.egit-feature/feature.xml index 0db787bad5..231ee0671c 100644 --- a/org.eclipse.egit-feature/feature.xml +++ b/org.eclipse.egit-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.egit" label="%featureName" - version="6.3.0.qualifier" + version="6.8.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit" license-feature="org.eclipse.license" @@ -37,10 +37,10 @@ <import plugin="org.eclipse.compare" version="3.6.0" match="compatible"/> <import plugin="org.eclipse.core.net" version="1.3.0" match="compatible"/> <import plugin="org.eclipse.team.core" version="3.8.0" match="compatible"/> - <import feature="org.eclipse.jgit" version="6.3.0" match="equivalent"/> - <import feature="org.eclipse.jgit.gpg.bc" version="6.3.0" match="equivalent"/> - <import feature="org.eclipse.jgit.http.apache" version="6.3.0" match="equivalent"/> - <import feature="org.eclipse.jgit.ssh.apache" version="6.3.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="6.8.0" match="equivalent"/> + <import feature="org.eclipse.jgit.gpg.bc" version="6.8.0" match="equivalent"/> + <import feature="org.eclipse.jgit.http.apache" version="6.8.0" match="equivalent"/> + <import feature="org.eclipse.jgit.ssh.apache" version="6.8.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.egit-feature/pom.xml b/org.eclipse.egit-feature/pom.xml index cc6806f10a..c872bd042f 100644 --- a/org.eclipse.egit-feature/pom.xml +++ b/org.eclipse.egit-feature/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> + <version>6.8.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.egit.feature</groupId> diff --git a/org.eclipse.egit.core.junit/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit.core.junit/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit.core.junit/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit.core.junit/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.core.junit/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit.core.junit/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit.core.junit/.settings/org.eclipse.pde.prefs b/org.eclipse.egit.core.junit/.settings/org.eclipse.pde.prefs index caeaa5a45b..b2aecffcfa 100644 --- a/org.eclipse.egit.core.junit/.settings/org.eclipse.pde.prefs +++ b/org.eclipse.egit.core.junit/.settings/org.eclipse.pde.prefs @@ -25,7 +25,7 @@ compilers.p.service.component.without.lazyactivation=1 compilers.p.unknown-attribute=1 compilers.p.unknown-class=1 compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 +compilers.p.unknown-identifier=0 compilers.p.unknown-resource=1 compilers.p.unresolved-ex-points=0 compilers.p.unresolved-import=0 diff --git a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF index b597b8380b..4c3c925e8a 100644 --- a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF @@ -4,26 +4,26 @@ Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.egit.core.junit Bundle-SymbolicName: org.eclipse.egit.core.junit -Bundle-Version: 6.3.0.qualifier -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)", - org.eclipse.core.filesystem;bundle-version="[1.7.700,2.0.0)", - org.eclipse.core.resources;bundle-version="[3.13.800,4.0.0)", - org.eclipse.jdt.core;bundle-version="[3.23.0,4.0.0)", - org.eclipse.jdt.launching;bundle-version="[3.18.0,4.0.0)", +Bundle-Version: 6.8.0.qualifier +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.9.500,2.0.0)", + org.eclipse.core.resources;bundle-version="[3.18.100,4.0.0)", + org.eclipse.jdt.core;bundle-version="[3.32.0,4.0.0)", + org.eclipse.jdt.launching;bundle-version="[3.19.800,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)" -Import-Package: org.eclipse.egit.core;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.op;version="[6.3.0,6.4.0)", - org.eclipse.jgit.api;version="[6.3.0,6.4.0)", - org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)", - org.eclipse.jgit.dircache;version="[6.3.0,6.4.0)", - org.eclipse.jgit.errors;version="[6.3.0,6.4.0)", - org.eclipse.jgit.junit;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lib;version="[6.3.0,6.4.0)", - org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)", - org.eclipse.jgit.storage.file;version="[6.3.0,6.4.0)", - org.eclipse.jgit.transport;version="[6.3.0,6.4.0)", - org.eclipse.jgit.treewalk;version="[6.3.0,6.4.0)", - org.eclipse.jgit.util;version="[6.3.0,6.4.0)" +Import-Package: org.eclipse.egit.core;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.op;version="[6.8.0,6.9.0)", + org.eclipse.jgit.api;version="[6.8.0,6.9.0)", + org.eclipse.jgit.api.errors;version="[6.8.0,6.9.0)", + org.eclipse.jgit.dircache;version="[6.8.0,6.9.0)", + org.eclipse.jgit.errors;version="[6.8.0,6.9.0)", + org.eclipse.jgit.junit;version="[6.8.0,6.9.0)", + org.eclipse.jgit.lib;version="[6.8.0,6.9.0)", + org.eclipse.jgit.revwalk;version="[6.8.0,6.9.0)", + org.eclipse.jgit.storage.file;version="[6.8.0,6.9.0)", + org.eclipse.jgit.transport;version="[6.8.0,6.9.0)", + org.eclipse.jgit.treewalk;version="[6.8.0,6.9.0)", + org.eclipse.jgit.util;version="[6.8.0,6.9.0)" Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.egit.core.test;version="6.3.0";x-friends:="org.eclipse.egit.core.test,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.test" +Export-Package: org.eclipse.egit.core.test;version="6.8.0";x-friends:="org.eclipse.egit.core.test,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.test" Bundle-Localization: plugin diff --git a/org.eclipse.egit.core.junit/pom.xml b/org.eclipse.egit.core.junit/pom.xml index bae794555a..58bae75f05 100644 --- a/org.eclipse.egit.core.junit/pom.xml +++ b/org.eclipse.egit.core.junit/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> + <version>6.8.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.core.junit</artifactId> diff --git a/org.eclipse.egit.core.test/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit.core.test/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit.core.test/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit.core.test/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.core.test/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit.core.test/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit.core.test/.settings/org.eclipse.pde.prefs b/org.eclipse.egit.core.test/.settings/org.eclipse.pde.prefs index caeaa5a45b..b2aecffcfa 100644 --- a/org.eclipse.egit.core.test/.settings/org.eclipse.pde.prefs +++ b/org.eclipse.egit.core.test/.settings/org.eclipse.pde.prefs @@ -25,7 +25,7 @@ compilers.p.service.component.without.lazyactivation=1 compilers.p.unknown-attribute=1 compilers.p.unknown-class=1 compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 +compilers.p.unknown-identifier=0 compilers.p.unknown-resource=1 compilers.p.unresolved-ex-points=0 compilers.p.unresolved-import=0 diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF index efb0a899e8..1cc46d7ae1 100644 --- a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF @@ -5,28 +5,29 @@ Bundle-Vendor: Eclipse.org Automatic-Module-Name: org.eclipse.egit.core.test Bundle-SymbolicName: org.eclipse.egit.core.test;singleton:=true Fragment-Host: org.eclipse.egit.core -Bundle-Version: 6.3.0.qualifier -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)", - org.eclipse.core.filesystem;bundle-version="[1.7.700,2.0.0)", - org.eclipse.core.resources;bundle-version="[3.13.800,4.0.0)", - org.eclipse.team.core;bundle-version="[3.8.1100,4.0.0)", - org.eclipse.jdt.core;bundle-version="[3.23.0,4.0.0)", +Bundle-Version: 6.8.0.qualifier +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.9.500,2.0.0)", + org.eclipse.core.resources;bundle-version="[3.18.100,4.0.0)", + org.eclipse.team.core;bundle-version="[3.9.600,4.0.0)", + org.eclipse.jdt.core;bundle-version="[3.32.0,4.0.0)", org.junit;bundle-version="[4.13.0,5.0.0)", - org.eclipse.egit.core.junit;bundle-version="[6.3.0,6.4.0)", + org.eclipse.egit.core.junit;bundle-version="[6.8.0,6.9.0)", + org.hamcrest.core;bundle-version="[1.3.0,2.0.0)", org.hamcrest.library;bundle-version="[1.3.0,2.0.0)" Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)", net.bytebuddy.agent;version="[1.7.9,2.0.0)", - org.eclipse.egit.core;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.op;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.project;version="[6.3.0,6.4.0)", - org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)", - org.eclipse.jgit.attributes;version="[6.3.0,6.4.0)", - org.eclipse.jgit.junit;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lib;version="[6.3.0,6.4.0)", - org.eclipse.jgit.treewalk;version="[6.3.0,6.4.0)", - org.eclipse.jgit.treewalk.filter;version="[6.3.0,6.4.0)", - org.eclipse.jgit.util;version="[6.3.0,6.4.0)", - org.mockito;version="[2.13.0,3.0.0)", - org.mockito.junit;version="[2.13.0,3.0.0)", - org.mockito.stubbing;version="[2.13.0,3.0.0)" + org.eclipse.egit.core;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.op;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.project;version="[6.8.0,6.9.0)", + org.eclipse.jgit.api.errors;version="[6.8.0,6.9.0)", + org.eclipse.jgit.attributes;version="[6.8.0,6.9.0)", + org.eclipse.jgit.junit;version="[6.8.0,6.9.0)", + org.eclipse.jgit.lib;version="[6.8.0,6.9.0)", + org.eclipse.jgit.treewalk;version="[6.8.0,6.9.0)", + org.eclipse.jgit.treewalk.filter;version="[6.8.0,6.9.0)", + org.eclipse.jgit.util;version="[6.8.0,6.9.0)", + org.mockito;version="[5.4.0,6.0.0)", + org.mockito.junit;version="[5.4.0,6.0.0)", + org.mockito.stubbing;version="[5.4.0,6.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml index f08958f8d8..6c8bd6d477 100644 --- a/org.eclipse.egit.core.test/pom.xml +++ b/org.eclipse.egit.core.test/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> + <version>6.8.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.core.test</artifactId> diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/ReportingTypedConfigGetterTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/ReportingTypedConfigGetterTest.java new file mode 100644 index 0000000000..797790388e --- /dev/null +++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/ReportingTypedConfigGetterTest.java @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (C) 2023 Thomas Wolf <twolf@apache.org> + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ +package org.eclipse.egit.core.internal; + +import static org.junit.Assert.assertNull; + +import org.eclipse.jgit.lib.BranchConfig; +import org.eclipse.jgit.lib.Config; +import org.junit.Test; + +public class ReportingTypedConfigGetterTest { + + private final ReportingTypedConfigGetter getter = new ReportingTypedConfigGetter(); + + @Test + public void testGetEnumInvalidWithNullDefault() { + Config cfg = new Config(); + cfg.setString("test", null, "wrongOnPurpose", "nonexisting"); + BranchConfig.BranchRebaseMode value = getter.getEnum(cfg, + BranchConfig.BranchRebaseMode.values(), + "test", null, "wrongOnPurpose", null); + assertNull(value); + } +} diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheTest.java index 1d82ed6734..31d813fe41 100644 --- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheTest.java +++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffCacheTest.java @@ -13,13 +13,13 @@ package org.eclipse.egit.core.internal.indexdiff; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItem; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.OutputStream; -import java.nio.file.Files; +import java.io.ByteArrayInputStream; import java.util.concurrent.Callable; -import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import org.eclipse.core.resources.IFile; @@ -42,7 +42,7 @@ public class IndexDiffCacheTest extends GitTestCase { Repository repository; - private AtomicBoolean listenerCalled; + private AtomicInteger listenerCalled; private AtomicReference<IndexDiffData> indexDiffDataResult; @@ -54,13 +54,13 @@ public class IndexDiffCacheTest extends GitTestCase { super.setUp(); testRepository = new TestRepository(gitDir); repository = testRepository.getRepository(); - listenerCalled = new AtomicBoolean(false); + listenerCalled = new AtomicInteger(0); indexDiffDataResult = new AtomicReference<>(null); indexDiffListener = new IndexDiffChangedListener() { @Override public void indexDiffChanged(Repository repo, IndexDiffData indexDiffData) { - listenerCalled.set(true); + listenerCalled.incrementAndGet(); indexDiffDataResult.set(indexDiffData); } }; @@ -81,9 +81,10 @@ public class IndexDiffCacheTest extends GitTestCase { new ConnectProviderOperation(project.project, repository.getDirectory()) .execute(null); // create first commit containing a dummy file - testRepository - .createInitialCommit("testBranchOperation\n\nfirst commit\n"); prepareCacheEntry(); + listenerCalled.set(0); + testRepository + .createInitialCommit("testAddingAFile\n\nfirst commit\n"); waitForListenerCalled(); final String fileName = "aFile"; // This call should trigger an indexDiffChanged event (triggered via @@ -109,7 +110,11 @@ public class IndexDiffCacheTest extends GitTestCase { public void testAddFileFromUntrackedFolder() throws Exception { testRepository.connect(project.project); testRepository.addToIndex(project.project); - testRepository.createInitialCommit("testAddFileFromUntrackedFolder\n\nfirst commit\n"); + prepareCacheEntry(); + listenerCalled.set(0); + testRepository.createInitialCommit( + "testAddFileFromUntrackedFolder\n\nfirst commit\n"); + waitForListenerCalled(); IFile[] fileA = { null }; runInWorkspace(() -> { @@ -121,8 +126,6 @@ public class IndexDiffCacheTest extends GitTestCase { return null; }); - prepareCacheEntry(); - IndexDiffData data1 = waitForListenerCalled(); assertThat(data1.getUntrackedFolders(), hasItem("Project-1/folder/")); @@ -146,8 +149,10 @@ public class IndexDiffCacheTest extends GitTestCase { return null; }); testRepository.addToIndex(project.project); - testRepository.createInitialCommit("testAddFileInIgnoredFolder\n\nfirst commit\n"); prepareCacheEntry(); + listenerCalled.set(0); + testRepository + .createInitialCommit("testAddIgnoredFolder\n\nfirst commit\n"); IndexDiffData data1 = waitForListenerCalled(); assertThat(data1.getIgnoredNotInIndex(), hasItem("Project-1/ignore")); @@ -179,8 +184,9 @@ public class IndexDiffCacheTest extends GitTestCase { return null; }); testRepository.addToIndex(project.project); - testRepository.createInitialCommit("testRemoveIgnoredFile\n\nfirst commit\n"); IndexDiffCacheEntry entry = prepareCacheEntry(); + listenerCalled.set(0); + testRepository.createInitialCommit("testRemoveIgnoredFile\n\nfirst commit\n"); IndexDiffData data1 = waitForListenerCalled(); assertThat(data1.getIgnoredNotInIndex(), hasItem("Project-1/sub/ignore")); @@ -210,9 +216,11 @@ public class IndexDiffCacheTest extends GitTestCase { return null; }); testRepository.addToIndex(project.project); - testRepository - .createInitialCommit("testRemoveIgnoredFile\n\nfirst commit\n"); prepareCacheEntry(); + listenerCalled.set(0); + testRepository + .createInitialCommit( + "testAddAndRemoveGitIgnoreFileToIgnoredDir\n\nfirst commit\n"); IndexDiffData data1 = waitForListenerCalled(); assertThat(data1.getIgnoredNotInIndex(), @@ -247,9 +255,11 @@ public class IndexDiffCacheTest extends GitTestCase { return null; }); testRepository.addToIndex(project.project); - testRepository - .createInitialCommit("testRemoveIgnoredFile\n\nfirst commit\n"); prepareCacheEntry(); + listenerCalled.set(0); + testRepository + .createInitialCommit( + "testAddAndRemoveFileToIgnoredDir\n\nfirst commit\n"); IndexDiffData data1 = waitForListenerCalled(); assertThat(data1.getIgnoredNotInIndex(), hasItem("Project-1/sub")); @@ -273,19 +283,20 @@ public class IndexDiffCacheTest extends GitTestCase { return null; }); testRepository.addToIndex(project.project); - testRepository - .createInitialCommit("testRemoveIgnoredFile\n\nfirst commit\n"); prepareCacheEntry(); + listenerCalled.set(0); + testRepository + .createInitialCommit( + "testModifyFileInIgnoredDir\n\nfirst commit\n"); IndexDiffData data1 = waitForListenerCalled(); assertThat(data1.getIgnoredNotInIndex(), hasItem("Project-1/sub/ignore")); IFile file = project.getProject().getFile("sub/ignore"); - try (OutputStream str = Files - .newOutputStream((file.getLocation().toFile().toPath()))) { - str.write("other contents".getBytes("UTF-8")); - } + file.setContents( + new ByteArrayInputStream("other contents".getBytes("UTF-8")), 0, + null); // no job should be triggered for that change. waitForListenerNotCalled(); @@ -303,7 +314,7 @@ public class IndexDiffCacheTest extends GitTestCase { } private IndexDiffCacheEntry prepareCacheEntry() { - listenerCalled.set(false); + listenerCalled.set(0); indexDiffDataResult.set(null); IndexDiffCache.INSTANCE.addIndexDiffChangedListener(indexDiffListener); @@ -315,23 +326,24 @@ public class IndexDiffCacheTest extends GitTestCase { private IndexDiffData waitForListenerCalled() throws InterruptedException { long time = 0; - while (!listenerCalled.get() && time < 60000) { + while (listenerCalled.get() == 0 && time < 60000) { Thread.sleep(100); time += 100; } - assertTrue("indexDiffChanged was not called after " + time + " ms", listenerCalled.get()); - listenerCalled.set(false); + assertTrue("indexDiffChanged was not called after " + time + " ms", + listenerCalled.get() > 0); + listenerCalled.set(0); return indexDiffDataResult.get(); } private void waitForListenerNotCalled() throws InterruptedException { long time = 0; - while (!listenerCalled.get() && time < 1000) { + while (listenerCalled.get() == 0 && time < 1000) { Thread.sleep(100); time += 100; } - assertTrue("indexDiffChanged was called where it shouldn't have been", - !listenerCalled.get()); + assertEquals("indexDiffChanged was called where it shouldn't have been", + 0, listenerCalled.get()); } } diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantComparatorTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantComparatorTest.java index d802a7729f..40a3422579 100644 --- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantComparatorTest.java +++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantComparatorTest.java @@ -13,7 +13,7 @@ package org.eclipse.egit.core.synchronize; import static org.eclipse.jgit.lib.Constants.HEAD; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriberTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriberTest.java index 0df6f2a03a..0df6f2a03a 100755..100644 --- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriberTest.java +++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriberTest.java diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CreatePatchOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CreatePatchOperationTest.java index 87ee0ef8f3..d27a3ff259 100644 --- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CreatePatchOperationTest.java +++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/CreatePatchOperationTest.java @@ -15,6 +15,7 @@ import static org.junit.Assert.assertNotNull; import java.io.File; +import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; @@ -344,6 +345,11 @@ project.getProject(), // setup workspace testRepository.addToIndex(project.getProject().findMember(".classpath")); testRepository.addToIndex(project.getProject().findMember(".project")); + IResource settings = project.getProject() + .findMember(".settings/org.eclipse.core.resources.prefs"); + if (settings != null) { + testRepository.addToIndex(settings); + } testRepository.commit("commit all"); testRepository.appendFileContent(file, "another line\n"); File newFile = testRepository.createFile(project.getProject(), "new-file"); diff --git a/org.eclipse.egit.core/.options b/org.eclipse.egit.core/.options index 09d0a6fd01..e01c7f58c6 100644 --- a/org.eclipse.egit.core/.options +++ b/org.eclipse.egit.core/.options @@ -8,3 +8,5 @@ org.eclipse.egit.core/debug/core/gpg = false org.eclipse.egit.core/debug/core/indexdiffcache = false # Trace location for ResourceRefreshJob org.eclipse.egit.core/debug/core/refresh = false +# Trace location to enable the EGit progress monitor to show timings +org.eclipse.egit.core/performance = false diff --git a/org.eclipse.egit.core/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit.core/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit.core/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit.core/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.core/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit.core/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF index 6982bbf768..27a31a7a8a 100644 --- a/org.eclipse.egit.core/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.core/META-INF/MANIFEST.MF @@ -3,98 +3,94 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.core Bundle-SymbolicName: org.eclipse.egit.core;singleton:=true -Bundle-Version: 6.3.0.qualifier +Bundle-Version: 6.8.0.qualifier Bundle-Activator: org.eclipse.egit.core.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)", - org.eclipse.team.core;bundle-version="[3.8.1100,4.0.0)", - org.eclipse.core.resources;bundle-version="[3.13.800,4.0.0)", - org.eclipse.core.filesystem;bundle-version="[1.7.700,2.0.0)", - org.eclipse.equinox.security;bundle-version="[1.3.500,2.0.0)", - org.eclipse.core.variables;bundle-version="[3.4.800,4.0.0)", - org.eclipse.core.filebuffers;bundle-version="[3.6.1000,4.0.0)", - org.eclipse.osgi.services;bundle-version="[3.9.0,4.0.0)" -Export-Package: org.eclipse.egit.core;version="6.3.0"; +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", + org.eclipse.team.core;bundle-version="[3.9.600,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.18.100,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.9.500,2.0.0)", + org.eclipse.equinox.security;bundle-version="[1.3.1000,2.0.0)", + org.eclipse.core.variables;bundle-version="[3.5.100,4.0.0)", + org.eclipse.core.filebuffers;bundle-version="[3.7.200,4.0.0)", + org.eclipse.osgi.services;bundle-version="[3.11.100,4.0.0)" +Export-Package: org.eclipse.egit.core;version="6.8.0"; x-friends:="org.eclipse.egit.ui, org.eclipse.egit.ui.test, - org.eclipse.egit.mylyn.ui, org.eclipse.egit.gitflow.test, org.eclipse.egit.gitflow.ui, - org.eclipse.mylyn.github.ui, - org.eclipse.mylyn.github.core, org.eclipse.egit.core.junit", - org.eclipse.egit.core.attributes;version="6.3.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.credentials;version="6.3.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.info;version="6.3.0";uses:="org.eclipse.jgit.lib", - org.eclipse.egit.core.internal;version="6.3.0"; + org.eclipse.egit.core.attributes;version="6.8.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.credentials;version="6.8.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.info;version="6.8.0";uses:="org.eclipse.jgit.lib", + org.eclipse.egit.core.internal;version="6.8.0"; x-friends:="org.eclipse.egit.ui, org.eclipse.egit.import, org.eclipse.egit.gitflow.ui, - org.eclipse.egit.gitflow, - org.eclipse.egit.mylyn.ui", - org.eclipse.egit.core.internal.credentials;version="6.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.efs;version="6.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.gerrit;version="6.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.hosts;version="6.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.indexdiff;version="6.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.internal.info;version="6.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.job;version="6.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", - org.eclipse.egit.core.internal.rebase;version="6.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.signing;version="6.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.internal.start;version="6.3.0";x-internal:=true, - org.eclipse.egit.core.internal.storage;version="6.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", - org.eclipse.egit.core.internal.trace;version="6.3.0";x-internal:=true, - org.eclipse.egit.core.internal.util;version="6.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.op;version="6.3.0"; + org.eclipse.egit.gitflow", + org.eclipse.egit.core.internal.credentials;version="6.8.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.efs;version="6.8.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.gerrit;version="6.8.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.hosts;version="6.8.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.indexdiff;version="6.8.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.internal.info;version="6.8.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.job;version="6.8.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.gitflow.ui,org.eclipse.egit.gitflow", + org.eclipse.egit.core.internal.rebase;version="6.8.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.signing;version="6.8.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.internal.start;version="6.8.0";x-internal:=true, + org.eclipse.egit.core.internal.storage;version="6.8.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.core.test", + org.eclipse.egit.core.internal.trace;version="6.8.0";x-internal:=true, + org.eclipse.egit.core.internal.util;version="6.8.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.op;version="6.8.0"; x-friends:="org.eclipse.egit.ui.test, org.eclipse.egit.ui, org.eclipse.egit.gitflow, org.eclipse.egit.gitflow.test, org.eclipse.egit.gitflow.ui, org.eclipse.egit.github.core, - org.eclipse.mylyn.github.ui, org.eclipse.egit.core.junit", - org.eclipse.egit.core.project;version="6.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.core.revisions;version="6.3.0", - org.eclipse.egit.core.settings;version="6.3.0", - org.eclipse.egit.core.storage;version="6.3.0"; + org.eclipse.egit.core.project;version="6.8.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.core.revisions;version="6.8.0", + org.eclipse.egit.core.settings;version="6.8.0", + org.eclipse.egit.core.storage;version="6.8.0"; uses:="org.eclipse.core.runtime, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.core.resources", - org.eclipse.egit.core.synchronize;version="6.3.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", - org.eclipse.egit.core.synchronize.dto;version="6.3.0";x-friends:="org.eclipse.egit.ui", - org.eclipse.egit.core.util;version="6.3.0" + org.eclipse.egit.core.synchronize;version="6.8.0";x-friends:="org.eclipse.egit.ui,org.eclipse.egit.ui.test", + org.eclipse.egit.core.synchronize.dto;version="6.8.0";x-friends:="org.eclipse.egit.ui", + org.eclipse.egit.core.util;version="6.8.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.core.net.proxy;bundle-version="[1.3.1000,2.0.0)", - org.eclipse.jgit.annotations;version="[6.3.0,6.4.0)", - org.eclipse.jgit.api;version="[6.3.0,6.4.0)", - org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)", - org.eclipse.jgit.attributes;version="[6.3.0,6.4.0)", - org.eclipse.jgit.diff;version="[6.3.0,6.4.0)", - org.eclipse.jgit.dircache;version="[6.3.0,6.4.0)", - org.eclipse.jgit.errors;version="[6.3.0,6.4.0)", - org.eclipse.jgit.events;version="[6.3.0,6.4.0)", - org.eclipse.jgit.gpg.bc;version="[6.3.0,6.4.0)", - org.eclipse.jgit.internal.storage.file;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lfs;version="[6.3.0,6.4.0)";resolution:=optional, - org.eclipse.jgit.lib;version="[6.3.0,6.4.0)", - org.eclipse.jgit.merge;version="[6.3.0,6.4.0)", - org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)", - org.eclipse.jgit.revwalk.filter;version="[6.3.0,6.4.0)", - org.eclipse.jgit.storage.file;version="[6.3.0,6.4.0)", - org.eclipse.jgit.submodule;version="[6.3.0,6.4.0)", - org.eclipse.jgit.transport;version="[6.3.0,6.4.0)", - org.eclipse.jgit.transport.http;version="[6.3.0,6.4.0)", - org.eclipse.jgit.transport.http.apache;version="[6.3.0,6.4.0)", - org.eclipse.jgit.transport.sshd;version="[6.3.0,6.4.0)", - org.eclipse.jgit.transport.sshd.agent;version="[6.3.0,6.4.0)", - org.eclipse.jgit.treewalk;version="[6.3.0,6.4.0)", - org.eclipse.jgit.treewalk.filter;version="[6.3.0,6.4.0)", - org.eclipse.jgit.util;version="[6.3.0,6.4.0)", - org.eclipse.jgit.util.io;version="[6.3.0,6.4.0)" +Import-Package: org.bouncycastle.pkcs;version="[1.69,2)", + org.eclipse.core.net.proxy;bundle-version="[1.3.1000,2.0.0)", + org.eclipse.jgit.annotations;version="[6.8.0,6.9.0)", + org.eclipse.jgit.api;version="[6.8.0,6.9.0)", + org.eclipse.jgit.api.errors;version="[6.8.0,6.9.0)", + org.eclipse.jgit.attributes;version="[6.8.0,6.9.0)", + org.eclipse.jgit.diff;version="[6.8.0,6.9.0)", + org.eclipse.jgit.dircache;version="[6.8.0,6.9.0)", + org.eclipse.jgit.errors;version="[6.8.0,6.9.0)", + org.eclipse.jgit.events;version="[6.8.0,6.9.0)", + org.eclipse.jgit.gpg.bc;version="[6.8.0,6.9.0)", + org.eclipse.jgit.internal.storage.file;version="[6.8.0,6.9.0)", + org.eclipse.jgit.lfs;version="[6.8.0,6.9.0)";resolution:=optional, + org.eclipse.jgit.lib;version="[6.8.0,6.9.0)", + org.eclipse.jgit.merge;version="[6.8.0,6.9.0)", + org.eclipse.jgit.revwalk;version="[6.8.0,6.9.0)", + org.eclipse.jgit.revwalk.filter;version="[6.8.0,6.9.0)", + org.eclipse.jgit.storage.file;version="[6.8.0,6.9.0)", + org.eclipse.jgit.submodule;version="[6.8.0,6.9.0)", + org.eclipse.jgit.transport;version="[6.8.0,6.9.0)", + org.eclipse.jgit.transport.http;version="[6.8.0,6.9.0)", + org.eclipse.jgit.transport.http.apache;version="[6.8.0,6.9.0)", + org.eclipse.jgit.transport.sshd;version="[6.8.0,6.9.0)", + org.eclipse.jgit.transport.sshd.agent;version="[6.8.0,6.9.0)", + org.eclipse.jgit.treewalk;version="[6.8.0,6.9.0)", + org.eclipse.jgit.treewalk.filter;version="[6.8.0,6.9.0)", + org.eclipse.jgit.util;version="[6.8.0,6.9.0)", + org.eclipse.jgit.util.io;version="[6.8.0,6.9.0)" Service-Component: OSGI-INF/org.eclipse.egit.core.RepositoryInitializer.xml, OSGI-INF/org.eclipse.egit.core.TransportConfigurator.xml, OSGI-INF/org.eclipse.egit.core.internal.MergeStrategies$Loader.xml, diff --git a/org.eclipse.egit.core/pom.xml b/org.eclipse.egit.core/pom.xml index 10b6020e8b..b2386e2f9b 100644 --- a/org.eclipse.egit.core/pom.xml +++ b/org.eclipse.egit.core/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> + <version>6.8.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.core</artifactId> diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseGitProgressTransformer.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseGitProgressTransformer.java index fbc63863a2..82c7d6185f 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseGitProgressTransformer.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseGitProgressTransformer.java @@ -13,11 +13,15 @@ *******************************************************************************/ package org.eclipse.egit.core; +import java.time.Duration; +import java.time.Instant; import java.util.concurrent.TimeUnit; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.egit.core.internal.trace.GitTraceLocation; import org.eclipse.jgit.lib.ProgressMonitor; +import org.eclipse.jgit.util.StringUtils; /** * A JGit {@link ProgressMonitor} that reports progress and cancellation via an @@ -45,6 +49,10 @@ public class EclipseGitProgressTransformer implements ProgressMonitor { private long lastUpdatedAt; + private Boolean showDuration; + + private Instant startTime; + /** * Create a new progress monitor. * @@ -53,15 +61,17 @@ public class EclipseGitProgressTransformer implements ProgressMonitor { */ public EclipseGitProgressTransformer(final IProgressMonitor eclipseMonitor) { root = SubMonitor.convert(eclipseMonitor); + this.startTime = Instant.now(); } @Override public void start(final int totalTasks) { - // Nothing to do + this.startTime = Instant.now(); } @Override public void beginTask(final String name, final int total) { + this.startTime = Instant.now(); msg = name; lastWorked = 0; lastShown = 0; @@ -75,11 +85,17 @@ public class EclipseGitProgressTransformer implements ProgressMonitor { if (work <= 0) { return; } - final int cmp = lastWorked + work; + int cmp = lastWorked + work; + StringBuilder m = new StringBuilder(); if (totalWork == UNKNOWN) { long now = System.currentTimeMillis(); if (now < lastUpdatedAt || now - lastUpdatedAt > UPDATE_INTERVAL) { - root.subTask(msg + ", " + cmp); //$NON-NLS-1$ + if (!StringUtils.isEmptyOrNull(msg)) { + m.append(msg).append(", "); //$NON-NLS-1$ + } + m.append(cmp); + appendDuration(m, elapsedTime()); + root.subTask(m.toString()); root.setWorkRemaining(100); root.worked(1); lastUpdatedAt = now; @@ -87,7 +103,6 @@ public class EclipseGitProgressTransformer implements ProgressMonitor { } else if (lastShown == 0 || cmp * 100 / totalWork != lastShown * 100 / totalWork) { // Percentage changed: update the subTask message - final StringBuilder m = new StringBuilder(); m.append(msg); m.append(": "); //$NON-NLS-1$ while (m.length() < 25) { @@ -112,6 +127,8 @@ public class EclipseGitProgressTransformer implements ProgressMonitor { m.append(twstr); m.append(')'); + appendDuration(m, elapsedTime()); + root.subTask(m.toString()); root.setWorkRemaining(100); root.worked(1); @@ -129,4 +146,57 @@ public class EclipseGitProgressTransformer implements ProgressMonitor { public boolean isCancelled() { return root.isCanceled(); } + + @Override + public void showDuration(boolean enabled) { + showDuration = Boolean.valueOf(enabled); + } + + private boolean showDuration() { + return (showDuration != null && showDuration.booleanValue()) + || GitTraceLocation.PERFORMANCE.isActive(); + } + + private Duration elapsedTime() { + return Duration.between(startTime, Instant.now()); + } + + /** + * Append formatted duration if this was set via API or the performance + * trace location "org.eclipse.egit.core/performance" is active. + * + * @param s + * StringBuilder to append the formatted duration to + * @param duration + * duration to format + */ + @SuppressWarnings({ "boxing" }) + private void appendDuration(StringBuilder s, Duration duration) { + if (!showDuration()) { + return; + } + long hours = duration.toHours(); + int minutes = duration.toMinutesPart(); + int seconds = duration.toSecondsPart(); + s.append(" ["); //$NON-NLS-1$ + if (hours > 0) { + s.append(hours).append(':'); + s.append(String.format("%02d", minutes)).append(':'); //$NON-NLS-1$ + s.append(String.format("%02d", seconds)); //$NON-NLS-1$ + } else if (minutes > 0) { + s.append(minutes).append(':'); + s.append(String.format("%02d", seconds)); //$NON-NLS-1$ + } else { + s.append(seconds); + } + s.append('.').append(String.format("%03d", duration.toMillisPart())); //$NON-NLS-1$ + if (hours > 0) { + s.append('h'); + } else if (minutes > 0) { + s.append('m'); + } else { + s.append('s'); + } + s.append(']'); + } } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java index 6016d2a39f..87b09d530f 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/CoreText.java @@ -424,6 +424,9 @@ public class CoreText extends NLS { public static String PullOperation_TaskName; /** */ + public static String PushOperation_ForUri; + + /** */ public static String PushOperation_InternalExceptionOccurredMessage; /** */ diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ReportingTypedConfigGetter.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ReportingTypedConfigGetter.java index 0841352062..226392e9b6 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ReportingTypedConfigGetter.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ReportingTypedConfigGetter.java @@ -52,10 +52,10 @@ public class ReportingTypedConfigGetter extends DefaultTypedConfigGetter { return super.getEnum(config, all, section, subsection, name, defaultValue); } catch (IllegalArgumentException e) { - String valueUsed; + String valueUsed = null; if (defaultValue instanceof Config.ConfigEnum) { valueUsed = ((Config.ConfigEnum) defaultValue).toConfigValue(); - } else { + } else if (defaultValue != null) { valueUsed = defaultValue.toString().toLowerCase(Locale.ROOT); } warn(config, join(section, subsection, name), valueUsed, e); diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties index ed7df68b19..9f7eee1784 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/coretext.properties @@ -159,6 +159,7 @@ ProjectUtil_taskCheckingDirectory=Checking: {0} PullOperation_DetachedHeadMessage=No local branch is currently checked out PullOperation_PullNotConfiguredMessage=The current branch is not configured for pull PullOperation_TaskName=Pulling {0,choice,1#1 repository|1<{0} repositories} +PushOperation_ForUri=For URI {0}: PushOperation_InternalExceptionOccurredMessage=An internal Exception occurred during push: {0} PushOperation_ExceptionOccurredDuringPushOnUriMessage=An exception occurred during push on URI {0}: {1} PushOperation_resultCancelled=Operation was cancelled. diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/credentials/EGitCredentialsProvider.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/credentials/EGitCredentialsProvider.java index 6227b3d486..8c838cc6b4 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/credentials/EGitCredentialsProvider.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/credentials/EGitCredentialsProvider.java @@ -108,7 +108,7 @@ public class EGitCredentialsProvider extends CredentialsProvider { } } - if (!isSpecial && (userItem != null || passwordItem != null)) { + if (!isSpecial && (userItem != null && passwordItem != null)) { UserPasswordCredentials credentials = null; if ((user != null) && (password != null)) { credentials = new UserPasswordCredentials(user, password); @@ -129,12 +129,8 @@ public class EGitCredentialsProvider extends CredentialsProvider { return false; } } - if (userItem != null) { - userItem.setValue(credentials.getUser()); - } - if (passwordItem != null) { - passwordItem.setValue(credentials.getPassword().toCharArray()); - } + userItem.setValue(credentials.getUser()); + passwordItem.setValue(credentials.getPassword().toCharArray()); return true; } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/trace/GitTraceLocation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/trace/GitTraceLocation.java index 55c0eff76b..643ca913ee 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/trace/GitTraceLocation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/trace/GitTraceLocation.java @@ -29,7 +29,9 @@ public enum GitTraceLocation implements ITraceLocation { /** IndexDiffCache */ INDEXDIFFCACHE("/debug/core/indexdiffcache"), //$NON-NLS-1$ /** refreshing resources */ - REFRESH("/debug/core/refresh"); //$NON-NLS-1$ + REFRESH("/debug/core/refresh"), //$NON-NLS-1$ + /** performance trace */ + PERFORMANCE("/performance"); //$NON-NLS-1$ /** * Initializes the locations. diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ConnectProviderOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ConnectProviderOperation.java index ea59fc7d3d..7ceee4b4ca 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ConnectProviderOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/ConnectProviderOperation.java @@ -303,10 +303,14 @@ public class ConnectProviderOperation implements IEGitOperation { List<IPath> derived = new ArrayList<>(); IResource[] members = c.members(IContainer.INCLUDE_HIDDEN); for (IResource r : members) { - if (r.isDerived()) + if (r.isVirtual()) { + continue; + } + if (r.isDerived()) { derived.add(r.getLocation()); - else if (r instanceof IContainer) + } else if (r instanceof IContainer) { derived.addAll(findDerivedResources((IContainer) r)); + } } return derived; } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DeleteBranchOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DeleteBranchOperation.java index fed53c924d..553016a7bc 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DeleteBranchOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/DeleteBranchOperation.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (C) 2010, 2016 Mathias Kinzler <mathias.kinzler@sap.com> + * Copyright (C) 2010, 2023 Mathias Kinzler <mathias.kinzler@sap.com> and others * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -15,8 +15,9 @@ package org.eclipse.egit.core.op; import static java.util.Arrays.asList; import java.util.HashSet; -import java.util.Iterator; +import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.IWorkspaceRunnable; @@ -27,6 +28,7 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.egit.core.Activator; +import org.eclipse.egit.core.EclipseGitProgressTransformer; import org.eclipse.egit.core.internal.CoreText; import org.eclipse.egit.core.internal.job.RuleUtil; import org.eclipse.jgit.api.Git; @@ -39,7 +41,7 @@ import org.eclipse.jgit.lib.Repository; import org.eclipse.osgi.util.NLS; /** - * This class implements deletion of a branch + * This class implements deletion of a branch. */ public class DeleteBranchOperation implements IEGitOperation { /** Operation was performed */ @@ -100,46 +102,42 @@ public class DeleteBranchOperation implements IEGitOperation { @Override public void execute(IProgressMonitor monitor) throws CoreException { IWorkspaceRunnable action = new IWorkspaceRunnable() { + @Override public void run(IProgressMonitor actMonitor) throws CoreException { - String taskName; - if (branches.size() == 1) + List<String> branchNames = branches.stream().map(Ref::getName) + .collect(Collectors.toList()); + if (branchNames.size() == 1) { taskName = NLS.bind( - CoreText.DeleteBranchOperation_TaskName, branches - .iterator().next().getName()); - else { - StringBuilder names = new StringBuilder(); - for (Iterator<Ref> it = branches.iterator(); it.hasNext(); ) { - Ref ref = it.next(); - names.append(ref.getName()); - if (it.hasNext()) - names.append(", "); //$NON-NLS-1$ - } + CoreText.DeleteBranchOperation_TaskName, + branchNames.get(0)); + } else { + String names = branchNames.stream() + .collect(Collectors.joining(", ")); //$NON-NLS-1$ taskName = NLS.bind( CoreText.DeleteBranchOperation_TaskName, names); } SubMonitor progress = SubMonitor.convert(actMonitor, taskName, branches.size()); - for (Ref branch : branches) { - if (progress.isCanceled()) { - throw new OperationCanceledException( - CoreText.DeleteBranchOperation_Canceled); - } - try (Git git = new Git(repository)) { - git.branchDelete().setBranchNames( - branch.getName()).setForce(force).call(); - status = OK; - } catch (NotMergedException e) { - status = REJECTED_UNMERGED; - break; - } catch (CannotDeleteCurrentBranchException e) { - status = REJECTED_CURRENT; - break; - } catch (JGitInternalException | GitAPIException e) { - throw new CoreException(Activator.error(e.getMessage(), e)); - } - progress.worked(1); + try (Git git = new Git(repository)) { + git.branchDelete() + .setBranchNames(branchNames) + .setForce(force) + .setProgressMonitor( + new EclipseGitProgressTransformer(progress)) + .call(); + status = OK; + } catch (NotMergedException e) { + status = REJECTED_UNMERGED; + } catch (CannotDeleteCurrentBranchException e) { + status = REJECTED_CURRENT; + } catch (JGitInternalException | GitAPIException e) { + throw new CoreException(Activator.error(e.getMessage(), e)); + } + if (progress.isCanceled()) { + throw new OperationCanceledException( + CoreText.DeleteBranchOperation_Canceled); } } }; diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperation.java index 4b36726049..f4c247c58b 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperation.java @@ -3,7 +3,7 @@ * Copyright (C) 2011, Mathias Kinzler <mathias.kinzler@sap.com> * Copyright (C) 2012, Robin Stocker <robin@nibor.org> * Copyright (C) 2015, Stephan Hackstedt <stephan.hackstedt@googlemail.com> - * Copyright (C) 2016, 2022 Thomas Wolf <thomas.wolf@paranor.ch> + * Copyright (C) 2016, 2022 Thomas Wolf <twolf@apache.org> * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -14,9 +14,13 @@ *******************************************************************************/ package org.eclipse.egit.core.op; +import java.io.ByteArrayOutputStream; import java.io.OutputStream; +import java.io.PrintStream; import java.lang.reflect.InvocationTargetException; import java.net.URISyntaxException; +import java.nio.charset.Charset; +import java.text.MessageFormat; import java.util.Collection; import java.util.List; @@ -39,6 +43,7 @@ import org.eclipse.jgit.transport.RemoteRefUpdate; import org.eclipse.jgit.transport.RemoteRefUpdate.Status; import org.eclipse.jgit.transport.Transport; import org.eclipse.jgit.transport.URIish; +import org.eclipse.jgit.util.SystemReader; import org.eclipse.osgi.util.NLS; /** @@ -230,7 +235,11 @@ public class PushOperation { operationResult = new PushOperationResult(); try (Git git = new Git(localDb)) { - if (specification != null) + Charset hookCharset = SystemReader.getInstance() + .getDefaultCharset(); + if (specification != null) { + StringBuilder allHookOutputs = new StringBuilder(); + StringBuilder allHookErrors = new StringBuilder(); for (final URIish uri : specification.getURIs()) { if (progress.isCanceled()) { operationResult.addOperationResult(uri, @@ -251,13 +260,27 @@ public class PushOperation { transport.setCredentialsProvider( credentialsProvider); } - PushResult result = transport.push(gitSubMonitor, - refUpdates, out); - - operationResult.addOperationResult(result.getURI(), - result); - specification.addURIRefUpdates(result.getURI(), - result.getRemoteUpdates()); + try (ByteArrayOutputStream hookOutBytes = new ByteArrayOutputStream(); + ByteArrayOutputStream hookErrBytes = new ByteArrayOutputStream(); + PrintStream stdout = new PrintStream(hookOutBytes, true, hookCharset); + PrintStream stderr = new PrintStream(hookErrBytes, true, hookCharset)) { + transport.setHookOutputStream(stdout); + transport.setHookErrorStream(stderr); + PushResult result = transport.push(gitSubMonitor, + refUpdates, out); + stdout.flush(); + stderr.flush(); + addHookMessage(result.getURI(), + hookOutBytes.toString(hookCharset), + allHookOutputs); + addHookMessage(result.getURI(), + hookErrBytes.toString(hookCharset), + allHookErrors); + operationResult.addOperationResult(result.getURI(), + result); + specification.addURIRefUpdates(result.getURI(), + result.getRemoteUpdates()); + } } catch (JGitInternalException e) { String errorMessage = e.getCause() != null ? e.getCause().getMessage() : e.getMessage(); @@ -269,10 +292,17 @@ public class PushOperation { handleException(uri, e, e.getMessage()); } } - else { + operationResult.setHookOutput(allHookOutputs.toString(), + allHookErrors.toString()); + } else { final EclipseGitProgressTransformer gitMonitor = new EclipseGitProgressTransformer( progress.newChild(totalWork)); - try { + try (ByteArrayOutputStream hookOutBytes = new ByteArrayOutputStream(); + ByteArrayOutputStream hookErrBytes = new ByteArrayOutputStream(); + PrintStream stdout = new PrintStream(hookOutBytes, true, + hookCharset); + PrintStream stderr = new PrintStream(hookErrBytes, true, + hookCharset)) { Iterable<PushResult> results = git.push() .setRemote(remoteName) .setDryRun(dryRun) @@ -280,7 +310,14 @@ public class PushOperation { .setProgressMonitor(gitMonitor) .setCredentialsProvider(credentialsProvider) .setOutputStream(out) + .setHookOutputStream(stdout) + .setHookErrorStream(stderr) .call(); + stdout.flush(); + stderr.flush(); + operationResult.setHookOutput( + hookOutBytes.toString(hookCharset), + hookErrBytes.toString(hookCharset)); for (PushResult result : results) { operationResult.addOperationResult(result.getURI(), result); @@ -301,6 +338,18 @@ public class PushOperation { } } + private void addHookMessage(URIish uri, String msg, StringBuilder all) { + if (!msg.isEmpty()) { + if (all.length() > 0 && all.charAt(all.length() - 1) != '\n') { + all.append('\n'); + } + all.append( + MessageFormat.format(CoreText.PushOperation_ForUri, uri)); + all.append('\n'); + all.append(msg); + } + } + private void handleException(final URIish uri, Exception e, String userMessage) { String uriString; diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperationResult.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperationResult.java index 5fe23f00c0..5dbbaedaf1 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperationResult.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/PushOperationResult.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (C) 2008, Marek Zawirski <marek.zawirski@gmail.com> + * Copyright (C) 2008, 2022 Marek Zawirski <marek.zawirski@gmail.com> and others. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -33,8 +33,13 @@ import org.eclipse.jgit.transport.URIish; * @see PushOperation */ public class PushOperationResult { + private LinkedHashMap<URIish, Entry> urisEntries; + private String hookOut; + + private String hookErr; + /** * Construct empty push operation result. */ @@ -118,6 +123,37 @@ public class PushOperationResult { } /** + * Sets the output of a pre-push hook. + * + * @param stdout + * of the pre-push hook + * @param stderr + * of the pre-push hook + */ + public void setHookOutput(String stdout, String stderr) { + hookOut = stdout; + hookErr = stderr; + } + + /** + * Retrieves the stdout output of a pre-push hook, if any. + * + * @return the hook's output to stdout, or an empty string + */ + public String getHookStdOut() { + return hookOut == null ? "" : hookOut; //$NON-NLS-1$ + } + + /** + * Retrieves the stderr output of a pre-push hook, if any. + * + * @return the hook's output to stderr, or an empty string + */ + public String getHookStdErr() { + return hookErr == null ? "" : hookErr; //$NON-NLS-1$ + } + + /** * @return string being list of failed URIs with their error messages. */ public String getErrorStringForAllURis() { diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/RevertCommitOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/RevertCommitOperation.java index a17e9d8215..faa04dd93b 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/RevertCommitOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/RevertCommitOperation.java @@ -26,6 +26,7 @@ import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.egit.core.internal.CoreText; import org.eclipse.egit.core.internal.MergeStrategies; +import org.eclipse.egit.core.internal.gerrit.GerritUtil; import org.eclipse.egit.core.internal.job.RuleUtil; import org.eclipse.egit.core.internal.util.ProjectUtil; import org.eclipse.jgit.api.Git; @@ -91,6 +92,8 @@ public class RevertCommitOperation implements IEGitOperation { Integer.valueOf(commits.size()))); try (Git git = new Git(repo)) { RevertCommand command = git.revert(); + command.setInsertChangeId( + GerritUtil.getCreateChangeId(repo.getConfig())); MergeStrategy strategy = MergeStrategies .getPreferredMergeStrategy(); if (strategy != null) { diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriber.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriber.java index 62ab6d79ce..7470f4ccdc 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriber.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriber.java @@ -98,9 +98,8 @@ public class GitResourceVariantTreeSubscriber extends * @param monitor */ public void init(IProgressMonitor monitor) { - monitor.beginTask( - CoreText.GitResourceVariantTreeSubscriber_fetchTaskName, - gsds.size()); + monitor.setTaskName( + CoreText.GitResourceVariantTreeSubscriber_fetchTaskName); try { cache = GitSyncCache.getAllData(gsds, monitor); } finally { diff --git a/org.eclipse.egit.doc/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit.doc/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit.doc/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit.doc/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.doc/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit.doc/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit.doc/META-INF/MANIFEST.MF b/org.eclipse.egit.doc/META-INF/MANIFEST.MF index 3846797cf8..1493b9b1d4 100644 --- a/org.eclipse.egit.doc/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.doc/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.egit.doc;singleton:=true -Bundle-Version: 6.3.0.qualifier +Bundle-Version: 6.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Localization: plugin diff --git a/org.eclipse.egit.doc/build-help.xml b/org.eclipse.egit.doc/build-help.xml index 7b3db25b35..f05801a15e 100644 --- a/org.eclipse.egit.doc/build-help.xml +++ b/org.eclipse.egit.doc/build-help.xml @@ -45,8 +45,8 @@ > <path name="EGit/User_Guide" title="EGit User Guide" /> <path name="JGit/User_Guide" title="JGit User Guide" /> - <path name="EGit/New_and_Noteworthy/6.2" title="EGit 6.2 New and Noteworthy" /> - <path name="JGit/New_and_Noteworthy/6.2" title="JGit 6.2 New and Noteworthy" /> + <path name="EGit/New_and_Noteworthy/6.7" title="EGit 6.7 New and Noteworthy" /> + <path name="JGit/New_and_Noteworthy/6.7" title="JGit 6.7 New and Noteworthy" /> <path name="EGit/Git_For_Eclipse_Users" title="Git for Eclipse Users" /> <path name="EGit/Contributor_Guide" title="EGit Contributor Guide" /> <stylesheet url="book.css" /> diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html index cc205bcc6e..099155c9cd 100644 --- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html +++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html @@ -41,7 +41,13 @@ </ul> <p>Prerequisites for the Maven build are</p> <ul> - <li>since 6.0 Java 11, older versions need Java 8 </li> + <li>since 6.7 + <a href="https://git.eclipse.org/r/c/jgit/jgit/+/201773" target="egit_external">(#201773)</a> Java 17, still compiled for Java 11, required by Tycho 4.0 used to build OSGi artefacts + <ul> + <li>since 6.0 Java 11</li> + <li>older versions need Java 8 </li> + </ul> + </li> <li> <a href="https://maven.apache.org/download.html" target="egit_external">at least Maven 3.5.2</a> </li> @@ -55,7 +61,7 @@ <h2 id="JGit_2">JGit</h2> <ul> <li>JGit can be built using Maven or Bazel</li> - <li>use Java 11 to run the JGit build</li> + <li>use Java 17 to run the JGit build, it's compiled for Java 11 but Tycho 4.0 used to build OSGi artefacts requires Java 17</li> <li>JGit packaging projects (Eclipse features and p2 repository) are built using Maven and Tycho.</li> </ul> <h2 id="EGit_2">EGit</h2> @@ -104,9 +110,16 @@ </toolchains> </pre> <p>The <tt>jdkHome</tt> directory is the one that contains the <tt>bin</tt> directory in which there is the <tt>java</tt> executable.</p> - <p>Also include a definition for a Java 11 toolchain as shown above: EGit versions >= 6.0.0 require at least Java 11 to build, and require a Java 11 toolchain definition for running the tests.</p> - <p>Building JGit versions < 6.0.0 with maven requires running maven with Java 1.8 in all cases.</p> - <p>Building JGit versions >= 6.0.0 with maven requires running maven and compiling with at least Java 11.</p> + <p>Also include a definition for a Java 11 toolchain as shown above.</p> + <ul> + <li>EGit versions >= 6.0.0 require at least Java 11 to build, and require a Java 11 toolchain definition for running the tests.</li> + <li>EGit versions >= 6.6.0 require at least Java 17 to build, and require a Java 11 toolchain definition for running the tests.</li> + </ul> + <ul> + <li>JGit versions < 6.0.0 with maven require running maven with Java 1.8 in all cases.</li> + <li>JGit versions >= 6.0.0 with maven require running maven and compiling with at least Java 11.</li> + <li>JGit versions >= 6.6.0 with maven require running maven with at least Java 17.</li> + </ul> <ul> <li>Due to a <a href="https://wiki.eclipse.org/Tycho/How_Tos/Dependency_on_pom-first_artifacts" target="egit_external">limitation of Tycho</a> it is not possible to mix pom-first and manifest-first builds in the same reactor build hence the pom-first JGit build has to run separately before the build for the manifest-first JGit packaging project. @@ -161,18 +174,49 @@ <i>egit/org.eclipse.egit.repository/target/repository</i>. If not, make sure the target platform has been downloaded from within Eclipse (Windows>Preferences>Plug-in Development>Target Platform). The default target platform defined in the maven build is currently Eclipse 4.6 (Neon). If you skip setting the system property <code>target-platform</code> the target platform for Eclipse 4.6 will be used. EGit built with that target platform can run on any Eclipse >= 4.6. If you choose a higher target platform, the EGit produced may not run on Eclipses older than the target platform version. </p> <h2 id="Dependencies_and_License_Check">Dependencies and License Check</h2> - <p>In order to update the list of dependencies run the dash-licenses Maven plugin</p> - <pre style="width: 55em;"> -mvn org.eclipse.dash:license-tool-plugin:license-check -Ddash.summary=DEPENDENCIES -Ddash.projectId=technology.jgit -mvn org.eclipse.dash:license-tool-plugin:license-check -Ddash.summary=DEPENDENCIES -Ddash.projectId=technology.egit -</pre> - <p>for jgit and egit and then sort the entries in the file <code>DEPENDENCIES</code> and check for changes against the previous version. - If necessary file CQs for new dependencies which are flagged - <i>restricted</i> by the tool. - See the + <p>We use the + <a href="https://github.com/eclipse/dash-licenses#example-maven-plugin" target="egit_external">dash-licenses Maven plugin</a> to check the license of 3rd party dependencies. See the <a href="https://www.eclipse.org/projects/handbook/#ip-license-tool" target="egit_external">Eclipse projects handbook</a>. </p> - <p>This tool requires Java 11.</p> + <p>On the master branch with the following changes the maven build is now running the license-check automatically</p> + <ul> + <li> + <a href="https://git.eclipse.org/r/c/jgit/jgit/+/196333" target="egit_external">jgit</a> + </li> + <li> + <a href="https://git.eclipse.org/r/c/egit/egit/+/196335" target="egit_external">egit</a> + </li> + </ul> + <p>A summary of the check results is written to the + <i>target/dash/summary</i> file. Dependencies which need to be vetted are marked as + <i>restricted</i> in this file. + </p> + <p>It will fail the build if any dependency needs to be vetted:</p> + <pre> +13:35:57 11:35:57 [INFO] --- license-tool-plugin:0.0.1-SNAPSHOT:license-check (license-check) @ egit-parent --- +13:36:10 11:36:09 [INFO] Querying Eclipse Foundation for license data for 299 items. +13:36:10 11:36:10 [INFO] Found 246 items. +13:36:10 11:36:10 [INFO] License information could not be automatically verified for the following content: +13:36:10 11:36:10 [INFO] +13:36:10 11:36:10 [INFO] p2/orbit/p2.eclipse.feature/org.eclipse.emf.ecore/2.23.0.v20200630-0516 +13:36:10 11:36:10 [INFO] +13:36:10 11:36:10 [INFO] This content is either not correctly mapped by the system, or requires review. +13:36:10 11:36:10 [INFO] Summary file was written to: /home/jenkins/agent/workspace/egit.gerrit/repo/target/dash/summary +13:36:10 11:36:10 [ERROR] Dependency license check failed. Some dependencies need to be vetted. +</pre> + <p>If that happens run the build again locally and provide a + <a href="https://gitlab.eclipse.org/-/profile/personal_access_tokens" target="egit_external">gitlab token with scope "api"</a> to automatically create review requests for the IP team: + </p> + <pre> +mvn clean install -Ddash.iplab.token="<gitlab token>" +</pre> + <p>Then wait until these requests have been approved.</p> + <p>You can set the option + <i>dash.skip</i> to skip the license check: + </p> + <pre> +mvn clean install -Ddash.skip +</pre> <h2 id="JGit_Bazel_Build">JGit Bazel Build</h2> <p>Since Gerrit is built using <a href="https://www.bazel.io/" target="egit_external">Bazel</a> a Bazel build was also implemented for JGit. @@ -299,7 +343,31 @@ latest stable branch: /home/data/httpd/download.eclipse.org/egit/updates-stable <li>review and submit the release change, then push the release tag to git.eclipse.org</li> <li>the CI job will build the release version and deploy it to the Eclipse Maven repo at repo.eclipse.org</li> </ul> + <h3 id="Release_Notes">Release Notes</h3> + <p>We create a release record for each release in the Eclipse project portal and publish release notes there.</p> + <ul> + <li> + <a href="https://projects.eclipse.org/projects/technology.jgit/governance" target="egit_external">JGit releases</a> + </li> + <li> + <a href="https://projects.eclipse.org/projects/technology.egit/governance" target="egit_external">EGit releases</a> + </li> + </ul> + <h3 id="New_and_Noteworthy">New and Noteworthy</h3> + <p>For major and minor releases (e.g. 6.0.0, 6.3.0) we create a New and Noteworthy page</p> + <ul> + <li> + <a href="https://wiki.eclipse.org/JGit/New_and_Noteworthy" target="egit_external">JGit New and Noteworthy</a> + </li> + <li> + <a href="https://wiki.eclipse.org/EGit/New_and_Noteworthy" target="egit_external">EGit New and Noteworthy</a> + </li> + </ul> <h2 id="Contribution_to_Release_Train">Contribution to Release Train</h2> + <p>We participate in the + <a href="https://wiki.eclipse.org/Simultaneous_Release" target="egit_external">Eclipse simultaneous release</a> and its + <a href="https://wiki.eclipse.org/Category:SimRel-2022-09" target="egit_external">schedule</a>. + </p> <p>The release train contribution for JGit and EGit is maintained in the git repository </p> <pre>ssh://git.eclipse.org/gitroot/simrel/org.eclipse.simrel.build.git </pre> @@ -308,12 +376,40 @@ latest stable branch: /home/data/httpd/download.eclipse.org/egit/updates-stable simrel.aggr egit.aggrcon </pre> + <p>Checkout the master branch and update the versions of jgit and egit to be contributed and the URL of the new version.</p> + <p>Milestones (version ends with -m1, -m2, -m3) and release candidates (version ends with -rc1) are deployed on the download server to egit/staging/<tag name>, the final release (version ends with -r) goes to egit/updates-<major version>.<minor version>[.<micro version>]. The releases on the download server can be browsed + <a href="https://download.eclipse.org/justj/?file=egit" target="egit_external">here</a>. Old releases are moved to the + <a href="https://archive.eclipse.org/justj/?file=egit" target="egit_external">archive server</a>. Committers can trigger archiving + <a href="https://download.eclipse.org/egit/" target="egit_external">on this page</a>. + </p> + <p>All these builds are deployed to the corresponding release repositories on nexus. + Maven artefacts:</p> + <ul> + <li> + <a href="https://repo.eclipse.org/content/groups/releases/org/eclipse/jgit/" target="egit_external">jgit maven artefacts</a> + </li> + <li> + <a href="https://repo.eclipse.org/content/groups/releases/org/eclipse/egit/" target="egit_external">egit maven artefacts</a> + </li> + </ul> + <p>Corresponding p2 repositories are exposed dynamically using the Nexus Unzip Plugin:</p> + <ul> + <li> + <a href="https://repo.eclipse.org/content/unzip/releases.unzip/org/eclipse/jgit/" target="egit_external">jgit p2 repos</a> + </li> + <li> + <a href="https://repo.eclipse.org/content/unzip/releases.unzip/org/eclipse/egit/" target="egit_external">egit p2 repos</a> + </li> + </ul> + <p>Final releases of jgit are also deployed to Maven central using Sonatype's OSS Nexus using some scripts located in the jgit repository under tools/maven-central.</p> <p>Open simrel.aggr using the <a href="https://wiki.eclipse.org/CBI/aggregator" target="egit_external">CBI aggregator editor</a> to edit these files. This editor knows the structure of these files and can check their validity. </p> + <p>Push the change for review, review and submit it when the verification build job has voted +1 on verified. + Note that the simultaneous release repository only accepts fast-forward submits. This means if another project's change has been submitted you may have to rebase your change.</p> <p>The release train build is coordinated on the - <a href="https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev" target="egit_external">cross-project-issues-dev mailing list</a> + <a href="https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev" target="egit_external">cross-project-issues-dev mailing list</a>. </p> <p> <br/> diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Manual-Developer-Setup.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Manual-Developer-Setup.html index ea3cb8a3ea..27a4b48a77 100644 --- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Manual-Developer-Setup.html +++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Manual-Developer-Setup.html @@ -78,10 +78,11 @@ git clone <enter URL> <p>URL: <a href="https://git.eclipse.org/r/egit/egit-github.git" target="egit_external">https://git.eclipse.org/r/egit/egit-github.git</a> </p> - <p>EGit also provides tools for integrating with GitHub and Mylyn tasks.</p> - <p>For getting the dependencies, open the file <code>org.eclipse.mylyn.github-feature/github.target</code> ( - <a href="https://git.eclipse.org/c/egit/egit-github.git/plain/org.eclipse.mylyn.github-feature/github.target" target="egit_external">view on web</a>) and select - <i>Set as Target Platfrom</i>. + <p> + <b>Moved to Mylyn:</b> + EGit also provided tools for integrating with GitHub and Mylyn tasks. + They were moved to Mylyn in Eclipse 2023-06, see + <a href="https://github.com/eclipse-mylyn/org.eclipse.mylyn/tree/main/mylyn.egit" target="egit_external">mylyn.egit</a>. </p> <h2 id="Development_IDE_Configuration">Development IDE Configuration</h2> <p>Download and install the Eclipse package "Eclipse IDE for Eclipse Committers" or "Eclipse for RCP and RAP Developers" from here, if you don't already have it:</p> diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Tests.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Tests.html index 04f197f664..3bf0c01889 100644 --- a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Tests.html +++ b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Tests.html @@ -40,9 +40,6 @@ <p>To run these tests from Eclipse the Jetty feature is needed. Use one of the target platforms as described in <a href="Manual-Developer-Setup.html#Dependencies">dependencies</a>. </p> - <p>Alternatively, install "Jetty 9.4.20.v20190813" from - <a href="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.20.v20190813/" target="egit_external">https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.20.v20190813/</a> - </p> <h2 id="EGit_Core_Tests">EGit Core Tests</h2> <p>The EGit Core tests are executed during the maven build for the bundle <i>org.eclipse.egit.core.test</i>. diff --git a/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html b/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html index 30bf98490a..684fed4968 100644 --- a/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html +++ b/org.eclipse.egit.doc/help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html @@ -194,11 +194,11 @@ </dl> <p>The current version of your repository is simply a pointer to the end of the tree. For this reason, it's often referred to as a <i>tip</i>, but <code>HEAD</code> is the symbolic identifier for what the current repository is pointing to. Similarly, any branch can be referred to by its changeset id, which includes that and all prior changes. The default branch is usually called - <i>master</i>. + <i>main</i>. </p> <dl> <dd>☞ - <b>The default 'trunk' is called 'master' in Git</b> + <b>The default 'trunk' is called 'main' in Git</b> </dd> <dd>☞ <b>The tip of the current branch is referred to as 'HEAD</b>' @@ -222,7 +222,9 @@ </dd> </dl> <h2 id="Merging">Merging</h2> - <p>With great power comes great flexibility, but ultimately, you want to get your changes into some kind of merged stream (like HEAD). One of the fears of unconstrained branching is that of unconstrained merge pains later on. SVN makes this slightly less difficult than CVS, but unless you merge to HEAD frequently, you can easily get lost – particularly when refactorings start happening.</p> + <p>With great power comes great flexibility, but ultimately, you want to get your changes into some kind of merged stream (like + <i>main</i>). One of the fears of unconstrained branching is that of unconstrained merge pains later on. SVN makes this slightly less difficult than CVS, but unless you merge to HEAD frequently, you can easily get lost – particularly when refactorings start happening. + </p> <dl> <dd>☞ <b>It's painful to merge in a CVCS; therefore branches tend not to happen</b> @@ -323,7 +325,7 @@ $ git init Initialized empty Git repository in /tmp/example/.git/ $ echo "Hello, world" > README.txt $ git commit # Won't commit files by default -# On branch master +# On branch main # # Initial commit # @@ -335,12 +337,12 @@ nothing added to commit but untracked files present (use "git add" to track) $ git add README.txt # Similar to Team -> Add to Version Control $ # git commit # Would prompt for message $ git commit -m "Added README.txt" -[master (root-commit) 0dd1f35] Added README.txt +[main (root-commit) 0dd1f35] Added README.txt 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 README.txt $ echo "Hello, solar system" > README.txt $ git commit -# On branch master +# On branch main # Changed but not updated: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) @@ -349,7 +351,7 @@ $ git commit # no changes added to commit (use "git add" and/or "git commit -a") $ git commit -a -m "Updated README.txt" -[master 9b1939a] Updated README.txt +[main 9b1939a] Updated README.txt 1 files changed, 1 insertions(+), 1 deletions(-) $ git log --graph --oneline # Shows graph nodes (not much here) and change info * 9b1939a Updated README.txt @@ -373,12 +375,12 @@ $ git commit -m "Added homepage" [web d47e30c] Added homepage 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 index.html -$ git checkout master +$ git checkout main $ git branch # See what branches we've got french -* master +* main web -$ git merge web # pull 'web' into current branch 'master' +$ git merge web # pull 'web' into current branch 'main' Merge made by recursive. index.html | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) @@ -397,7 +399,7 @@ $ git log --graph --oneline * | 66a644c Ajouté README.txt |/ * 0dd1f35 Added README.txt -$ git checkout master +$ git checkout main $ git log --graph --oneline * e3de4de Merge branch 'web' |\ @@ -409,7 +411,7 @@ $ (mkdir /tmp/other;cd /tmp/other;git init) # Could do this in other process $ (cd /tmp/other;git config --bool core.bare true) # Need to tell git that /tmp/other is a bare repository so we can "push" to it Initialized empty Git repository in /tmp/other/.git/ $ git remote add other /tmp/other # could be a URL over http/git -$ git push other master # push branch 'master' to remote repository 'other' +$ git push other main # push branch 'main' to remote repository 'other' Counting objects: 11, done. Delta compression using up to 2 threads. Compressing objects: 100% (7/7), done. @@ -417,7 +419,7 @@ Writing objects: 100% (11/11), 981 bytes, done. Total 11 (delta 1), reused 0 (delta 0) Unpacking objects: 100% (11/11), done. To /tmp/other - * [new branch] master -> master + * [new branch] main -> main $ git push --all other # Push all branches to 'other' Counting objects: 8, done. Delta compression using up to 2 threads. @@ -433,7 +435,7 @@ $ git config --bool core.bare false # need to allow this repository to have chec $ ls # Nothing to be seen, but it's there $ git branch french -* master +* main web $ git checkout web # Get the contents of the 'web' branch in other $ ls diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/6.2.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/6.2.html deleted file mode 100644 index eb7a0d98da..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/6.2.html +++ /dev/null @@ -1,131 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 6.2 New and Noteworthy</title> - <link type="text/css" rel="stylesheet" href="../../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">EGit 6.2 New and Noteworthy</th> - </tr> - <tr> - <td style="width: 20%" align="left"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Contributors.html" title="Contributors"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Contributors</td> - </tr> - </table><hr class="navigation-separator"/> - <h1 id="EGit">EGit</h1> - <h2 id="Commit_Messages">Commit Messages</h2> - <p>EGit 6.1 had introduced support for git config <tt> - <a href="https://git-scm.com/docs/git-config#Documentation/git-config.txt-commitcleanup" target="egit_external">commit.cleanup</a></tt>, including syntax coloring comment lines in commit messages, and a preview of the final commit message after cleaning. - </p> - <p>EGit 6.2 adds support for git config <tt> - <a href="https://git-scm.com/docs/git-config#Documentation/git-config.txt-corecommentChar" target="egit_external">core.commentChar</a></tt>. It enables users to change the default comment character # to some other ASCII character. EGit 6.2 takes this setting into account and determines comment lines in commit messages accordingly, for instance with <tt>core.commentChar = ;</tt> as: - </p> - <p> - <img alt=""Dialog shown to edit the commit message when squashing two commits"" border="0" src="images/EGit_6.2_CommentChar.png"/> - </p> - <h2 id="Git_Staging_View">Git Staging View</h2> - <p>The Git Staging View has a new "Push Settings" button with a cogwheel icon, providing a way to customize some settings for the <tt>push</tt> part of the - <i>Commit & Push</i> operation. - </p> - <p> - <img alt=""The new Push Settings button with its drop-down menu expanded"" border="0" src="images/EGit_6.2_Staging_Push_Settings.png"/> - </p> - <p>There are options to perform a force push, or to open a push dialog instead of just pushing automatically. If the "Force Push" option is active, the button's icon shows a little green plus sign top-right.</p> - <p>Settings made here are persisted; they are stored separately per repository, and they will be in effect for any - <i>Commit & Push</i> operation on a particular repository until changed again via this "Push Settings" button. - </p> - <p> - <i>Commit & Push</i> performs the equivalent of - </p> - <pre> git push <remote> HEAD:<upstream branch> -</pre> - <p>The remote is determined via git configs <tt> - <a href="https://git-scm.com/docs/git-config#Documentation/git-config.txt-branchltnamegtpushRemote" target="egit_external">branch.&lt;name>.pushRemote</a></tt>, <tt> - <a href="https://git-scm.com/docs/git-config#Documentation/git-config.txt-remotepushDefault" target="egit_external">remote.pushDefault</a></tt>, <tt> - <a href="https://git-scm.com/docs/git-config#Documentation/git-config.txt-branchltnamegtremote" target="egit_external">branch.&lt;name>.remote</a></tt>, "<tt>origin</tt>". - The upstream branch is determined from the <tt> - <a href="https://git-scm.com/docs/git-config#Documentation/git-config.txt-branchltnamegtmerge" target="egit_external">branch.&lt;name>.merge</a></tt> git configuration of the currently checked out branch; if none is set, the upstream branch is assumed to have the same name as the current local branch. - </p> - <p>Activating the "Force Push" option changes this to</p> - <pre> git push <remote> +HEAD:<upstream branch> -</pre> - <p> - <b>Note:</b> if the repository is configured for Gerrit and the - <i>Commit & Push</i> operation will attempt pushing to Gerrit, then the "Push Settings" button is not available. First, the command will in that case always use a dialog, and second, force pushing a commit as a new change or patch set to Gerrit makes no sense. - </p> - <h2 id="Support_for_External_Diff_and_Merge_Tools">Support for External Diff and Merge Tools</h2> - <p>EGit 6.2 supports the use of external diff and merge tools. An external tool can be configured via a new preference page, potentially combined with git repository configuration, as well as per product customization.</p> - <p>To configure an external diff or merge tool via the preference page:</p> - <ol> - <li>Navigate to the preference page: <b>Main menu -> Window -> Preferences -> Version Control (Team) -> Git -> Diff/Merge</b></li> - <li>In the diff or merge section, select the radio button for an external tool and select a tool from the combo box. Only tools available on your system are listed.</li> - </ol> - <p> - <img border="0" src="images/Bug552338_external_diff_merge_tool_preference_page.png"/> - </p> - <p>Alternatively, you can select using the available git configuration and configure a tool via <tt>git config</tt>:</p> - <pre>[merge] - tool = customMergeTool -[mergetool "customMergeTool"] - cmd = kdiff3 "$LOCAL" "$REMOTE" "$MERGED" "$BASE" - path = /usr/bin/kdiff3 - prompt = false - trustExitCode = false -</pre> - <pre>[diff] - tool = customDiffTool -[difftool "customDiffTool"] - cmd = kdiff3 "$LOCAL" "$REMOTE" -</pre> - <p>To use a tool available on your system as default, specify e.g. the following via git config:</p> - <pre>[merge] - tool = kdiff3 -</pre> - <p>You can override the default tool per folder and per file type, using the <tt>.gitattributes</tt> file in a folder. The override will apply for subfolders, as long as a subfolder does not override the tool via <tt>.gitattributes</tt>:</p> - <pre>attributes: -* mergetool=kdiff3 -*.txt difftool=kompare -</pre> - <p>To configure an external diff or merge tool via product customization, specify the following in your customization file (passed to Eclipse via the command line argument, e.g. <tt>-pluginCustomization /some/path/my_customization.ini</tt>):</p> - <pre>org.eclipse.egit.ui/diff_tool_custom=kdiff3 -org.eclipse.egit.ui/diff_tool_mode=3 -</pre> - <p>You can also configure a external tools per-extension. The value of the preference is comma separated pairs of extension and invocation command:</p> - <pre>org.eclipse.egit.ui/external_diff_tool_per_extension=txt,/usr/bin/kdiff3 "$LOCAL" "$REMOTE" -org.eclipse.egit.ui/diff_tool_mode=1 -</pre> - <h2 id="Other_Changes">Other Changes</h2> - <p>The complete list of new features and bug fixes is available in the - <a href="https://projects.eclipse.org/projects/technology.egit/releases/6.2/" target="egit_external">release notes</a>. - </p><hr class="navigation-separator"/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Contributors.html" title="Contributors"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Contributors</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/images/Bug552338_external_diff_merge_tool_preference_page.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/images/Bug552338_external_diff_merge_tool_preference_page.png Binary files differdeleted file mode 100644 index 7d11b00ddc..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/images/Bug552338_external_diff_merge_tool_preference_page.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/images/EGit_6.2_CommentChar.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/images/EGit_6.2_CommentChar.png Binary files differdeleted file mode 100644 index 7fef23b22c..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/images/EGit_6.2_CommentChar.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/images/EGit_6.2_Staging_Push_Settings.png b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/images/EGit_6.2_Staging_Push_Settings.png Binary files differdeleted file mode 100644 index 409621f525..0000000000 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/images/EGit_6.2_Staging_Push_Settings.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.7/6.7.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.7/6.7.html new file mode 100644 index 0000000000..30bbef6668 --- /dev/null +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.7/6.7.html @@ -0,0 +1,58 @@ +<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>EGit 6.7 New and Noteworthy</title> + <link type="text/css" rel="stylesheet" href="../../../book.css"/> + </head> + <body> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <th style="width: 100%" align="center" colspan="3">EGit 6.7 New and Noteworthy</th> + </tr> + <tr> + <td style="width: 20%" align="left"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Contributors.html" title="Contributors"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Contributors</td> + </tr> + </table><hr class="navigation-separator"/> + <h1 id="EGit">EGit</h1> + <h2 id="Features">Features</h2> + <h3 id="Git_Config_Files">Git Config Files</h3> + <p>JGit has learned to handle the git config file <tt>$XDG_CONFIG_HOME/git/config</tt>, if it exists. EGit shows this extra git config file in the preferences dialog in section "Version Control (Team)→Git→Configuration", and also in the properties view of a repository.</p> + <h3 id="SSH_Connections_support_PKCS.2311_Hardware_Security_Modules">SSH Connections support PKCS#11 Hardware Security Modules</h3> + <p>JGit 6.7.0 has added support for using PKCS#11 Hardware Security Modules for SSH public-key authentication. EGit transparently inherits this feature. All configuration is via the <tt>~/.ssh/config</tt> SSH configuration file; there is no UI. Please see the + <a href="../../../JGit/New_and_Noteworthy/6.7/6.7.html#SSH_Connections_support_PKCS.2311_Hardware_Security_Modules" title="JGit/New_and_Noteworthy/6.7#SSH_Connections_support_PKCS.2311_Hardware_Security_Modules">new features in JGit</a> for hints on how to configure this. + </p> + <p>EGit will prompt for the HSM token's PIN upon first use, and subsequently only when required by the HSM, as long as the application using EGit runs. After a restart of the application, or when the HSM device is removed or re-inserted, it may prompt again.</p> + <h2 id="Other_Changes">Other Changes</h2> + <p>The complete list of new features and bug fixes is available in the + <a href="https://projects.eclipse.org/projects/technology.egit/releases/6.7.0/" target="egit_external">release notes</a>. + </p><hr class="navigation-separator"/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Contributors.html" title="Contributors"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Contributors</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/Contributors.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.7/Contributors.html index 5dd29630ac..a34e2b759e 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/Contributors.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.7/Contributors.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 6.2 New and Noteworthy - Contributors</title> + <title>EGit 6.7 New and Noteworthy - Contributors</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -12,7 +12,7 @@ </tr> <tr> <td style="width: 20%" align="left"> - <a href="6.2.html" title="EGit 6.2 New and Noteworthy"> + <a href="6.7.html" title="EGit 6.7 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -24,30 +24,26 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">EGit 6.2 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">EGit 6.7 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">See Also</td> </tr> </table><hr class="navigation-separator"/> <h1 id="Contributors">Contributors</h1> - <p>The following 7 developers worked on this release:</p> - <p>Andre Bossert, - Andrey Loskutov, + <p>The following 3 developers worked on this release:</p> + <p>Jörg Kubitz, Matthias Sohn, - Michael Keppler, - Mykola Zakharchuk, - Simeon Andreev, Thomas Wolf</p><hr class="navigation-separator"/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="6.2.html" title="EGit 6.2 New and Noteworthy"> + <a href="6.7.html" title="EGit 6.7 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="6.2.html" title="EGit 6.2 New and Noteworthy"> - <img alt="EGit 6.2 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="6.7.html" title="EGit 6.7 New and Noteworthy"> + <img alt="EGit 6.7 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> @@ -57,7 +53,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">EGit 6.2 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">EGit 6.7 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">See Also</td> </tr> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/See-Also.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.7/See-Also.html index 924994444c..bc8e91c47b 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/See-Also.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.7/See-Also.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 6.2 New and Noteworthy - See Also</title> + <title>EGit 6.7 New and Noteworthy - See Also</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -31,7 +31,7 @@ </table><hr class="navigation-separator"/> <h1 id="See_Also">See Also</h1> <p>See also the - <a href="../../../JGit/New_and_Noteworthy/6.2/6.2.html" title="JGit/New_and_Noteworthy/6.2">new features in JGit</a> for additional information. + <a href="../../../JGit/New_and_Noteworthy/6.7/6.7.html" title="JGit/New_and_Noteworthy/6.7">new features in JGit</a> for additional information. </p><hr class="navigation-separator"/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> @@ -41,8 +41,8 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="6.2.html" title="EGit 6.2 New and Noteworthy"> - <img alt="EGit 6.2 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="6.7.html" title="EGit 6.7 New and Noteworthy"> + <img alt="EGit 6.7 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> diff --git a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/Updating-This-Document.html b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.7/Updating-This-Document.html index dfc7a18ae8..d885ebfabd 100644 --- a/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.2/Updating-This-Document.html +++ b/org.eclipse.egit.doc/help/EGit/New_and_Noteworthy/6.7/Updating-This-Document.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>EGit 6.2 New and Noteworthy - Updating This Document</title> + <title>EGit 6.7 New and Noteworthy - Updating This Document</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -29,7 +29,7 @@ <p> This document is maintained in a collaborative wiki. If you wish to update or modify this document please visit - <a href="https://wiki.eclipse.org/EGit/New_and_Noteworthy/6.2" target="egit_external">https://wiki.eclipse.org/EGit/New_and_Noteworthy/6.2</a> + <a href="https://wiki.eclipse.org/EGit/New_and_Noteworthy/6.7" target="egit_external">https://wiki.eclipse.org/EGit/New_and_Noteworthy/6.7</a> </p><hr class="navigation-separator"/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> @@ -39,8 +39,8 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="6.2.html" title="EGit 6.2 New and Noteworthy"> - <img alt="EGit 6.2 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="6.7.html" title="EGit 6.7 New and Noteworthy"> + <img alt="EGit 6.7 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"></td> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html index f2ba52090a..95f8c688fd 100644 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html +++ b/org.eclipse.egit.doc/help/EGit/User_Guide/Tasks.html @@ -2460,38 +2460,8 @@ Sein oder nicht sein <br/> </p> <h2 id="Working_with_Tasks">Working with Tasks</h2> - <p>Since EGit 0.11 a first integration with Mylyn is available to support working with task repositories.</p> - <h3 id="Installation">Installation</h3> - <p>You need to install the feature "EGit Mylyn" to use the EGit Mylyn integration. This requires also Mylyn to be installed.</p> - <h3 id="Commit_Message_Template">Commit Message Template</h3> - <ul> - <li>Configure the Mylyn commit message template under - <b>Preferences > Tasks > Team</b> and edit - <b>Commit Comment Template</b>. - </li> - <li>Use the following variables as well as any text to alter the commit message. - <ul> - <li>connector.task.prefix, repository.kind, repository.url, task.assignee, task.cc, task.description, task.id, task.key, task.keywords, task.lastmodified, task.notes, task.priority, task.product, task.reporter, task.resolution, task.status, task.summary, task.type, task.url, task.completiondate, task.creationdate, task.reminderdate</li> - </ul> - </li> - </ul> - <p> - <img border="0" src="images/Egit-0.11-configure-commit-template.png"/> - </p> - <ul> - <li>Before committing your change activate the corresponding Task using the Mylyn UI.</li> - </ul> - <p> - <img border="0" src="images/Egit-0.11-activate-task.png"/> - </p> - <ul> - <li>When launching the commit dialog EGit will pre-populate the commit message using the commit message template.</li> - </ul> - <p> - <img border="0" src="images/Egit-0.11-commit-using-template.png"/> - </p> - <p>See the - <a href="http://wiki.eclipse.org/index.php/Mylyn/User_Guide" target="egit_external">Mylyn User Guide</a> for more information how to work with tasks. + <p>The EGit integration with Mylyn was moved to Mylyn in Eclipse 2023-06. See + <a href="https://github.com/eclipse-mylyn/org.eclipse.mylyn/tree/main/mylyn.egit" target="egit_external">mylyn.egit</a>. </p> <h2 id="Viewing_Commits">Viewing Commits</h2> <p>The Egit commit viewer allows commits to be opened in the Eclipse editor area.</p> diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-activate-task.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-activate-task.png Binary files differdeleted file mode 100644 index 32722d1fad..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-activate-task.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-commit-using-template.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-commit-using-template.png Binary files differdeleted file mode 100644 index 8083fbd41a..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-commit-using-template.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-configure-commit-template.png b/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-configure-commit-template.png Binary files differdeleted file mode 100644 index e68fdca1af..0000000000 --- a/org.eclipse.egit.doc/help/EGit/User_Guide/images/Egit-0.11-configure-commit-template.png +++ /dev/null diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.2/6.2.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.2/6.2.html deleted file mode 100644 index dfc1ec7cae..0000000000 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.2/6.2.html +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 6.2 New and Noteworthy</title> - <link type="text/css" rel="stylesheet" href="../../../book.css"/> - </head> - <body> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <th style="width: 100%" align="center" colspan="3">JGit 6.2 New and Noteworthy</th> - </tr> - <tr> - <td style="width: 20%" align="left"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Contributors.html" title="Contributors"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Contributors</td> - </tr> - </table><hr class="navigation-separator"/> - <h1 id="JGit">JGit</h1> - <h2 id="New_Features">New Features</h2> - <h3 id="Git_config_core.commentChar">Git config core.commentChar</h3> - <p>The git config <tt> - <a href="https://git-scm.com/docs/git-config#Documentation/git-config.txt-corecommentChar" target="egit_external">core.commentChar</a></tt> is supported as of JGit 6.2. It enables users to change the default character indicating comment lines in commit messages, which by default is <tt>#</tt>. The <tt>auto</tt> setting is also supported. - </p> - <h3 id="Negative_Refspecs">Negative Refspecs</h3> - <p>JGit 6.2 supports - <i>negative refspecs</i> when fetching, introduced in C git 2.29. Negative refspecs enable a git client to specify that some refs should - <i>not</i> be fetched. A negative refspec has the form <tt>^refs/...</tt> and it many contain the <tt>*</tt> wildcard. For the details, see the - <a href="https://git-scm.com/docs/git-fetch#Documentation/git-fetch.txt-ltrefspecgt" target="egit_external">git fetch documentation</a>, or the - <a href="https://github.blog/2020-10-19-git-2-29-released/#user-content-negative-refspecs" target="egit_external">git 2.29 announcement</a>. - </p> - <h3 id="Support_for_External_Diff_and_Merge_Tools">Support for External Diff and Merge Tools</h3> - <p>JGit 6.2 supports the use of external diff and merge tools. To invoke a merge or diff tool use, for instance:</p> - <pre>jgit difftool --tool=kdiff3 -jgit mergetool --tool=kdiff3 -</pre> - <p>The list of diff or merge tools configured on the system may be obtained via</p> - <pre>jgit difftool --tool-help -jgit mergetool --tool-help -</pre> - <p>Diff or merge tools are defined in the git configuration files, typically in the repository or user git config. The mechanism is the same for both. An example of a merge tool definition might be</p> - <pre>[merge] - tool = customTool -[mergetool "customTool"] - cmd = echo - path = /usr/bin/echo - prompt = false - trustExitCode = false -</pre> - <p>For a diff tool definition, use <tt>diff.tool = <name></tt> and define it via <tt>diff.<name>.*</tt> instead of <tt>merge.tool</tt> and <tt>merge.<name>.*</tt>.</p> - <p>For the details of configurations and possible parameters to the <tt>difftool</tt> or <tt>mergetool</tt> commands, see the official git documentation on <tt> - <a href="https://git-scm.com/docs/git-difftool" target="egit_external">git difftool</a></tt> and <tt> - <a href="https://git-scm.com/docs/git-mergetool" target="egit_external">git mergetool</a></tt>. - </p> - <h2 id="Other_Changes">Other Changes</h2> - <p>The complete list of new features and bug fixes is available in the - <a href="https://projects.eclipse.org/projects/technology.jgit/releases/6.2/" target="egit_external">release notes</a>. - </p><hr class="navigation-separator"/> - <table class="navigation" style="width: 100%;" border="0" summary="navigation"> - <tr> - <td style="width: 20%" align="left"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right"> - <a href="Contributors.html" title="Contributors"> - <img alt="Next" border="0" src="../../../images/next.gif"/> - </a> - </td> - </tr> - <tr> - <td style="width: 20%" align="left" valign="top"></td> - <td style="width: 60%" align="center"></td> - <td style="width: 20%" align="right" valign="top">Contributors</td> - </tr> - </table> - </body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.7/6.7.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.7/6.7.html new file mode 100644 index 0000000000..c105e73cbd --- /dev/null +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.7/6.7.html @@ -0,0 +1,95 @@ +<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>JGit 6.7 New and Noteworthy</title> + <link type="text/css" rel="stylesheet" href="../../../book.css"/> + </head> + <body> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <th style="width: 100%" align="center" colspan="3">JGit 6.7 New and Noteworthy</th> + </tr> + <tr> + <td style="width: 20%" align="left"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Contributors.html" title="Contributors"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Contributors</td> + </tr> + </table><hr class="navigation-separator"/> + <h1 id="JGit">JGit</h1> + <h2 id="Features">Features</h2> + <h3 id="SSH_Connections_support_PKCS.2311_Hardware_Security_Modules">SSH Connections support PKCS#11 Hardware Security Modules</h3> + <p>The SSH transport <code>org.eclipse.jgit.ssh.apache</code> of JGit 6.7.0 supports using PKCS#11 Hardware Security Modules (HSM) for public-key authentication. + It uses Java's built-in mechanisms to access PKCS#11-compliant HSMs via the <code>SunPKCS11</code> security provider.</p> + <p>This can be configured in the SSH configuration file <tt>~/.ssh/config</tt> as follows:</p> + <pre> Host git.acme.com + Hostname ... + User ... + PKCS11Provider /absolute/path/to/pkcs11/shared/library +</pre> + <p>The "PKCS#11 shared library" is typically provided by the vendor of the HSM; it provides the standard PKCS#11 API to the device. If the path contains blanks, quote it with double quotes.</p> + <p>HSMs may have multiple "slots" containing different tokens. JGit by default uses keys from the first slot/token. To select a different slot, use a config like</p> + <pre> # At the very top of the file: tell OpenSSH to ignore this option, which it doesn't know + IgnoreUnknown PKCS11SlotListIndex + ... + Host git.acme.com + Hostname ... + User ... + PKCS11Provider /absolute/path/to/pkcs11/shared/library + PKCS11SlotListIndex <slot number> +</pre> + <p>Note that this is the slot + <i>index</i>, not the slot ID. The index is just a number, the first slot has index 0, the next 1, and so on. + </p> + <p>Some slots may contain multiple certificates or keys. JGit just tries all keys from a slot in the order they are delivered by the <tt>SunPKCS11</tt> provider. To specify that a particular key should be used, export the public key to a file, say <tt>~/.ssh/my_hsm_key.pub</tt>, in SSH format.</p> + <dl> + <dd> + <dl> + <dd>(Please consult the documentation provided by the vendor of the HSM on how to export a public key. Once it exists as a PEM file, it can be converted to SSH format using <tt>ssh-keygen -f my_hsm_key.pem -m pkcs8 -i > ~/.ssh/my_hsm_key.pub</tt>.)</dd> + </dl> + </dd> + </dl> + <p>Then use <tt>IdentityFile</tt>, plus <tt>IdentitiesOnly</tt> to specify that only the keys listed via <tt>IdentityFile</tt> shall be used:</p> + <pre> Host git.acme.com + Hostname ... + User ... + PKCS11Provider /absolute/path/to/pkcs11/shared/library + IdentityFile ~/.ssh/my_hsm_key + IdentitiesOnly yes +</pre> + <p>Note that there is no "<tt>.pub</tt>" file extension for the <tt>IdentityFile</tt>, and this file without the <tt>.pub</tt> suffix need not (and usually will not) exist. But the corresponding <tt>~/.ssh/my_hsm_key.pub</tt> should exist!</p> + <h3 id="Other_Features">Other Features</h3> + <ul> + <li>JGit has learned to read the git config file <tt>$XDG_CONFIG_HOME/git/config</tt>, if it exists, in addition to the global git config file in the user's home directory.</li> + </ul> + <h2 id="Other_Changes">Other Changes</h2> + <p>The complete list of new features and bug fixes is available in the + <a href="https://projects.eclipse.org/projects/technology.jgit/releases/6.7.0/" target="egit_external">release notes</a>. + </p><hr class="navigation-separator"/> + <table class="navigation" style="width: 100%;" border="0" summary="navigation"> + <tr> + <td style="width: 20%" align="left"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right"> + <a href="Contributors.html" title="Contributors"> + <img alt="Next" border="0" src="../../../images/next.gif"/> + </a> + </td> + </tr> + <tr> + <td style="width: 20%" align="left" valign="top"></td> + <td style="width: 60%" align="center"></td> + <td style="width: 20%" align="right" valign="top">Contributors</td> + </tr> + </table> + </body> +</html>
\ No newline at end of file diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.2/Contributors.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.7/Contributors.html index 2035ad8035..af5cf4438e 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.2/Contributors.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.7/Contributors.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 6.2 New and Noteworthy - Contributors</title> + <title>JGit 6.7 New and Noteworthy - Contributors</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -12,7 +12,7 @@ </tr> <tr> <td style="width: 20%" align="left"> - <a href="6.2.html" title="JGit 6.2 New and Noteworthy"> + <a href="6.7.html" title="JGit 6.7 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> @@ -24,36 +24,38 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">JGit 6.2 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">JGit 6.7 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Updating This Document</td> </tr> </table><hr class="navigation-separator"/> <h1 id="Contributors">Contributors</h1> - <p>The following 13 developers worked on this release:</p> - <p>Andre Bossert, - Andrey Loskutov, - Fabio Ponciroli, + <p>The following 15 developers worked on this release:</p> + <p>Anna Papitto, + Antoine Musso, + David Ostrovsky, + Haamed Gheibi, Han-Wen Nienhuys, - James Z.M. Gao, + Ivan Frade, + Jonathan Tan, + Jörg Kubitz, Luca Milanesio, - Matthias Fromme, + Martin Fick, Matthias Sohn, - Michael Keppler, - Simon Sohrt, - Sven Selberg, - Thomas Wolf, - Yun Jieli</p><hr class="navigation-separator"/> + Nitzan Gur-Furman, + Qin Shulei, + Ronald Bhuleskar, + Thomas Wolf</p><hr class="navigation-separator"/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> <td style="width: 20%" align="left"> - <a href="6.2.html" title="JGit 6.2 New and Noteworthy"> + <a href="6.7.html" title="JGit 6.7 New and Noteworthy"> <img alt="Previous" border="0" src="../../../images/prev.gif"/> </a> </td> <td style="width: 60%" align="center"> - <a href="6.2.html" title="JGit 6.2 New and Noteworthy"> - <img alt="JGit 6.2 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="6.7.html" title="JGit 6.7 New and Noteworthy"> + <img alt="JGit 6.7 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"> @@ -63,7 +65,7 @@ </td> </tr> <tr> - <td style="width: 20%" align="left" valign="top">JGit 6.2 New and Noteworthy</td> + <td style="width: 20%" align="left" valign="top">JGit 6.7 New and Noteworthy</td> <td style="width: 60%" align="center"></td> <td style="width: 20%" align="right" valign="top">Updating This Document</td> </tr> diff --git a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.2/Updating-This-Document.html b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.7/Updating-This-Document.html index c95b5ec0ab..789dbd76c2 100644 --- a/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.2/Updating-This-Document.html +++ b/org.eclipse.egit.doc/help/JGit/New_and_Noteworthy/6.7/Updating-This-Document.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>JGit 6.2 New and Noteworthy - Updating This Document</title> + <title>JGit 6.7 New and Noteworthy - Updating This Document</title> <link type="text/css" rel="stylesheet" href="../../../book.css"/> </head> <body> @@ -29,7 +29,7 @@ <p> This document is maintained in a collaborative wiki. If you wish to update or modify this document please visit - <a href="https://wiki.eclipse.org/JGit/New_and_Noteworthy/6.2" target="egit_external">https://wiki.eclipse.org/JGit/New_and_Noteworthy/6.2</a> + <a href="https://wiki.eclipse.org/JGit/New_and_Noteworthy/6.7" target="egit_external">https://wiki.eclipse.org/JGit/New_and_Noteworthy/6.7</a> </p><hr class="navigation-separator"/> <table class="navigation" style="width: 100%;" border="0" summary="navigation"> <tr> @@ -39,8 +39,8 @@ </a> </td> <td style="width: 60%" align="center"> - <a href="6.2.html" title="JGit 6.2 New and Noteworthy"> - <img alt="JGit 6.2 New and Noteworthy" border="0" src="../../../images/home.gif"/> + <a href="6.7.html" title="JGit 6.7 New and Noteworthy"> + <img alt="JGit 6.7 New and Noteworthy" border="0" src="../../../images/home.gif"/> </a> </td> <td style="width: 20%" align="right"></td> diff --git a/org.eclipse.egit.doc/help/toc.xml b/org.eclipse.egit.doc/help/toc.xml index f761ac9875..a6b25b9750 100644 --- a/org.eclipse.egit.doc/help/toc.xml +++ b/org.eclipse.egit.doc/help/toc.xml @@ -285,10 +285,7 @@ <topic href="help/EGit/User_Guide/Tasks.html#Show_in_Properties" label="Show in Properties"></topic> </topic> </topic> - <topic href="help/EGit/User_Guide/Tasks.html#Working_with_Tasks" label="Working with Tasks"> - <topic href="help/EGit/User_Guide/Tasks.html#Installation" label="Installation"></topic> - <topic href="help/EGit/User_Guide/Tasks.html#Commit_Message_Template" label="Commit Message Template"></topic> - </topic> + <topic href="help/EGit/User_Guide/Tasks.html#Working_with_Tasks" label="Working with Tasks"></topic> <topic href="help/EGit/User_Guide/Tasks.html#Viewing_Commits" label="Viewing Commits"> <topic href="help/EGit/User_Guide/Tasks.html#Tagging_a_commit" label="Tagging a commit"></topic> <topic href="help/EGit/User_Guide/Tasks.html#Creating_a_branch_from_a_commit" label="Creating a branch from a commit"></topic> @@ -450,28 +447,28 @@ </topic> <topic href="help/JGit/User_Guide/Updating-This-Document.html" label="Updating This Document"></topic> </topic> - <topic href="help/EGit/New_and_Noteworthy/6.2/6.2.html" label="EGit 6.2 New and Noteworthy"> - <topic href="help/EGit/New_and_Noteworthy/6.2/6.2.html" label="EGit"> - <topic href="help/EGit/New_and_Noteworthy/6.2/6.2.html#Commit_Messages" label="Commit Messages"></topic> - <topic href="help/EGit/New_and_Noteworthy/6.2/6.2.html#Git_Staging_View" label="Git Staging View"></topic> - <topic href="help/EGit/New_and_Noteworthy/6.2/6.2.html#Support_for_External_Diff_and_Merge_Tools" label="Support for External Diff and Merge Tools"></topic> - <topic href="help/EGit/New_and_Noteworthy/6.2/6.2.html#Other_Changes" label="Other Changes"></topic> + <topic href="help/EGit/New_and_Noteworthy/6.7/6.7.html" label="EGit 6.7 New and Noteworthy"> + <topic href="help/EGit/New_and_Noteworthy/6.7/6.7.html" label="EGit"> + <topic href="help/EGit/New_and_Noteworthy/6.7/6.7.html#Features" label="Features"> + <topic href="help/EGit/New_and_Noteworthy/6.7/6.7.html#Git_Config_Files" label="Git Config Files"></topic> + <topic href="help/EGit/New_and_Noteworthy/6.7/6.7.html#SSH_Connections_support_PKCS.2311_Hardware_Security_Modules" label="SSH Connections support PKCS#11 Hardware Security Modules"></topic> + </topic> + <topic href="help/EGit/New_and_Noteworthy/6.7/6.7.html#Other_Changes" label="Other Changes"></topic> </topic> - <topic href="help/EGit/New_and_Noteworthy/6.2/Contributors.html" label="Contributors"></topic> - <topic href="help/EGit/New_and_Noteworthy/6.2/See-Also.html" label="See Also"></topic> - <topic href="help/EGit/New_and_Noteworthy/6.2/Updating-This-Document.html" label="Updating This Document"></topic> + <topic href="help/EGit/New_and_Noteworthy/6.7/Contributors.html" label="Contributors"></topic> + <topic href="help/EGit/New_and_Noteworthy/6.7/See-Also.html" label="See Also"></topic> + <topic href="help/EGit/New_and_Noteworthy/6.7/Updating-This-Document.html" label="Updating This Document"></topic> </topic> - <topic href="help/JGit/New_and_Noteworthy/6.2/6.2.html" label="JGit 6.2 New and Noteworthy"> - <topic href="help/JGit/New_and_Noteworthy/6.2/6.2.html" label="JGit"> - <topic href="help/JGit/New_and_Noteworthy/6.2/6.2.html#New_Features" label="New Features"> - <topic href="help/JGit/New_and_Noteworthy/6.2/6.2.html#Git_config_core.commentChar" label="Git config core.commentChar"></topic> - <topic href="help/JGit/New_and_Noteworthy/6.2/6.2.html#Negative_Refspecs" label="Negative Refspecs"></topic> - <topic href="help/JGit/New_and_Noteworthy/6.2/6.2.html#Support_for_External_Diff_and_Merge_Tools" label="Support for External Diff and Merge Tools"></topic> - </topic> - <topic href="help/JGit/New_and_Noteworthy/6.2/6.2.html#Other_Changes" label="Other Changes"></topic> + <topic href="help/JGit/New_and_Noteworthy/6.7/6.7.html" label="JGit 6.7 New and Noteworthy"> + <topic href="help/JGit/New_and_Noteworthy/6.7/6.7.html" label="JGit"> + <topic href="help/JGit/New_and_Noteworthy/6.7/6.7.html#Features" label="Features"> + <topic href="help/JGit/New_and_Noteworthy/6.7/6.7.html#SSH_Connections_support_PKCS.2311_Hardware_Security_Modules" label="SSH Connections support PKCS#11 Hardware Security Modules"></topic> + <topic href="help/JGit/New_and_Noteworthy/6.7/6.7.html#Other_Features" label="Other Features"></topic> + </topic> + <topic href="help/JGit/New_and_Noteworthy/6.7/6.7.html#Other_Changes" label="Other Changes"></topic> </topic> - <topic href="help/JGit/New_and_Noteworthy/6.2/Contributors.html" label="Contributors"></topic> - <topic href="help/JGit/New_and_Noteworthy/6.2/Updating-This-Document.html" label="Updating This Document"></topic> + <topic href="help/JGit/New_and_Noteworthy/6.7/Contributors.html" label="Contributors"></topic> + <topic href="help/JGit/New_and_Noteworthy/6.7/Updating-This-Document.html" label="Updating This Document"></topic> </topic> <topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" label="Git for Eclipse Users"> <topic href="help/EGit/Git_For_Eclipse_Users/Git-For-Eclipse-Users.html" label="Centralised version control systems"></topic> @@ -519,7 +516,10 @@ <topic href="help/EGit/Contributor_Guide/Builds.html#FindBugs_and_PMD" label="FindBugs and PMD"></topic> <topic href="help/EGit/Contributor_Guide/Builds.html#Checking_for_JGit_API_Changes_using_API_Baseline" label="Checking for JGit API Changes using API Baseline"></topic> <topic href="help/EGit/Contributor_Guide/Builds.html#Signing_and_Publishing" label="Signing and Publishing"></topic> - <topic href="help/EGit/Contributor_Guide/Builds.html#Creating_a_release" label="Creating a release"></topic> + <topic href="help/EGit/Contributor_Guide/Builds.html#Creating_a_release" label="Creating a release"> + <topic href="help/EGit/Contributor_Guide/Builds.html#Release_Notes" label="Release Notes"></topic> + <topic href="help/EGit/Contributor_Guide/Builds.html#New_and_Noteworthy" label="New and Noteworthy"></topic> + </topic> <topic href="help/EGit/Contributor_Guide/Builds.html#Contribution_to_Release_Train" label="Contribution to Release Train"></topic> </topic> <topic href="help/EGit/Contributor_Guide/Documentation.html" label="Documentation"> diff --git a/org.eclipse.egit.doc/pom.xml b/org.eclipse.egit.doc/pom.xml index 3444ffaeb5..aee94529a4 100644 --- a/org.eclipse.egit.doc/pom.xml +++ b/org.eclipse.egit.doc/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> + <version>6.8.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.doc</artifactId> diff --git a/org.eclipse.egit.gitflow-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.gitflow-feature/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit.gitflow-feature/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit.gitflow-feature/feature.properties b/org.eclipse.egit.gitflow-feature/feature.properties index a93127be8a..8e88046999 100644 --- a/org.eclipse.egit.gitflow-feature/feature.properties +++ b/org.eclipse.egit.gitflow-feature/feature.properties @@ -19,7 +19,7 @@ description=GitFlow support for Git integration in Eclipse # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2015, 2021 Max Hohenegger and others.\n\ +Copyright (c) 2015, 2023 Max Hohenegger and others.\n\ All rights reserved. This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License 2.0\n\ which accompanies this distribution, and is available at\n\ diff --git a/org.eclipse.egit.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 3a8cceec09..0572f81208 100644 --- a/org.eclipse.egit.gitflow-feature/feature.xml +++ b/org.eclipse.egit.gitflow-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.egit.gitflow.feature" label="%featureName" - version="6.3.0.qualifier" + version="6.8.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit.gitflow" license-feature="org.eclipse.license" @@ -26,9 +26,9 @@ </url> <requires> - <import feature="org.eclipse.jgit" version="6.3.0" match="equivalent"/> - <import plugin="org.eclipse.egit.core" version="6.3.0" match="equivalent"/> - <import plugin="org.eclipse.egit.ui" version="6.3.0" match="equivalent"/> + <import feature="org.eclipse.jgit" version="6.8.0" match="equivalent"/> + <import plugin="org.eclipse.egit.core" version="6.8.0" match="equivalent"/> + <import plugin="org.eclipse.egit.ui" version="6.8.0" match="equivalent"/> </requires> <plugin diff --git a/org.eclipse.egit.gitflow-feature/pom.xml b/org.eclipse.egit.gitflow-feature/pom.xml index c3adee772b..53bd2de07f 100644 --- a/org.eclipse.egit.gitflow-feature/pom.xml +++ b/org.eclipse.egit.gitflow-feature/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> + <version>6.8.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.egit.feature</groupId> diff --git a/org.eclipse.egit.gitflow.test/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit.gitflow.test/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit.gitflow.test/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit.gitflow.test/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.gitflow.test/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit.gitflow.test/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit.gitflow.test/.settings/org.eclipse.pde.prefs b/org.eclipse.egit.gitflow.test/.settings/org.eclipse.pde.prefs index caeaa5a45b..b2aecffcfa 100644 --- a/org.eclipse.egit.gitflow.test/.settings/org.eclipse.pde.prefs +++ b/org.eclipse.egit.gitflow.test/.settings/org.eclipse.pde.prefs @@ -25,7 +25,7 @@ compilers.p.service.component.without.lazyactivation=1 compilers.p.unknown-attribute=1 compilers.p.unknown-class=1 compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 +compilers.p.unknown-identifier=0 compilers.p.unknown-resource=1 compilers.p.unresolved-ex-points=0 compilers.p.unresolved-import=0 diff --git a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF index 891ae5a8ab..60a5e8f409 100644 --- a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: GitFlow Test Automatic-Module-Name: org.eclipse.egit.gitflow.test Bundle-SymbolicName: org.eclipse.egit.gitflow.test;singleton:=true -Bundle-Version: 6.3.0.qualifier +Bundle-Version: 6.8.0.qualifier Fragment-Host: org.eclipse.egit.gitflow Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.egit.core;version="[6.3.0,6.4.0)", - org.eclipse.jgit.junit;version="[6.3.0,6.4.0)", +Import-Package: org.eclipse.egit.core;version="[6.8.0,6.9.0)", + org.eclipse.jgit.junit;version="[6.8.0,6.9.0)", org.junit.rules;version="[4.13.0,5.0.0)", org.junit;version="[4.13.0,5.0.0)" -Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.800,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[6.3.0,6.4.0)", - org.hamcrest;bundle-version="[1.1.0,3.0.0)" +Require-Bundle: org.eclipse.core.resources;bundle-version="[3.18.100,4.0.0)", + org.eclipse.egit.core.junit;bundle-version="[6.8.0,6.9.0)", + org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" diff --git a/org.eclipse.egit.gitflow.test/pom.xml b/org.eclipse.egit.gitflow.test/pom.xml index 2e8529986c..bff4796f11 100644 --- a/org.eclipse.egit.gitflow.test/pom.xml +++ b/org.eclipse.egit.gitflow.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> + <version>6.8.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.gitflow.test</artifactId> diff --git a/org.eclipse.egit.gitflow.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit.gitflow.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit.gitflow.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit.gitflow.ui/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.gitflow.ui/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit.gitflow.ui/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF index 4bd91ff00d..06f594a2a4 100644 --- a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF @@ -3,55 +3,55 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow.ui Bundle-SymbolicName: org.eclipse.egit.gitflow.ui;singleton:=true -Bundle-Version: 6.3.0.qualifier +Bundle-Version: 6.8.0.qualifier Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Import-Package: org.eclipse.egit.core;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.internal;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.internal.job;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.op;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.project;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.settings;version="[6.3.0,6.4.0)", - org.eclipse.egit.gitflow;version="[6.3.0,6.4.0)", - org.eclipse.egit.gitflow.op;version="[6.3.0,6.4.0)", - org.eclipse.egit.ui;version="[6.3.0,6.4.0)", - org.eclipse.egit.ui.internal;version="[6.3.0,6.4.0)", - org.eclipse.egit.ui.internal.actions;version="[6.3.0,6.4.0)", - org.eclipse.egit.ui.internal.branch;version="[6.3.0,6.4.0)", - org.eclipse.egit.ui.internal.commit;version="[6.3.0,6.4.0)", - org.eclipse.egit.ui.internal.components;version="[6.3.0,6.4.0)", - org.eclipse.egit.ui.internal.decorators;version="[6.3.0,6.4.0)", - org.eclipse.egit.ui.internal.dialogs;version="[6.3.0,6.4.0)", - org.eclipse.egit.ui.internal.expressions;version="[6.3.0,6.4.0)", - org.eclipse.egit.ui.internal.push;version="[6.3.0,6.4.0)", - org.eclipse.egit.ui.internal.rebase;version="[6.3.0,6.4.0)", - org.eclipse.egit.ui.internal.repository.tree;version="[6.3.0,6.4.0)", - org.eclipse.egit.ui.internal.selection;version="[6.3.0,6.4.0)", - org.eclipse.jgit.annotations;version="[6.3.0,6.4.0)", - org.eclipse.jgit.api;version="[6.3.0,6.4.0)", - org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lib;version="[6.3.0,6.4.0)", - org.eclipse.jgit.revplot;version="[6.3.0,6.4.0)", - org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)", - org.eclipse.jgit.util;version="[6.3.0,6.4.0)" -Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.800,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)", - org.eclipse.team.ui;bundle-version="[3.8.1000,4.0.0)", - org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", - org.eclipse.ui;bundle-version="[3.118.0,4.0.0)", - org.eclipse.jface.databinding;bundle-version="[1.12.0,2.0.0)", - org.eclipse.core.databinding.property;bundle-version="[1.8.100,2.0.0)", - org.eclipse.core.databinding.beans;bundle-version="[1.7.0,2.0.0)", - org.eclipse.core.databinding;bundle-version="[1.10.0,2.0.0)" -Export-Package: org.eclipse.egit.gitflow.ui;version="6.3.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal;version="6.3.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.actions;version="6.3.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.gitflow.ui.internal.decorators;version="6.3.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.dialogs;version="6.3.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.factories;version="6.3.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.menu;version="6.3.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.properties;version="6.3.0";x-internal:=true, - org.eclipse.egit.gitflow.ui.internal.validation;version="6.3.0";x-internal:=true +Import-Package: org.eclipse.egit.core;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.internal;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.internal.job;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.op;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.project;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.settings;version="[6.8.0,6.9.0)", + org.eclipse.egit.gitflow;version="[6.8.0,6.9.0)", + org.eclipse.egit.gitflow.op;version="[6.8.0,6.9.0)", + org.eclipse.egit.ui;version="[6.8.0,6.9.0)", + org.eclipse.egit.ui.internal;version="[6.8.0,6.9.0)", + org.eclipse.egit.ui.internal.actions;version="[6.8.0,6.9.0)", + org.eclipse.egit.ui.internal.branch;version="[6.8.0,6.9.0)", + org.eclipse.egit.ui.internal.commit;version="[6.8.0,6.9.0)", + org.eclipse.egit.ui.internal.components;version="[6.8.0,6.9.0)", + org.eclipse.egit.ui.internal.decorators;version="[6.8.0,6.9.0)", + org.eclipse.egit.ui.internal.dialogs;version="[6.8.0,6.9.0)", + org.eclipse.egit.ui.internal.expressions;version="[6.8.0,6.9.0)", + org.eclipse.egit.ui.internal.push;version="[6.8.0,6.9.0)", + org.eclipse.egit.ui.internal.rebase;version="[6.8.0,6.9.0)", + org.eclipse.egit.ui.internal.repository.tree;version="[6.8.0,6.9.0)", + org.eclipse.egit.ui.internal.selection;version="[6.8.0,6.9.0)", + org.eclipse.jgit.annotations;version="[6.8.0,6.9.0)", + org.eclipse.jgit.api;version="[6.8.0,6.9.0)", + org.eclipse.jgit.api.errors;version="[6.8.0,6.9.0)", + org.eclipse.jgit.lib;version="[6.8.0,6.9.0)", + org.eclipse.jgit.revplot;version="[6.8.0,6.9.0)", + org.eclipse.jgit.revwalk;version="[6.8.0,6.9.0)", + org.eclipse.jgit.util;version="[6.8.0,6.9.0)" +Require-Bundle: org.eclipse.core.resources;bundle-version="[3.18.100,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", + org.eclipse.team.ui;bundle-version="[3.9.500,4.0.0)", + org.eclipse.core.expressions;bundle-version="[3.8.200,4.0.0)", + org.eclipse.ui;bundle-version="[3.201.200,4.0.0)", + org.eclipse.jface.databinding;bundle-version="[1.14.0,2.0.0)", + org.eclipse.core.databinding.property;bundle-version="[1.9.100,2.0.0)", + org.eclipse.core.databinding.beans;bundle-version="[1.9.0,2.0.0)", + org.eclipse.core.databinding;bundle-version="[1.11.200,2.0.0)" +Export-Package: org.eclipse.egit.gitflow.ui;version="6.8.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal;version="6.8.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.actions;version="6.8.0";x-friends:="org.eclipse.egit.ui.test", + org.eclipse.egit.gitflow.ui.internal.decorators;version="6.8.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.dialogs;version="6.8.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.factories;version="6.8.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.menu;version="6.8.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.properties;version="6.8.0";x-internal:=true, + org.eclipse.egit.gitflow.ui.internal.validation;version="6.8.0";x-internal:=true diff --git a/org.eclipse.egit.gitflow.ui/pom.xml b/org.eclipse.egit.gitflow.ui/pom.xml index 908be9f825..680911ac50 100644 --- a/org.eclipse.egit.gitflow.ui/pom.xml +++ b/org.eclipse.egit.gitflow.ui/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> + <version>6.8.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.gitflow.ui</artifactId> diff --git a/org.eclipse.egit.gitflow/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit.gitflow/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit.gitflow/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit.gitflow/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.gitflow/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit.gitflow/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF index fac4607958..cc1b33c3ad 100644 --- a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF @@ -3,21 +3,21 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.gitflow Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true -Bundle-Version: 6.3.0.qualifier +Bundle-Version: 6.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Activator: org.eclipse.egit.gitflow.Activator Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)" -Export-Package: org.eclipse.egit.gitflow;version="6.3.0"; +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)" +Export-Package: org.eclipse.egit.gitflow;version="6.8.0"; uses:="org.osgi.framework, org.eclipse.jgit.transport, org.eclipse.core.runtime, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", org.eclipse.egit.gitflow.internal;x-internal:=true, - org.eclipse.egit.gitflow.op;version="6.3.0"; + org.eclipse.egit.gitflow.op;version="6.8.0"; uses:="org.eclipse.jgit.transport, org.eclipse.core.runtime.jobs, org.eclipse.core.runtime, @@ -26,13 +26,13 @@ Export-Package: org.eclipse.egit.gitflow;version="6.3.0"; org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.egit.core.op" -Import-Package: org.eclipse.egit.core.internal.job;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.op;version="[6.3.0,6.4.0)", - org.eclipse.jgit.api;version="[6.3.0,6.4.0)", - org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)", - org.eclipse.jgit.annotations;version="[6.3.0,6.4.0)", - org.eclipse.jgit.errors;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lib;version="[6.3.0,6.4.0)", - org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)", - org.eclipse.jgit.revwalk.filter;version="[6.3.0,6.4.0)", - org.eclipse.jgit.transport;version="[6.3.0,6.4.0)" +Import-Package: org.eclipse.egit.core.internal.job;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.op;version="[6.8.0,6.9.0)", + org.eclipse.jgit.api;version="[6.8.0,6.9.0)", + org.eclipse.jgit.api.errors;version="[6.8.0,6.9.0)", + org.eclipse.jgit.annotations;version="[6.8.0,6.9.0)", + org.eclipse.jgit.errors;version="[6.8.0,6.9.0)", + org.eclipse.jgit.lib;version="[6.8.0,6.9.0)", + org.eclipse.jgit.revwalk;version="[6.8.0,6.9.0)", + org.eclipse.jgit.revwalk.filter;version="[6.8.0,6.9.0)", + org.eclipse.jgit.transport;version="[6.8.0,6.9.0)" diff --git a/org.eclipse.egit.gitflow/pom.xml b/org.eclipse.egit.gitflow/pom.xml index bd3f47224d..e45088fbe4 100644 --- a/org.eclipse.egit.gitflow/pom.xml +++ b/org.eclipse.egit.gitflow/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> + <version>6.8.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.gitflow</artifactId> diff --git a/org.eclipse.egit.mylyn-feature/.project b/org.eclipse.egit.mylyn-feature/.project deleted file mode 100644 index 43ca00da51..0000000000 --- a/org.eclipse.egit.mylyn-feature/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.egit.mylyn-feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> diff --git a/org.eclipse.egit.mylyn-feature/.settings/org.eclipse.core.resources.prefs b/org.eclipse.egit.mylyn-feature/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 8d266d9943..0000000000 --- a/org.eclipse.egit.mylyn-feature/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Mon Aug 11 16:46:45 PDT 2008 -eclipse.preferences.version=1 -encoding/<project>=UTF-8 diff --git a/org.eclipse.egit.mylyn-feature/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.egit.mylyn-feature/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index a8c8a9520d..0000000000 --- a/org.eclipse.egit.mylyn-feature/.settings/org.eclipse.core.runtime.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Mon Mar 24 18:55:38 EDT 2008 -eclipse.preferences.version=1 -line.separator=\n diff --git a/org.eclipse.egit.mylyn-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit.mylyn-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit.mylyn-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit.mylyn-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.mylyn-feature/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit.mylyn-feature/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit.mylyn-feature/build.properties b/org.eclipse.egit.mylyn-feature/build.properties deleted file mode 100644 index 5ffb7fdf31..0000000000 --- a/org.eclipse.egit.mylyn-feature/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -bin.includes = feature.xml,\ - feature.properties diff --git a/org.eclipse.egit.mylyn-feature/feature.properties b/org.eclipse.egit.mylyn-feature/feature.properties deleted file mode 100644 index 86005af486..0000000000 --- a/org.eclipse.egit.mylyn-feature/feature.properties +++ /dev/null @@ -1,29 +0,0 @@ -############################################################################### -# Copyright (c) 2011, 2021 Chris Aniszczyk and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License 2.0 -# which accompanies this distribution, and is available at -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -############################################################################### - -featureName=Git integration for Eclipse - Task focused interface -providerName=Eclipse EGit - -updateSiteName=Eclipse EGit Update Site - -# description property - text of the "Feature Description" -description=Task-focused interface for Git integration in Eclipse -################ end of description property ################################## - -# "copyright" property - text of the "Feature Update Copyright" -copyright=\ -Copyright (c) 2011, 2021 Chris Aniszczyk, et.al.\n\ -All rights reserved. This program and the accompanying materials\n\ -are made available under the terms of the Eclipse Public License 2.0\n\ -which accompanies this distribution, and is available at\n\ -https://www.eclipse.org/legal/epl-2.0/\n\ -\n\ -SPDX-License-Identifier: EPL-2.0\n -################ end of copyright property #################################### diff --git a/org.eclipse.egit.mylyn-feature/feature.xml b/org.eclipse.egit.mylyn-feature/feature.xml deleted file mode 100644 index fe63de6fdd..0000000000 --- a/org.eclipse.egit.mylyn-feature/feature.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<feature - id="org.eclipse.egit.mylyn" - label="%featureName" - version="6.3.0.qualifier" - provider-name="%providerName" - plugin="org.eclipse.egit" - license-feature="org.eclipse.license" - license-feature-version="0.0.0"> - - <description url="https://www.eclipse.org/egit/"> - %description - </description> - - <copyright> - %copyright - </copyright> - - <license url="%licenseURL"> - %license - </license> - - <url> - <update label="%updateSiteName" url="https://download.eclipse.org/egit/updates"/> - <discovery label="%updateSiteName" url="https://download.eclipse.org/egit/updates"/> - </url> - - <requires> - <import feature="org.eclipse.egit" version="6.3.0" match="equivalent"/> - <import feature="org.eclipse.mylyn.team_feature" version="3.20.0" match="greaterOrEqual"/> - </requires> - - <plugin - id="org.eclipse.egit.mylyn.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - -</feature> diff --git a/org.eclipse.egit.mylyn-feature/pom.xml b/org.eclipse.egit.mylyn-feature/pom.xml deleted file mode 100644 index f291c659d7..0000000000 --- a/org.eclipse.egit.mylyn-feature/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (C) 2011, Chris Aniszczyk <caniszczyk@gmail.com> - - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License 2.0 - which accompanies this distribution, and is available at - https://www.eclipse.org/legal/epl-2.0/ - - SPDX-License-Identifier: EPL-2.0 ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.egit</groupId> - <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> - </parent> - - <groupId>org.eclipse.egit.feature</groupId> - <artifactId>org.eclipse.egit.mylyn</artifactId> - <packaging>eclipse-feature</packaging> - - <name>EGit Mylyn Feature</name> - -</project> diff --git a/org.eclipse.egit.mylyn.ui.test/.classpath b/org.eclipse.egit.mylyn.ui.test/.classpath deleted file mode 100644 index 5c6d04c63b..0000000000 --- a/org.eclipse.egit.mylyn.ui.test/.classpath +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"> - <attributes> - <attribute name="test" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"> - <attributes> - <attribute name="module" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/org.eclipse.egit.mylyn.ui.test/.project b/org.eclipse.egit.mylyn.ui.test/.project deleted file mode 100644 index af15ff9ae6..0000000000 --- a/org.eclipse.egit.mylyn.ui.test/.project +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.egit.mylyn.ui.test</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> - </natures> -</projectDescription> diff --git a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.core.resources.prefs b/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 84e44d8d39..0000000000 --- a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Mon Aug 11 16:47:12 PDT 2008 -eclipse.preferences.version=1 -encoding/<project>=UTF-8 diff --git a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index c8f089af7e..0000000000 --- a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.core.runtime.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Mon Mar 24 18:54:45 EDT 2008 -eclipse.preferences.version=1 -line.separator=\n diff --git a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index fa2087b6e9..0000000000 --- a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,506 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=warning -org.eclipse.jdt.core.compiler.problem.comparingIdentical=error -org.eclipse.jdt.core.compiler.problem.deadCode=error -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=warning -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=error -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=error -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=error -org.eclipse.jdt.core.compiler.problem.unusedLabel=error -org.eclipse.jdt.core.compiler.problem.unusedLocal=error -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 -org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false -org.eclipse.jdt.core.formatter.align_with_spaces=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=1 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false -org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.indent_tag_description=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false -org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.lineSplit=80 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.text_block_indentation=0 -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true -org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 0f1ae3acf4..0000000000 --- a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,73 +0,0 @@ -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_JGit Format -formatter_settings_version=18 -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=java;javax;org;com; -org.eclipse.jdt.ui.ondemandthreshold=99 -org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_functional_interfaces=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=true -sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=false -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.push_down_negation=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=false -sp_cleanup.remove_redundant_semicolons=false -sp_cleanup.remove_redundant_type_arguments=true -sp_cleanup.remove_trailing_whitespaces=true -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_array_creation=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=true -sp_cleanup.remove_unused_imports=true -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_autoboxing=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_lambda=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true -sp_cleanup.use_type_arguments=false -sp_cleanup.use_unboxing=false diff --git a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.pde.api.tools.prefs deleted file mode 100644 index 8dd4a28d9a..0000000000 --- a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.pde.api.tools.prefs +++ /dev/null @@ -1,104 +0,0 @@ -ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error -ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error -ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error -ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error -ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error -ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error -API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error -API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error -API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error -API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error -API_USE_SCAN_FIELD_SEVERITY=Error -API_USE_SCAN_METHOD_SEVERITY=Error -API_USE_SCAN_TYPE_SEVERITY=Error -CLASS_ELEMENT_TYPE_ADDED_FIELD=Error -CLASS_ELEMENT_TYPE_ADDED_METHOD=Error -CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error -CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error -CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error -CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error -CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error -CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error -CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error -CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error -CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error -CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error -CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error -CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error -CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error -CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error -CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error -ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error -ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error -ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error -ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error -ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error -ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error -FIELD_ELEMENT_TYPE_ADDED_VALUE=Error -FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error -FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error -FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error -FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error -FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error -FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error -FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error -FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error -FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error -ILLEGAL_EXTEND=Warning -ILLEGAL_IMPLEMENT=Warning -ILLEGAL_INSTANTIATE=Warning -ILLEGAL_OVERRIDE=Warning -ILLEGAL_REFERENCE=Warning -INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Error -INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error -INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error -INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error -INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error -INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error -INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error -INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error -INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error -INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error -INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error -INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error -INVALID_ANNOTATION=Ignore -INVALID_JAVADOC_TAG=Ignore -INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error -LEAK_EXTEND=Warning -LEAK_FIELD_DECL=Warning -LEAK_IMPLEMENT=Warning -LEAK_METHOD_PARAM=Warning -LEAK_METHOD_RETURN_TYPE=Warning -METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error -METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error -METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error -METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error -METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error -METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error -METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error -METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error -METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error -METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error -MISSING_EE_DESCRIPTIONS=Warning -TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error -TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error -TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error -TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error -TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error -TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error -UNUSED_PROBLEM_FILTERS=Warning -automatically_removed_unused_problem_filters=false -changed_execution_env=Error -eclipse.preferences.version=1 -incompatible_api_component_version=Error -incompatible_api_component_version_include_major_without_breaking_change=Disabled -incompatible_api_component_version_include_minor_without_api_change=Disabled -incompatible_api_component_version_report_major_without_breaking_change=Warning -incompatible_api_component_version_report_minor_without_api_change=Warning -invalid_since_tag_version=Error -malformed_since_tag=Error -missing_since_tag=Error -report_api_breakage_when_major_version_incremented=Disabled -report_resolution_errors_api_component=Warning diff --git a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.pde.core.prefs b/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 82793f2d27..0000000000 --- a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Thu Jan 14 14:34:32 CST 2010 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.pde.prefs b/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.pde.prefs deleted file mode 100644 index caeaa5a45b..0000000000 --- a/org.eclipse.egit.mylyn.ui.test/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,35 +0,0 @@ -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=1 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.exec-env-too-low=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF deleted file mode 100644 index 7d962444a0..0000000000 --- a/org.eclipse.egit.mylyn.ui.test/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Git Team Provider Mylyn UI Test Fragment -Automatic-Module-Name: org.eclipse.egit.mylyn.ui.test -Bundle-SymbolicName: org.eclipse.egit.mylyn.ui.test -Bundle-Version: 6.3.0.qualifier -Fragment-Host: org.eclipse.egit.mylyn.ui -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Bundle-Vendor: Eclipse.org -Import-Package: org.junit;version="[4.13.0,5.0.0)", - org.junit.runner;version="[4.13.0,5.0.0)", - org.junit.runners;version="[4.13.0,5.0.0)" diff --git a/org.eclipse.egit.mylyn.ui.test/build.properties b/org.eclipse.egit.mylyn.ui.test/build.properties deleted file mode 100644 index 34d2e4d2da..0000000000 --- a/org.eclipse.egit.mylyn.ui.test/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/org.eclipse.egit.mylyn.ui.test/pom.xml b/org.eclipse.egit.mylyn.ui.test/pom.xml deleted file mode 100644 index b124c3808a..0000000000 --- a/org.eclipse.egit.mylyn.ui.test/pom.xml +++ /dev/null @@ -1,109 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (C) 2011, Benjamin Muskalla <benjamin.muskalla@tasktop.com> - - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License 2.0 - which accompanies this distribution, and is available at - https://www.eclipse.org/legal/epl-2.0/ - - SPDX-License-Identifier: EPL-2.0 ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.egit</groupId> - <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> - </parent> - - <artifactId>org.eclipse.egit.mylyn.ui.test</artifactId> - <packaging>eclipse-test-plugin</packaging> - - <name>EGit Mylyn UI Test Plug-in</name> - - <properties> - <uitest.vmparams>-Xmx512m</uitest.vmparams> - </properties> - - <profiles> - <profile> - <id>skip-ui-tests</id> - <activation> - <property> - <name>skip-ui-tests</name> - </property> - </activation> - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> - </profile> - </profiles> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <version>${tycho-version}</version> - <configuration> - <dependency-resolution> - <extraRequirements> - <requirement> - <type>eclipse-feature</type> - <id>org.eclipse.jgit</id> - <versionRange>0.0.0</versionRange> - </requirement> - <requirement> - <type>eclipse-feature</type> - <id>org.eclipse.egit</id> - <versionRange>0.0.0</versionRange> - </requirement> - <requirement> - <type>eclipse-feature</type> - <id>org.eclipse.egit.mylyn</id> - <versionRange>0.0.0</versionRange> - </requirement> - <requirement> - <type>eclipse-feature</type> - <id>org.eclipse.e4.rcp</id> - <versionRange>0.0.0</versionRange> - </requirement> - <requirement> - <type>eclipse-feature</type> - <id>org.eclipse.pde</id> - <versionRange>0.0.0</versionRange> - </requirement> - </extraRequirements> - </dependency-resolution> - </configuration> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <configuration> - <includes> - <include>**/*Test.java</include> - </includes> - <useUIHarness>true</useUIHarness> - <useUIThread>true</useUIThread> - <argLine>${ui.test.vmargs}</argLine> - <application>org.eclipse.ui.ide.workbench</application> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/*Test.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/org.eclipse.egit.mylyn.ui.test/src/org/eclipse/egit/internal/mylyn/BreeSmokeTest.java b/org.eclipse.egit.mylyn.ui.test/src/org/eclipse/egit/internal/mylyn/BreeSmokeTest.java deleted file mode 100644 index 119ce61848..0000000000 --- a/org.eclipse.egit.mylyn.ui.test/src/org/eclipse/egit/internal/mylyn/BreeSmokeTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (C) 2021 Thomas Wolf <thomas.wolf@paranor.ch> - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package org.eclipse.egit.internal.mylyn; - -import static org.junit.Assert.assertNotNull; - -import java.nio.Buffer; -import java.nio.ByteBuffer; - -import org.junit.Test; - -/** - * Simple test to guard against build setup errors such as --release not being - * effective. - */ -public class BreeSmokeTest { - - @Test - public void testByteBuffer() { - // This test will fail if compiled against a Java 11 library without - // --release 8 and then run on a Java 8 JVM with Java 8 libraries - ByteBuffer buffer = ByteBuffer.allocate(10); - Buffer flipped = buffer.flip(); - assertNotNull(flipped); - } -} diff --git a/org.eclipse.egit.mylyn.ui.test/src/org/eclipse/egit/internal/mylyn/CommitHyperlinkDetectorTest.java b/org.eclipse.egit.mylyn.ui.test/src/org/eclipse/egit/internal/mylyn/CommitHyperlinkDetectorTest.java deleted file mode 100644 index f989b0e2d1..0000000000 --- a/org.eclipse.egit.mylyn.ui.test/src/org/eclipse/egit/internal/mylyn/CommitHyperlinkDetectorTest.java +++ /dev/null @@ -1,168 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Benjamin Muskalla and others - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Benjamin Muskalla <benjamin.muskalla@tasktop.com> - initial implementation - *******************************************************************************/ -package org.eclipse.egit.internal.mylyn; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - -import org.eclipse.egit.internal.mylyn.ui.CommitHyperlinkDetector; -import org.eclipse.jface.text.Document; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.TextViewer; -import org.eclipse.jface.text.hyperlink.IHyperlink; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Shell; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.BlockJUnit4ClassRunner; - -@RunWith(BlockJUnit4ClassRunner.class) -public class CommitHyperlinkDetectorTest { - - private static final String OTHER_EXAMPLE_ID = "3de38c8898c74b867cb6f06f7907e0719d9d4c0c"; - private static final String EXAMPLE_ID = "2de0ab486c66566ae1ad36b73bfc9d99e14eb195"; - private TextViewer textViewer; - private CommitHyperlinkDetector detector; - - @Test - public void testNoDocument() { - textViewer.setDocument(null); - IHyperlink[] hyperlinks = detectHyperlinks(0,0); - assertNull(hyperlinks); - } - - @Test - public void testBadLocation() { - textViewer.setDocument(null); - IHyperlink[] hyperlinks = detectHyperlinks(10,0); - assertNull(hyperlinks); - } - - @Test - public void testEmpty() { - setText(""); - IHyperlink[] hyperlinks = detectHyperlinks(); - assertNull(hyperlinks); - } - - @Test - public void testSimpleId() { - setText(EXAMPLE_ID); - IHyperlink[] hyperlinks = detectHyperlinks(); - assertEquals(1, hyperlinks.length); - assertEquals(EXAMPLE_ID, hyperlinks[0].getHyperlinkText()); - } - - @Test - public void testMultiId() { - setText(EXAMPLE_ID + " and " + OTHER_EXAMPLE_ID); - IHyperlink[] hyperlinks = detectHyperlinks(); - assertEquals(2, hyperlinks.length); - assertEquals(EXAMPLE_ID, hyperlinks[0].getHyperlinkText()); - assertEquals(OTHER_EXAMPLE_ID, hyperlinks[1].getHyperlinkText()); - } - - @Test - public void testEndLine() { - setText("Merged as " + EXAMPLE_ID); - IHyperlink[] hyperlinks = detectHyperlinks(); - assertEquals(1, hyperlinks.length); - assertEquals(EXAMPLE_ID, hyperlinks[0].getHyperlinkText()); - } - - @Test - public void testMiddleLine() { - setText("Merged as " + EXAMPLE_ID + " and something else"); - IHyperlink[] hyperlinks = detectHyperlinks(); - assertEquals(1, hyperlinks.length); - assertEquals(EXAMPLE_ID, hyperlinks[0].getHyperlinkText()); - } - - @Test - public void testBeginSentence() { - setText("end of sentence." + EXAMPLE_ID); - IHyperlink[] hyperlinks = detectHyperlinks(); - assertEquals(1, hyperlinks.length); - assertEquals(EXAMPLE_ID, hyperlinks[0].getHyperlinkText()); - } - - @Test - public void testEndSentence() { - setText("Merged as " + EXAMPLE_ID + "."); - IHyperlink[] hyperlinks = detectHyperlinks(); - assertEquals(1, hyperlinks.length); - assertEquals(EXAMPLE_ID, hyperlinks[0].getHyperlinkText()); - } - - @Test - public void testOffsetMiddle() { - setText(EXAMPLE_ID); - IHyperlink[] hyperlinks = detectHyperlinks(3,0); - assertEquals(1, hyperlinks.length); - assertEquals(EXAMPLE_ID, hyperlinks[0].getHyperlinkText()); - } - - @Test - public void testOffsetOff() { - setText("some bla " + EXAMPLE_ID); - IHyperlink[] hyperlinks = detectHyperlinks(3,0); - assertNull(hyperlinks); - } - - @Test - public void testMultiLine() { - setText("Test multi-line text\n" + EXAMPLE_ID); - IHyperlink[] hyperlinks = detectHyperlinks(0,textViewer.getDocument().getLength()); - assertEquals(1, hyperlinks.length); - assertEquals(EXAMPLE_ID, hyperlinks[0].getHyperlinkText()); - assertEquals(new Region(21, EXAMPLE_ID.length()), hyperlinks[0].getHyperlinkRegion()); - } - - @Test - public void testGerritId() { - setText("I" + EXAMPLE_ID); - IHyperlink[] hyperlinks = detectHyperlinks(0,textViewer.getDocument().getLength()); - assertNull(hyperlinks); - } - - @Test - public void testGerritIdWithinText() { - setText("abc I" + EXAMPLE_ID); - IHyperlink[] hyperlinks = detectHyperlinks(5,textViewer.getDocument().getLength()); - assertNull(hyperlinks); - } - - - private IHyperlink[] detectHyperlinks() { - return detectHyperlinks(0, textViewer.getDocument().getLength()); - } - - private IHyperlink[] detectHyperlinks(int offset, int length) { - return detector.detectHyperlinks(textViewer, - new Region(offset, length), false); - } - - private void setText(String text) { - textViewer.getDocument().set(text); - } - - @Before - public void setUp() throws Exception { - detector = new CommitHyperlinkDetector(); - Shell shell = new Shell(); - textViewer = new TextViewer(shell, SWT.NONE); - textViewer.setDocument(new Document()); - } - -} diff --git a/org.eclipse.egit.mylyn.ui/.classpath b/org.eclipse.egit.mylyn.ui/.classpath deleted file mode 100644 index 4a00becd81..0000000000 --- a/org.eclipse.egit.mylyn.ui/.classpath +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"> - <attributes> - <attribute name="module" value="true"/> - </attributes> - </classpathentry> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/org.eclipse.egit.mylyn.ui/.project b/org.eclipse.egit.mylyn.ui/.project deleted file mode 100644 index 9c793075cb..0000000000 --- a/org.eclipse.egit.mylyn.ui/.project +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.egit.mylyn.ui</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature> - </natures> -</projectDescription> diff --git a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.core.resources.prefs b/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index d4ff695e8b..0000000000 --- a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Mon Aug 11 16:47:03 PDT 2008 -eclipse.preferences.version=1 -encoding/<project>=UTF-8 diff --git a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index dfc3779a15..0000000000 --- a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.core.runtime.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Mon Mar 24 18:54:53 EDT 2008 -eclipse.preferences.version=1 -line.separator=\n diff --git a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 02f0aa7814..0000000000 --- a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,506 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jgit.annotations.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jgit.annotations.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jgit.annotations.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=warning -org.eclipse.jdt.core.compiler.problem.comparingIdentical=error -org.eclipse.jdt.core.compiler.problem.deadCode=error -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=warning -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=error -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=error -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=error -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=ignore -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error -org.eclipse.jdt.core.compiler.problem.potentialNullReference=error -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=error -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=error -org.eclipse.jdt.core.compiler.problem.unusedLabel=error -org.eclipse.jdt.core.compiler.problem.unusedLocal=error -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=11 -org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false -org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false -org.eclipse.jdt.core.formatter.align_with_spaces=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_module_statements=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0 -org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=1 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false -org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.indent_tag_description=false -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert -org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false -org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never -org.eclipse.jdt.core.formatter.lineSplit=80 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines -org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.text_block_indentation=0 -org.eclipse.jdt.core.formatter.use_on_off_tags=true -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true -org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 0f1ae3acf4..0000000000 --- a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,73 +0,0 @@ -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_JGit Format -formatter_settings_version=18 -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=java;javax;org;com; -org.eclipse.jdt.ui.ondemandthreshold=99 -org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_functional_interfaces=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=true -sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=false -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.push_down_negation=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_modifiers=false -sp_cleanup.remove_redundant_semicolons=false -sp_cleanup.remove_redundant_type_arguments=true -sp_cleanup.remove_trailing_whitespaces=true -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_array_creation=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=true -sp_cleanup.remove_unused_imports=true -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_autoboxing=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_lambda=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true -sp_cleanup.use_type_arguments=false -sp_cleanup.use_unboxing=false diff --git a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.pde.api.tools.prefs b/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.pde.api.tools.prefs deleted file mode 100644 index 8dd4a28d9a..0000000000 --- a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.pde.api.tools.prefs +++ /dev/null @@ -1,104 +0,0 @@ -ANNOTATION_ELEMENT_TYPE_ADDED_FIELD=Error -ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error -ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error -ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error -ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error -ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error -API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error -API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error -API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error -API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error -API_USE_SCAN_FIELD_SEVERITY=Error -API_USE_SCAN_METHOD_SEVERITY=Error -API_USE_SCAN_TYPE_SEVERITY=Error -CLASS_ELEMENT_TYPE_ADDED_FIELD=Error -CLASS_ELEMENT_TYPE_ADDED_METHOD=Error -CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error -CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error -CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error -CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error -CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error -CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error -CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error -CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error -CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error -CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error -CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error -CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error -CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error -CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error -CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error -CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error -ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error -ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error -ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error -ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error -ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error -ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error -FIELD_ELEMENT_TYPE_ADDED_VALUE=Error -FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error -FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error -FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error -FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error -FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error -FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error -FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error -FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error -FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error -ILLEGAL_EXTEND=Warning -ILLEGAL_IMPLEMENT=Warning -ILLEGAL_INSTANTIATE=Warning -ILLEGAL_OVERRIDE=Warning -ILLEGAL_REFERENCE=Warning -INTERFACE_ELEMENT_TYPE_ADDED_DEFAULT_METHOD=Error -INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error -INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error -INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error -INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error -INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error -INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error -INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error -INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error -INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error -INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error -INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error -INVALID_ANNOTATION=Ignore -INVALID_JAVADOC_TAG=Ignore -INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error -LEAK_EXTEND=Warning -LEAK_FIELD_DECL=Warning -LEAK_IMPLEMENT=Warning -LEAK_METHOD_PARAM=Warning -LEAK_METHOD_RETURN_TYPE=Warning -METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error -METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error -METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error -METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error -METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error -METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error -METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error -METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error -METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error -METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error -MISSING_EE_DESCRIPTIONS=Warning -TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error -TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error -TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error -TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error -TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error -TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error -UNUSED_PROBLEM_FILTERS=Warning -automatically_removed_unused_problem_filters=false -changed_execution_env=Error -eclipse.preferences.version=1 -incompatible_api_component_version=Error -incompatible_api_component_version_include_major_without_breaking_change=Disabled -incompatible_api_component_version_include_minor_without_api_change=Disabled -incompatible_api_component_version_report_major_without_breaking_change=Warning -incompatible_api_component_version_report_minor_without_api_change=Warning -invalid_since_tag_version=Error -malformed_since_tag=Error -missing_since_tag=Error -report_api_breakage_when_major_version_incremented=Disabled -report_resolution_errors_api_component=Warning diff --git a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.pde.core.prefs b/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 82793f2d27..0000000000 --- a/org.eclipse.egit.mylyn.ui/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Thu Jan 14 14:34:32 CST 2010 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF deleted file mode 100644 index 65b2205334..0000000000 --- a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF +++ /dev/null @@ -1,35 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name -Automatic-Module-Name: org.eclipse.egit.mylyn.ui -Bundle-SymbolicName: org.eclipse.egit.mylyn.ui;singleton:=true -Bundle-Version: 6.3.0.qualifier -Bundle-Activator: org.eclipse.egit.internal.mylyn.ui.EGitMylynUI -Bundle-Vendor: %Bundle-Vendor -Require-Bundle: org.eclipse.jface;bundle-version="[3.21.0,4.0.0)", - org.eclipse.core.resources;bundle-version="[3.13.800,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)", - org.eclipse.ui.workbench;bundle-version="[3.120.0,4.0.0)", - org.eclipse.mylyn.tasks.core;bundle-version="[3.20.0,4.0.0)", - org.eclipse.mylyn.tasks.ui;bundle-version="[3.20.0,4.0.0)", - org.eclipse.mylyn.team.ui;bundle-version="[3.20.0,4.0.0)", - org.eclipse.mylyn.context.core;bundle-version="[3.20.0,4.0.0)", - org.eclipse.jface.text;bundle-version="[3.16.400,4.0.0)", - org.eclipse.team.core;bundle-version="[3.8.1100,4.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Bundle-ActivationPolicy: lazy -Bundle-Localization: plugin -Export-Package: org.eclipse.egit.internal.mylyn.ui;version="6.3.0";x-friends:="org.eclipse.egit.ui.test", - org.eclipse.egit.internal.mylyn.ui.commit;version="6.3.0";x-internal:=true -Import-Package: org.eclipse.egit.core;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.internal;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.synchronize;version="[6.3.0,6.4.0)", - org.eclipse.egit.ui;version="[6.3.0,6.4.0)", - org.eclipse.egit.ui.internal.commit;version="[6.3.0,6.4.0)", - org.eclipse.egit.ui.internal.staging;version="[6.3.0,6.4.0)", - org.eclipse.egit.ui.internal.synchronize.model;version="[6.3.0,6.4.0)", - org.eclipse.jgit.errors;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lib;version="[6.3.0,6.4.0)", - org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)", - org.eclipse.jgit.transport;version="[6.3.0,6.4.0)", - org.eclipse.ui.plugin;bundle-version="[3.108.0,4.0.0)" diff --git a/org.eclipse.egit.mylyn.ui/about.html b/org.eclipse.egit.mylyn.ui/about.html deleted file mode 100644 index 54f1e2a222..0000000000 --- a/org.eclipse.egit.mylyn.ui/about.html +++ /dev/null @@ -1,36 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>About</title> -</head> -<body lang="EN-US"> - <h2>About This Content</h2> - - <p>November 30, 2017</p> - <h3>License</h3> - - <p> - The Eclipse Foundation makes available all content in this plug-in - ("Content"). Unless otherwise indicated below, the Content - is provided to you under the terms and conditions of the Eclipse - Public License Version 2.0 ("EPL"). A copy of the EPL is - available at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>. - For purposes of the EPL, "Program" will mean the Content. - </p> - - <p> - If you did not receive this Content directly from the Eclipse - Foundation, the Content is being redistributed by another party - ("Redistributor") and different terms and conditions may - apply to your use of any object code in the Content. Check the - Redistributor's license that was provided with the Content. If no such - license exists, contact the Redistributor. Unless otherwise indicated - below, the terms and conditions of the EPL still apply to any source - code in the Content and such source code may be obtained at <a - href="https://www.eclipse.org/">https://www.eclipse.org</a>. - </p> - -</body> -</html>
\ No newline at end of file diff --git a/org.eclipse.egit.mylyn.ui/build.properties b/org.eclipse.egit.mylyn.ui/build.properties deleted file mode 100644 index 7b3c227b84..0000000000 --- a/org.eclipse.egit.mylyn.ui/build.properties +++ /dev/null @@ -1,8 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - plugin.properties,\ - about.html -src.includes = about.html diff --git a/org.eclipse.egit.mylyn.ui/plugin.properties b/org.eclipse.egit.mylyn.ui/plugin.properties deleted file mode 100644 index 845397b440..0000000000 --- a/org.eclipse.egit.mylyn.ui/plugin.properties +++ /dev/null @@ -1,15 +0,0 @@ -############################################################################### -# Copyright (c) 2011 Chris Aniszczyk and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License 2.0 -# which accompanies this distribution, and is available at -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Chris Aniszczyk <caniszczyk@gmail.com> - initial API and implementation -############################################################################### -Bundle-Vendor = Eclipse EGit -Bundle-Name = EGit Mylyn UI -hyperlinkDetector.name = Git Commits diff --git a/org.eclipse.egit.mylyn.ui/plugin.xml b/org.eclipse.egit.mylyn.ui/plugin.xml deleted file mode 100644 index 0e9ce61419..0000000000 --- a/org.eclipse.egit.mylyn.ui/plugin.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.4"?> -<plugin> - <extension - point="org.eclipse.egit.ui.commitMessageProvider"> - <commitMessageProvider - class="org.eclipse.egit.internal.mylyn.ui.commit.MylynCommitMessageProvider"> - </commitMessageProvider> - </extension> - - <extension point="org.eclipse.core.runtime.adapters"> - <factory adaptableType="org.eclipse.egit.ui.internal.history.SWTCommit" - class="org.eclipse.egit.internal.mylyn.ui.commit.TaskReferenceFactory"> - <adapter type="org.eclipse.mylyn.team.ui.AbstractTaskReference"/> - </factory> - <factory adaptableType="org.eclipse.egit.ui.internal.synchronize.model.GitModelCommit" - class="org.eclipse.egit.internal.mylyn.ui.commit.TaskReferenceFactory"> - <adapter type="org.eclipse.mylyn.team.ui.AbstractTaskReference"/> - </factory> - </extension> - <extension - point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors"> - <hyperlinkDetector - activate="true" - class="org.eclipse.egit.internal.mylyn.ui.CommitHyperlinkDetector" - id="org.eclipse.egit.mylyn.ui.commitHyperlinkDetector" - name="%hyperlinkDetector.name" - targetId="org.eclipse.mylyn.tasks.ui.TaskEditor"> - </hyperlinkDetector> - </extension> - <extension - point="org.eclipse.egit.ui.branchNameProvider"> - <branchNameProvider - class="org.eclipse.egit.internal.mylyn.ui.commit.ActiveTaskBranchNameProvider"> - </branchNameProvider> - </extension> - <extension - point="org.eclipse.mylyn.tasks.core.taskActivationListeners"> - <listener - id="org.eclipse.egit.mylyn.ui.commit.CommitTextTaskActivationListener" - class="org.eclipse.egit.internal.mylyn.ui.commit.CommitTextTaskActivationListener"> - </listener> - </extension> -</plugin> diff --git a/org.eclipse.egit.mylyn.ui/pom.xml b/org.eclipse.egit.mylyn.ui/pom.xml deleted file mode 100644 index eb4b563580..0000000000 --- a/org.eclipse.egit.mylyn.ui/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright (C) 2011, Chris Aniszczyk <caniszczyk@gmail.com> - - All rights reserved. This program and the accompanying materials - are made available under the terms of the Eclipse Public License 2.0 - which accompanies this distribution, and is available at - https://www.eclipse.org/legal/epl-2.0/ - - SPDX-License-Identifier: EPL-2.0 ---> - -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.egit</groupId> - <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> - </parent> - - <artifactId>org.eclipse.egit.mylyn.ui</artifactId> - <packaging>eclipse-plugin</packaging> - - <name>EGit Mylyn UI</name> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-source-plugin</artifactId> - </plugin> - </plugins> - </build> - -</project> diff --git a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/CommitHyperlinkDetector.java b/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/CommitHyperlinkDetector.java deleted file mode 100644 index 9651b92316..0000000000 --- a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/CommitHyperlinkDetector.java +++ /dev/null @@ -1,250 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Benjamin Muskalla and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Benjamin Muskalla <benjamin.muskalla@tasktop.com> - initial API and implementation - *******************************************************************************/ -package org.eclipse.egit.internal.mylyn.ui; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.eclipse.core.runtime.Assert; -import org.eclipse.egit.core.RepositoryCache; -import org.eclipse.egit.core.RepositoryUtil; -import org.eclipse.egit.ui.internal.commit.CommitEditor; -import org.eclipse.egit.ui.internal.commit.RepositoryCommit; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.TextViewer; -import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector; -import org.eclipse.jface.text.hyperlink.IHyperlink; -import org.eclipse.jgit.errors.IncorrectObjectTypeException; -import org.eclipse.jgit.errors.MissingObjectException; -import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.revwalk.RevWalk; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.widgets.Shell; - -/** - * Detects Git commit ids in task descriptions and allows users to open them in - * the commit editor. - */ -public class CommitHyperlinkDetector extends AbstractHyperlinkDetector { - - private static final Pattern PATTERN_COMMIT_ID = Pattern - .compile("(?<!\\w)([0-9a-f]{8}([0-9a-f]{32})?)"); //$NON-NLS-1$ - - private static class CommitHyperlink implements IHyperlink { - - private IRegion region; - - private String objectId; - - private final Shell shell; - - public CommitHyperlink(IRegion region, String objectId, Shell shell) { - this.shell = shell; - Assert.isNotNull(objectId); - Assert.isNotNull(region); - Assert.isNotNull(shell); - - this.region = region; - this.objectId = objectId; - } - - @Override - public IRegion getHyperlinkRegion() { - return region; - } - - @Override - public String getTypeLabel() { - return null; - } - - @Override - public String getHyperlinkText() { - return objectId; - } - - @Override - public void open() { - try { - RepositoryCommit commit; - commit = searchCommit(); - if (commit != null) - CommitEditor.openQuiet(commit); - else - informCommitNotFound(); - } catch (IOException e) { - // ignore - } - } - - private void informCommitNotFound() { - MessageDialog - .openWarning( - shell, - Messages.CommitHyperlinkDetector_CommitNotFound, - NLS.bind( - Messages.CommitHyperlinkDetector_CommitNotFoundInRepositories, - objectId)); - } - - private RepositoryCommit searchCommit() throws IOException { - List<String> configuredRepositories = RepositoryUtil.INSTANCE - .getConfiguredRepositories(); - for (String repoDir : configuredRepositories) { - Repository repository = RepositoryCache.INSTANCE - .lookupRepository(new File(repoDir)); - RevCommit commit = getCommit(repository); - if (commit != null) - return new RepositoryCommit(repository, commit); - } - - return null; - } - - private RevCommit getCommit(Repository repository) throws IOException { - try (RevWalk revWalk = new RevWalk(repository)) { - return revWalk.parseCommit(ObjectId.fromString(objectId)); - } catch (MissingObjectException e) { - // ignore - return null; - } catch (IncorrectObjectTypeException e) { - // ignore - return null; - } - } - - @Override - public String toString() { - StringBuilder builder = new StringBuilder(); - builder.append("CommitHyperlink [region="); //$NON-NLS-1$ - builder.append(region); - builder.append(", objectId="); //$NON-NLS-1$ - builder.append(objectId); - builder.append("]"); //$NON-NLS-1$ - return builder.toString(); - } - - } - - /** - * Detects and returns all available hyperlinks for the given - * {@link TextViewer} which link to a Git commit. - */ - @Override - public IHyperlink[] detectHyperlinks(ITextViewer textViewer, - final IRegion region, boolean canShowMultipleHyperlinks) { - IDocument document = textViewer.getDocument(); - if (document == null || document.getLength() == 0) { - return null; - } - - String content; - int contentOffset; - int index; - try { - if (region.getLength() == 0) { - // expand the region to include the whole line - IRegion lineInfo = document.getLineInformationOfOffset(region - .getOffset()); - int lineLength = lineInfo.getLength(); - int lineOffset = lineInfo.getOffset(); - int lineEnd = lineOffset + lineLength; - int regionEnd = region.getOffset() + region.getLength(); - if (lineOffset < region.getOffset()) { - int regionLength = Math.max(regionEnd, lineEnd) - - lineOffset; - contentOffset = lineOffset; - content = document.get(lineOffset, regionLength); - index = region.getOffset() - lineOffset; - } else { - // the line starts after region, may never happen - int regionLength = Math.max(regionEnd, lineEnd) - - region.getOffset(); - contentOffset = region.getOffset(); - content = document.get(contentOffset, regionLength); - index = 0; - } - } else { - content = document.get(region.getOffset(), region.getLength()); - contentOffset = region.getOffset(); - index = -1; - } - } catch (BadLocationException ex) { - return null; - } - - List<IHyperlink> hyperlinks = detectHyperlinks(textViewer, content, - index, contentOffset); - if (hyperlinks == null) { - return null; - } - - // filter hyperlinks that do not match original region - if (region.getLength() == 0) { - for (Iterator<IHyperlink> it = hyperlinks.iterator(); it.hasNext();) { - IHyperlink hyperlink = it.next(); - IRegion hyperlinkRegion = hyperlink.getHyperlinkRegion(); - if (!isInRegion(region, hyperlinkRegion)) { - it.remove(); - } - } - } - if (hyperlinks.isEmpty()) { - return null; - } - return hyperlinks.toArray(new IHyperlink[0]); - } - - private List<IHyperlink> detectHyperlinks(ITextViewer textViewer, - String content, int index, int contentOffset) { - Shell shell = textViewer.getTextWidget().getShell(); - List<IHyperlink> links = null; - Matcher matcher = PATTERN_COMMIT_ID.matcher(content); - while (matcher.find()) { - if (index != -1 - && (index < matcher.start() || index > matcher.end())) { - continue; - } - if (links == null) { - links = new ArrayList<>(); - } - int start = matcher.start(1); - Region region = new Region(contentOffset + start, matcher.end(1) - - start); - - CommitHyperlink hyperlink = new CommitHyperlink(region, - matcher.group(1), shell); - links.add(hyperlink); - } - return links; - } - - private boolean isInRegion(IRegion detectInRegion, IRegion hyperlinkRegion) { - return detectInRegion.getOffset() >= hyperlinkRegion.getOffset() - && detectInRegion.getOffset() <= hyperlinkRegion.getOffset() - + hyperlinkRegion.getLength(); - } - -} diff --git a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/EGitMylynUI.java b/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/EGitMylynUI.java deleted file mode 100644 index 83b019fd31..0000000000 --- a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/EGitMylynUI.java +++ /dev/null @@ -1,56 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Chris Aniszczyk and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Chris Aniszczyk <caniszczyk@gmail.com> - initial API and implementation - *******************************************************************************/ -package org.eclipse.egit.internal.mylyn.ui; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class EGitMylynUI extends AbstractUIPlugin { - - /** The Plug-in ID */ - public static final String PLUGIN_ID = "org.eclipse.egit.mylyn.ui"; //$NON-NLS-1$ - - // The shared instance - private static EGitMylynUI plugin; - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - @Override - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * @return the shared instance - */ - public static EGitMylynUI getDefault() { - return plugin; - } - -} diff --git a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/Messages.java b/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/Messages.java deleted file mode 100644 index 0ab36370b9..0000000000 --- a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/Messages.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Benjamin Muskalla and others - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Benjamin Muskalla <benjamin.muskalla@tasktop.com> - initial implementation - *******************************************************************************/ -package org.eclipse.egit.internal.mylyn.ui; - -import org.eclipse.osgi.util.NLS; - -/** - * Text resources for the plugin. Strings here can be i18n-ed simpler and avoid - * duplicating strings. - */ -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.egit.internal.mylyn.ui.messages"; //$NON-NLS-1$ - - /** */ - public static String CommitHyperlinkDetector_CommitNotFound; - - /** */ - public static String CommitHyperlinkDetector_CommitNotFoundInRepositories; - - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} diff --git a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/commit/ActiveTaskBranchNameProvider.java b/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/commit/ActiveTaskBranchNameProvider.java deleted file mode 100644 index d6b809840f..0000000000 --- a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/commit/ActiveTaskBranchNameProvider.java +++ /dev/null @@ -1,67 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2014 Chris Aniszczyk and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Chris Aniszczyk <caniszczyk@gmail.com> - initial API and implementation - * Manuel Doninger <manuel.doninger@googlemail.com> - * Benjamin Muskalla <benjamin.muskalla@tasktop.com> - * Thorsten Kamann <thorsten@kamann.info> - * Steffen Pingel <steffen.pingel@tasktop.com> - *******************************************************************************/ -package org.eclipse.egit.internal.mylyn.ui.commit; - -import org.eclipse.egit.ui.IBranchNameProvider; -import org.eclipse.jgit.lib.Repository; -import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal; -import org.eclipse.mylyn.tasks.core.ITask; -import org.eclipse.mylyn.tasks.ui.TasksUi; - -/** - * A BranchNameProvider using description and title of the currently active task - * to suggest a branch name. - */ -public class ActiveTaskBranchNameProvider implements IBranchNameProvider { - - /** - * @return the currently activated task or <code>null</code> if no task is - * activated - */ - protected ITask getCurrentTask() { - return TasksUi.getTaskActivityManager().getActiveTask(); - } - - @Override - public String getBranchNameSuggestion() { - ITask task = getCurrentTask(); - if (task == null) - return null; - - String taskKey = task.getTaskKey(); - if (taskKey == null) - taskKey = task.getTaskId(); - - StringBuilder sb = new StringBuilder(); - sb.append(TasksUiInternal.getTaskPrefix(task.getConnectorKind())); - sb.append(taskKey); - sb.append('-'); - sb.append(task.getSummary()); - return normalizeBranchName(sb.toString()); - } - - private String normalizeBranchName(String name) { - String normalized = Repository - .normalizeBranchName(name.replaceAll("[#$!]", " ")); //$NON-NLS-1$ //$NON-NLS-2$ - if (normalized.length() > 30) { - normalized = Repository - .normalizeBranchName(normalized.substring(0, 30)); - } - return normalized; - } -} - diff --git a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/commit/CommitTextTaskActivationListener.java b/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/commit/CommitTextTaskActivationListener.java deleted file mode 100644 index 1bbbad55d7..0000000000 --- a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/commit/CommitTextTaskActivationListener.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 Brandon Dong <brandon.dong@tasktop.com> - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package org.eclipse.egit.internal.mylyn.ui.commit; - -import org.eclipse.egit.ui.internal.staging.StagingView; -import org.eclipse.mylyn.tasks.core.ITask; -import org.eclipse.mylyn.tasks.core.TaskActivationAdapter; -import org.eclipse.ui.PlatformUI; - -/** - * A listener that updates commit text in staging view when a task is activated - */ -public class CommitTextTaskActivationListener extends TaskActivationAdapter { - - @Override - public void taskActivated(ITask task) { - StagingView view = (StagingView) PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage() - .findView(StagingView.VIEW_ID); - if (view != null) { - view.resetCommitMessageComponent(); - } - } - -} diff --git a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/commit/MylynCommitMessageProvider.java b/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/commit/MylynCommitMessageProvider.java deleted file mode 100644 index 8e75280de0..0000000000 --- a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/commit/MylynCommitMessageProvider.java +++ /dev/null @@ -1,63 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Chris Aniszczyk and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Chris Aniszczyk <caniszczyk@gmail.com> - initial API and implementation - * Manuel Doninger <manuel@doninger.net> - * Benjamin Muskalla <benjamin.muskalla@tasktop.com> - * Thorsten Kamann <thorsten@kamann.info> - *******************************************************************************/ -package org.eclipse.egit.internal.mylyn.ui.commit; - -import org.eclipse.core.resources.IResource; -import org.eclipse.egit.ui.ICommitMessageProvider; -import org.eclipse.mylyn.context.core.ContextCore; -import org.eclipse.mylyn.context.core.IInteractionContext; -import org.eclipse.mylyn.tasks.core.ITask; -import org.eclipse.mylyn.tasks.ui.TasksUi; -import org.eclipse.mylyn.team.ui.TeamUiUtil; - - -/** - * Gets the active task and combines the description and title with - * the commit message template defined in the preferences - */ -public class MylynCommitMessageProvider implements ICommitMessageProvider { - - /** - * @return the mylyn commit message template defined in the preferences - */ - @Override - public String getMessage(IResource[] resources) { - String message = ""; //$NON-NLS-1$ - if (resources == null) - return message; - ITask task = getCurrentTask(); - if (task == null) - return message; - boolean checkTaskRepository = true; - message = TeamUiUtil.getComment(checkTaskRepository, task, resources); - return message; - } - - /** - * @return the currently activated task or <code>null</code> if no task is - * activated - */ - protected ITask getCurrentTask() { - return TasksUi.getTaskActivityManager().getActiveTask(); - } - - /** - * @return the activecontext or <code>null</code> if no activecontext exists - */ - protected IInteractionContext getActiveContext() { - return ContextCore.getContextManager().getActiveContext(); - } -} diff --git a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/commit/TaskReferenceFactory.java b/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/commit/TaskReferenceFactory.java deleted file mode 100644 index 5f1e55e9c2..0000000000 --- a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/commit/TaskReferenceFactory.java +++ /dev/null @@ -1,206 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Benjamin Muskalla and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Benjamin Muskalla <bmuskalla@tasktop.com> - initial API and implementation - * Ilya Ivanov <ilya.ivanov@intland.com> - task repository url resolving - *******************************************************************************/ -package org.eclipse.egit.internal.mylyn.ui.commit; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.List; - -import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.egit.core.internal.IRepositoryCommit; -import org.eclipse.egit.internal.mylyn.ui.EGitMylynUI; -import org.eclipse.egit.ui.internal.synchronize.model.GitModelCommit; -import org.eclipse.egit.ui.internal.synchronize.model.GitModelRepository; -import org.eclipse.jgit.lib.AbbreviatedObjectId; -import org.eclipse.jgit.lib.Config; -import org.eclipse.jgit.lib.ConfigConstants; -import org.eclipse.jgit.lib.Constants; -import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.revwalk.RevWalk; -import org.eclipse.jgit.transport.URIish; -import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; -import org.eclipse.mylyn.internal.team.ui.LinkedTaskInfo; -import org.eclipse.mylyn.tasks.core.TaskRepository; -import org.eclipse.mylyn.team.ui.AbstractTaskReference; - -/** - * Adapter factory to bridge between Mylyn and EGit domain models. - */ -@SuppressWarnings("restriction") -public class TaskReferenceFactory implements IAdapterFactory { - private static final Class<?>[] ADAPTER_TYPES = new Class[] { AbstractTaskReference.class }; - - private static final String BUGTRACK_SECTION = "bugtracker"; //$NON-NLS-1$ - private static final String BUGTRACK_URL = "url"; //$NON-NLS-1$ - - private static final String LOCALHOST = "localhost"; //$NON-NLS-1$ - - @Override - public Class<?>[] getAdapterList() { - final Class<?>[] c = new Class[ADAPTER_TYPES.length]; - System.arraycopy(ADAPTER_TYPES, 0, c, 0, c.length); - return c; - } - - @Override - public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) { - if (!AbstractTaskReference.class.equals(adapterType)) { - return null; - } - return adapterType.cast(adaptFromObject(adaptableObject)); - } - - private AbstractTaskReference adaptFromObject(Object element) { - IRepositoryCommit commit = getCommitForElement(element); - if (commit != null) { - return adaptFromCommit(commit); - } - return null; - } - - /** - * Finds the {@link TaskRepository} for the provided - * {@link IRepositoryCommit} object and returns new {@link LinkedTaskInfo} - * object or <code>null</code> if nothing found. - * - * @param commit - * an {@link IRepositoryCommit} object to find the task info for - * @return {@link LinkedTaskInfo} object, or <code>null</code> if repository - * not found - */ - private AbstractTaskReference adaptFromCommit(IRepositoryCommit commit) { - Repository r = commit.getRepository(); - TaskRepository repository = getTaskRepository(r); - if (repository == null) { - return null; - } - String taskRepositoryUrl = repository.getRepositoryUrl(); - - String message = null; - long timestamp = 0; - try (RevWalk revWalk = new RevWalk(r)) { - RevCommit revCommit = revWalk.parseCommit(commit.getRevCommit()); - message = revCommit.getFullMessage(); - timestamp = (long) revCommit.getCommitTime() * 1000; - } catch (IOException | RuntimeException e) { - return null; - } - if (message == null || message.trim().isEmpty()) { - return null; - } - return new LinkedTaskInfo(taskRepositoryUrl, null, null, message, - timestamp); - } - - private static IRepositoryCommit getCommitForElement(Object element) { - if (element instanceof IRepositoryCommit) { - // plugin.xml references SWTCommit, but that's internal - return (IRepositoryCommit) element; - } else if (element instanceof GitModelCommit) { - GitModelCommit modelCommit = (GitModelCommit) element; - if (!(modelCommit.getParent() instanceof GitModelRepository)) - return null; // should never happen - - GitModelRepository parent = (GitModelRepository) modelCommit.getParent(); - Repository repo = parent.getRepository(); - AbbreviatedObjectId id = modelCommit.getCachedCommitObj().getId(); - try (RevWalk rw = new RevWalk(repo)) { - RevCommit commit = rw.lookupCommit(id.toObjectId()); - return new IRepositoryCommit() { - - @Override - public Repository getRepository() { - return repo; - } - - @Override - public RevCommit getRevCommit() { - return commit; - } - }; - } - } - return null; - } - - /** - * Finds a {@link TaskRepository} for the given {@link Repository}. - * - * @param repository - * git repository to find a task repository for - * @return {@link TaskRepository} associated with this git repository or - * {@code null} if none found - */ - private TaskRepository getTaskRepository(Repository repository) { - Config config = repository.getConfig(); - String url = config.getString(BUGTRACK_SECTION, null, BUGTRACK_URL); - if (url != null) { - return TasksUiPlugin.getRepositoryManager().getRepository(url); - } - // Try to find any that uses the same host as the configured origin URL - url = config.getString(ConfigConstants.CONFIG_REMOTE_SECTION, - Constants.DEFAULT_REMOTE_NAME, ConfigConstants.CONFIG_KEY_URL); - if (url == null) { - return null; - } - try { - return getTaskRepositoryByHost(new URIish(url).getHost()); - } catch (Exception ex) { - EGitMylynUI.getDefault().getLog().log( - new Status(IStatus.ERROR, EGitMylynUI.PLUGIN_ID, "failed to get repo url", ex)); //$NON-NLS-1$ - } - return null; - } - - private TaskRepository getTaskRepositoryByHost(String host) { - List<TaskRepository> repositories = TasksUiPlugin.getRepositoryManager().getAllRepositories(); - if (repositories == null || repositories.isEmpty()) - return null; - - if (repositories.size() == 1) - return repositories.iterator().next(); - - for (TaskRepository repository : repositories) { - if (!repository.isOffline()) { - try { - URL url = new URL(repository.getRepositoryUrl()); - - if (isSameHosts(host, url.getHost())) - return repository; - } catch (MalformedURLException e) { - // We cannot do anything. - } - } - } - return null; - } - - private boolean isSameHosts(String name1, String name2) { - String hostname1 = name1 == null ? LOCALHOST : name1.trim(); - String hostname2 = name2 == null ? LOCALHOST : name2.trim(); - if (hostname1.isEmpty()) { - hostname1 = LOCALHOST; - } - if (hostname2.isEmpty()) { - hostname2 = LOCALHOST; - } - - return hostname1.equals(hostname2); - } - -} diff --git a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/messages.properties b/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/messages.properties deleted file mode 100644 index 5d79c38014..0000000000 --- a/org.eclipse.egit.mylyn.ui/src/org/eclipse/egit/internal/mylyn/ui/messages.properties +++ /dev/null @@ -1,2 +0,0 @@ -CommitHyperlinkDetector_CommitNotFound=Commit not found -CommitHyperlinkDetector_CommitNotFoundInRepositories=The commit {0} was not found in any of the configured repositories. diff --git a/org.eclipse.egit.repository/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit.repository/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit.repository/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit.repository/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.repository/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit.repository/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit.repository/category.xml b/org.eclipse.egit.repository/category.xml index 593d12076a..6044ad29e0 100644 --- a/org.eclipse.egit.repository/category.xml +++ b/org.eclipse.egit.repository/category.xml @@ -9,9 +9,6 @@ <feature url="features/org.eclipse.egit.sources_0.0.0.qualifier.jar" id="org.eclipse.egit.source" version="0.0.0" patch="true"> <category name="EGit"/> </feature> - <feature url="features/org.eclipse.egit.mylyn_0.0.0.qualifier.jar" id="org.eclipse.egit.mylyn" version="0.0.0"> - <category name="EGit.additional"/> - </feature> <feature url="features/org.eclipse.jgit_0.0.0.qualifier.jar" id="org.eclipse.jgit" version="0.0.0" patch="true"> <category name="JGit"/> </feature> @@ -39,10 +36,10 @@ <feature url="features/org.eclipse.egit.gitflow.feature_0.0.0.qualifier.jar" id="org.eclipse.egit.gitflow.feature" version="0.0.0"> <category name="EGit.additional"/> </feature> - <bundle id="org.apache.commons.codec"> + <bundle id="org.apache.commons.commons-codec"> <category name="EGit.dependencies"/> </bundle> - <bundle id="org.apache.commons.codec.source"> + <bundle id="org.apache.commons.commons-codec.source"> <category name="EGit.dependencies"/> </bundle> <bundle id="net.i2p.crypto.eddsa"> @@ -87,16 +84,16 @@ <bundle id="com.jcraft.jzlib.source"> <category name="EGit.dependencies"/> </bundle> - <bundle id="org.slf4j.api"> + <bundle id="slf4j.api"> <category name="EGit.dependencies"/> </bundle> - <bundle id="org.slf4j.api.source"> + <bundle id="slf4j.api.source"> <category name="EGit.dependencies"/> </bundle> - <bundle id="org.slf4j.binding.simple"> + <bundle id="slf4j.simple"> <category name="EGit.dependencies"/> </bundle> - <bundle id="org.slf4j.binding.simple.source"> + <bundle id="slf4j.simple.source"> <category name="EGit.dependencies"/> </bundle> <bundle id="org.tukaani.xz"> @@ -111,34 +108,34 @@ <bundle id="org.apache.commons.logging.source"> <category name="EGit.dependencies"/> </bundle> - <bundle id="javaewah"> + <bundle id="com.googlecode.javaewah.JavaEWAH"> <category name="EGit.dependencies"/> </bundle> - <bundle id="javaewah.source"> + <bundle id="com.googlecode.javaewah.JavaEWAH.source"> <category name="EGit.dependencies"/> </bundle> - <bundle id="org.bouncycastle.bcpg"> + <bundle id="bcpg"> <category name="EGit.dependencies"/> </bundle> - <bundle id="org.bouncycastle.bcpg.source"> + <bundle id="bcpg.source"> <category name="EGit.dependencies"/> </bundle> - <bundle id="org.bouncycastle.bcpkix"> + <bundle id="bcpkix"> <category name="EGit.dependencies"/> </bundle> - <bundle id="org.bouncycastle.bcpkix.source"> + <bundle id="bcpkix.source"> <category name="EGit.dependencies"/> </bundle> - <bundle id="org.bouncycastle.bcprov"> + <bundle id="bcprov"> <category name="EGit.dependencies"/> </bundle> - <bundle id="org.bouncycastle.bcprov.source"> + <bundle id="bcprov.source"> <category name="EGit.dependencies"/> </bundle> - <bundle id="org.bouncycastle.bcutil"> + <bundle id="bcutil"> <category name="EGit.dependencies"/> </bundle> - <bundle id="org.bouncycastle.bcutil.source"> + <bundle id="bcutil.source"> <category name="EGit.dependencies"/> </bundle> <bundle id="com.google.gson"> @@ -213,10 +210,10 @@ <bundle id="org.eclipse.jetty.util.ajax.source"> <category name="EGit.dependencies"/> </bundle> - <bundle id="org.apache.commons.compress"> + <bundle id="org.apache.commons.commons-compress"> <category name="EGit.dependencies"/> </bundle> - <bundle id="org.apache.commons.compress.source"> + <bundle id="org.apache.commons.commons-compress.source"> <category name="EGit.dependencies"/> </bundle> <bundle id="org.kohsuke.args4j"> @@ -231,6 +228,15 @@ <bundle id="org.apache.log4j.source"> <category name="EGit.dependencies"/> </bundle> + <bundle id="org.eclipse.osgi"> + <category name="EGit.dependencies"/> + </bundle> + <bundle id="org.osgi.service.cm"> + <category name="EGit.dependencies"/> + </bundle> + <bundle id="org.osgi.service.cm.source"> + <category name="EGit.dependencies"/> + </bundle> <category-def name="EGit" label="Git integration for Eclipse"> <description> Versioning with Git and integration with Gerrit Code Review @@ -247,8 +253,6 @@ </description> </category-def> <category-def name="EGit.dependencies" label="Git integration for Eclipse - dependencies"/> - <repository-reference location="https://download.eclipse.org/egit/github/updates" enabled="true" /> - <repository-reference location="https://download.eclipse.org/egit/github/updates-nightly" enabled="true" /> <repository-reference location="https://download.eclipse.org/e4/snapshots/org.eclipse.e4.ui" enabled="true" /> - <repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository" enabled="true" /> + <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0" enabled="true" /> </site> diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml index ccf312cb8f..301d705271 100644 --- a/org.eclipse.egit.repository/pom.xml +++ b/org.eclipse.egit.repository/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> + <version>6.8.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.repository</artifactId> @@ -31,7 +31,7 @@ <p2MirrorsURL>https://www.eclipse.org/downloads/download.php?file=${PUBLISH_FOLDER}&format=xml</p2MirrorsURL> <p2StatsURL>https://download.eclipse.org/stats/egit/${project.artifactId}</p2StatsURL> <!-- At the moment, this list of features needs to be maintained manually. --> - <statsTrackedArtifacts>org.eclipse.jgit.feature,org.eclipse.jgit.source.feature,org.eclipse.jgit.pgm.feature,org.eclipse.jgit.pgm.source.feature,org.eclipse.jgit.http.apache.feature,org.eclipse.jgit.ssh.apache.feature,org.eclipse.egit.feature,org.eclipse.egit.gitflow.feature,org.eclipse.egit.mylyn.feature,org.eclipse.egit.source.feature</statsTrackedArtifacts> + <statsTrackedArtifacts>org.eclipse.jgit.feature,org.eclipse.jgit.source.feature,org.eclipse.jgit.pgm.feature,org.eclipse.jgit.pgm.source.feature,org.eclipse.jgit.http.apache.feature,org.eclipse.jgit.ssh.apache.feature,org.eclipse.egit.feature,org.eclipse.egit.gitflow.feature,org.eclipse.egit.source.feature</statsTrackedArtifacts> </properties> <build> @@ -75,4 +75,50 @@ </plugin> </plugins> </build> + <profiles> + <profile> + <id>gpg-sign</id> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-repository-plugin</artifactId> + <executions> + <execution> + <id>default-archive-repository</id> + <phase>pre-integration-test</phase> + <goals> + <goal>archive-repository</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-gpg-plugin</artifactId> + <executions> + <execution> + <id>pgpsigner</id> + <phase>package</phase> + <goals> + <goal>sign-p2-artifacts</goal> + </goals> + <configuration> + <keyname>E35AC353</keyname> <!-- EGit public key --> + <passphrase>${env.EGIT_KEYRING_PASSPHRASE}</passphrase> + <skipIfJarsigned>true</skipIfJarsigned> <!-- Sign if not already JAR-signed. --> + <forceSignature> + <bundle>bcpg</bundle> + <bundle>bcpkix</bundle> + <bundle>bcprov</bundle> + <bundle>bcutil</bundle> + </forceSignature> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> diff --git a/org.eclipse.egit.source-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit.source-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit.source-feature/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit.source-feature/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.source-feature/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit.source-feature/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit.source-feature/feature.properties b/org.eclipse.egit.source-feature/feature.properties index 86bfae3fab..82728c5095 100644 --- a/org.eclipse.egit.source-feature/feature.properties +++ b/org.eclipse.egit.source-feature/feature.properties @@ -22,7 +22,7 @@ Standalone: includes all the necessary bundles. # "copyright" property - text of the "Feature Update Copyright" copyright=\ -Copyright (c) 2005, 2021 Shawn Pearce, Robin Rosenberg, et.al.\n\ +Copyright (c) 2005, 2023 Shawn Pearce, Robin Rosenberg, et.al.\n\ All rights reserved. This program and the accompanying materials\n\ are made available under the terms of the Eclipse Public License 2.0\n\ which accompanies this distribution, and is available at\n\ diff --git a/org.eclipse.egit.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml index 5c0e9faadf..8cc0cf34d1 100644 --- a/org.eclipse.egit.source-feature/feature.xml +++ b/org.eclipse.egit.source-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.egit.source" label="%featureName" - version="6.3.0.qualifier" + version="6.8.0.qualifier" provider-name="%providerName" plugin="org.eclipse.egit" license-feature="org.eclipse.license" @@ -26,7 +26,7 @@ </url> <requires> - <import feature="org.eclipse.egit" version="6.3.0" match="equivalent"/> + <import feature="org.eclipse.egit" version="6.8.0" match="equivalent"/> </requires> <plugin @@ -44,13 +44,6 @@ unpack="false"/> <plugin - id="org.eclipse.egit.mylyn.ui.source" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.egit.gitflow.source" download-size="0" install-size="0" diff --git a/org.eclipse.egit.source-feature/pom.xml b/org.eclipse.egit.source-feature/pom.xml index d09b7d8a22..962085ba79 100644 --- a/org.eclipse.egit.source-feature/pom.xml +++ b/org.eclipse.egit.source-feature/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> + <version>6.8.0-SNAPSHOT</version> </parent> <groupId>org.eclipse.egit.feature</groupId> diff --git a/org.eclipse.egit.target/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit.target/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit.target/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit.target/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.target/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit.target/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit.target/egit-4.17.target b/org.eclipse.egit.target/egit-4.17.target deleted file mode 100644 index 9844bee86a..0000000000 --- a/org.eclipse.egit.target/egit-4.17.target +++ /dev/null @@ -1,142 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde?> -<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="egit-4.17" sequenceNumber="1654550802"> - <locations> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="jakarta.servlet-api" version="4.0.0"/> - <unit id="jakarta.servlet-api.source" version="4.0.0"/> - <unit id="org.eclipse.jetty.http" version="10.0.6"/> - <unit id="org.eclipse.jetty.http.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.io" version="10.0.6"/> - <unit id="org.eclipse.jetty.io.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.security" version="10.0.6"/> - <unit id="org.eclipse.jetty.security.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.server" version="10.0.6"/> - <unit id="org.eclipse.jetty.server.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.servlet" version="10.0.6"/> - <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.util" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/> - <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.license.feature.group" version="0.0.0"/> - <repository id="eclipse-public-license" location="https://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> - <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> - <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/> - <repository id="swtbot-snapshot" location="https://download.eclipse.org/technology/swtbot/snapshots/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="com.google.gson" version="2.8.9.v20220111-1409"/> - <unit id="com.google.gson.source" version="2.8.9.v20220111-1409"/> - <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/> - <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/> - <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> - <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> - <unit id="com.sun.jna" version="5.8.0.v20210503-0343"/> - <unit id="com.sun.jna.source" version="5.8.0.v20210503-0343"/> - <unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/> - <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/> - <unit id="javaewah" version="1.1.13.v20211029-0839"/> - <unit id="javaewah.source" version="1.1.13.v20211029-0839"/> - <unit id="jakarta.activation" version="1.2.2.v20201119-1642"/> - <unit id="jakarta.activation.source" version="1.2.2.v20201119-1642"/> - <unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/> - <unit id="jakarta.xml.bind.source" version="2.3.3.v20201118-1818"/> - <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/> - <unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/> - <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.9.0.v20181106-1534"/> - <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/> - <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> - <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> - <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> - <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> - <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/> - <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/> - <unit id="org.apache.commons.compress" version="1.21.0.v20211103-2100"/> - <unit id="org.apache.commons.compress.source" version="1.21.0.v20211103-2100"/> - <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/> - <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/> - <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/> - <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> - <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.log4j" version="1.2.19.v20220208-1728"/> - <unit id="org.apache.log4j.source" version="1.2.19.v20220208-1728"/> - <unit id="org.apache.sshd.osgi" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.osgi.source" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp.source" version="2.8.0.v20211227-1750"/> - <unit id="org.bouncycastle.bcpg" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcpg.source" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcpkix" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcpkix.source" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcprov" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcprov.source" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcutil" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcutil.source" version="1.70.0.v20220105-1522"/> - <unit id="org.junit" version="4.13.2.v20211018-1956"/> - <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/> - <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/> - <unit id="org.mockito" version="2.23.0.v20200310-1642"/> - <unit id="org.mockito.source" version="2.23.0.v20200310-1642"/> - <unit id="org.objenesis" version="2.6.0.v20180420-1519"/> - <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> - <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/> - <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> - <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> - <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> - <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> - <unit id="org.hamcrest.generator" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.generator.source" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.integration.source" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> - <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> - <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/> - <unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.sdk.ide" version="0.0.0"/> - <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> - <unit id="org.eclipse.equinox.concurrent" version="0.0.0"/> - <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.team_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.context_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/> - <repository location="https://download.eclipse.org/releases/2020-09/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="javax.xml" version="0.0.0"/> - <unit id="org.apache.lucene.analyzers-common" version="6.1.0.v20161115-1612"/> - <unit id="org.apache.lucene.core" version="6.1.0.v20170814-1820"/> - <unit id="org.apache.lucene.queryparser" version="6.1.0.v20161115-1612"/> - <unit id="org.apache.xerces" version="0.0.0"/> - <unit id="org.apache.xml.resolver" version="0.0.0"/> - <unit id="org.apache.xml.serializer" version="0.0.0"/> - <repository location="https://download.eclipse.org/mylyn/releases/latest"/> - </location> - </locations> -</target> diff --git a/org.eclipse.egit.target/egit-4.17.tpd b/org.eclipse.egit.target/egit-4.17.tpd deleted file mode 100644 index f26088ecbf..0000000000 --- a/org.eclipse.egit.target/egit-4.17.tpd +++ /dev/null @@ -1,7 +0,0 @@ -target "egit-4.17" with source configurePhase - -include "projects/jetty-10.0.x.tpd" -include "projects/license.tpd" -include "projects/swtbot-snapshot.tpd" -include "orbit/R20220531185310-2022-06.tpd" -include "releasetrain/4.17-2020-09.tpd" diff --git a/org.eclipse.egit.target/egit-4.18.target b/org.eclipse.egit.target/egit-4.18.target deleted file mode 100644 index 048d4d86c1..0000000000 --- a/org.eclipse.egit.target/egit-4.18.target +++ /dev/null @@ -1,145 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde?> -<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="egit-4.18" sequenceNumber="1654550802"> - <locations> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="jakarta.servlet-api" version="4.0.0"/> - <unit id="jakarta.servlet-api.source" version="4.0.0"/> - <unit id="org.eclipse.jetty.http" version="10.0.6"/> - <unit id="org.eclipse.jetty.http.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.io" version="10.0.6"/> - <unit id="org.eclipse.jetty.io.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.security" version="10.0.6"/> - <unit id="org.eclipse.jetty.security.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.server" version="10.0.6"/> - <unit id="org.eclipse.jetty.server.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.servlet" version="10.0.6"/> - <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.util" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/> - <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.license.feature.group" version="0.0.0"/> - <repository id="eclipse-public-license" location="https://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> - <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> - <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/> - <repository id="swtbot-snapshot" location="https://download.eclipse.org/technology/swtbot/snapshots/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="com.google.gson" version="2.8.9.v20220111-1409"/> - <unit id="com.google.gson.source" version="2.8.9.v20220111-1409"/> - <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/> - <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/> - <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> - <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> - <unit id="com.sun.jna" version="5.8.0.v20210503-0343"/> - <unit id="com.sun.jna.source" version="5.8.0.v20210503-0343"/> - <unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/> - <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/> - <unit id="javaewah" version="1.1.13.v20211029-0839"/> - <unit id="javaewah.source" version="1.1.13.v20211029-0839"/> - <unit id="jakarta.activation" version="1.2.2.v20201119-1642"/> - <unit id="jakarta.activation.source" version="1.2.2.v20201119-1642"/> - <unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/> - <unit id="jakarta.xml.bind.source" version="2.3.3.v20201118-1818"/> - <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/> - <unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/> - <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.9.0.v20181106-1534"/> - <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/> - <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> - <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> - <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> - <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> - <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/> - <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/> - <unit id="org.apache.commons.compress" version="1.21.0.v20211103-2100"/> - <unit id="org.apache.commons.compress.source" version="1.21.0.v20211103-2100"/> - <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/> - <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/> - <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/> - <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> - <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.log4j" version="1.2.19.v20220208-1728"/> - <unit id="org.apache.log4j.source" version="1.2.19.v20220208-1728"/> - <unit id="org.apache.sshd.osgi" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.osgi.source" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp.source" version="2.8.0.v20211227-1750"/> - <unit id="org.bouncycastle.bcpg" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcpg.source" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcpkix" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcpkix.source" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcprov" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcprov.source" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcutil" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcutil.source" version="1.70.0.v20220105-1522"/> - <unit id="org.junit" version="4.13.2.v20211018-1956"/> - <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/> - <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/> - <unit id="org.mockito" version="2.23.0.v20200310-1642"/> - <unit id="org.mockito.source" version="2.23.0.v20200310-1642"/> - <unit id="org.objenesis" version="2.6.0.v20180420-1519"/> - <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> - <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/> - <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> - <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> - <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> - <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> - <unit id="org.hamcrest.generator" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.generator.source" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.integration.source" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> - <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> - <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/> - <unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.sdk.ide" version="0.0.0"/> - <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> - <unit id="org.eclipse.equinox.concurrent" version="0.0.0"/> - <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.team_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.context_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/> - <repository location="https://download.eclipse.org/releases/2020-12/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/> - <repository location="https://download.eclipse.org/releases/2020-09/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="javax.xml" version="0.0.0"/> - <unit id="org.apache.lucene.analyzers-common" version="6.1.0.v20161115-1612"/> - <unit id="org.apache.lucene.core" version="6.1.0.v20170814-1820"/> - <unit id="org.apache.lucene.queryparser" version="6.1.0.v20161115-1612"/> - <unit id="org.apache.xerces" version="0.0.0"/> - <unit id="org.apache.xml.resolver" version="0.0.0"/> - <unit id="org.apache.xml.serializer" version="0.0.0"/> - <repository location="https://download.eclipse.org/mylyn/releases/latest"/> - </location> - </locations> -</target> diff --git a/org.eclipse.egit.target/egit-4.18.tpd b/org.eclipse.egit.target/egit-4.18.tpd deleted file mode 100644 index 512f77cfe3..0000000000 --- a/org.eclipse.egit.target/egit-4.18.tpd +++ /dev/null @@ -1,7 +0,0 @@ -target "egit-4.18" with source configurePhase - -include "projects/jetty-10.0.x.tpd" -include "projects/license.tpd" -include "projects/swtbot-snapshot.tpd" -include "orbit/R20220531185310-2022-06.tpd" -include "releasetrain/4.18-2020-12.tpd" diff --git a/org.eclipse.egit.target/egit-4.19.target b/org.eclipse.egit.target/egit-4.19.target deleted file mode 100644 index 78f24f5a68..0000000000 --- a/org.eclipse.egit.target/egit-4.19.target +++ /dev/null @@ -1,145 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde?> -<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="egit-4.19" sequenceNumber="1654550802"> - <locations> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="jakarta.servlet-api" version="4.0.0"/> - <unit id="jakarta.servlet-api.source" version="4.0.0"/> - <unit id="org.eclipse.jetty.http" version="10.0.6"/> - <unit id="org.eclipse.jetty.http.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.io" version="10.0.6"/> - <unit id="org.eclipse.jetty.io.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.security" version="10.0.6"/> - <unit id="org.eclipse.jetty.security.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.server" version="10.0.6"/> - <unit id="org.eclipse.jetty.server.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.servlet" version="10.0.6"/> - <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.util" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/> - <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.license.feature.group" version="0.0.0"/> - <repository id="eclipse-public-license" location="https://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> - <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> - <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/> - <repository id="swtbot-snapshot" location="https://download.eclipse.org/technology/swtbot/snapshots/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="com.google.gson" version="2.8.9.v20220111-1409"/> - <unit id="com.google.gson.source" version="2.8.9.v20220111-1409"/> - <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/> - <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/> - <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> - <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> - <unit id="com.sun.jna" version="5.8.0.v20210503-0343"/> - <unit id="com.sun.jna.source" version="5.8.0.v20210503-0343"/> - <unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/> - <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/> - <unit id="javaewah" version="1.1.13.v20211029-0839"/> - <unit id="javaewah.source" version="1.1.13.v20211029-0839"/> - <unit id="jakarta.activation" version="1.2.2.v20201119-1642"/> - <unit id="jakarta.activation.source" version="1.2.2.v20201119-1642"/> - <unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/> - <unit id="jakarta.xml.bind.source" version="2.3.3.v20201118-1818"/> - <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/> - <unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/> - <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.9.0.v20181106-1534"/> - <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/> - <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> - <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> - <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> - <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> - <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/> - <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/> - <unit id="org.apache.commons.compress" version="1.21.0.v20211103-2100"/> - <unit id="org.apache.commons.compress.source" version="1.21.0.v20211103-2100"/> - <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/> - <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/> - <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/> - <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> - <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.log4j" version="1.2.19.v20220208-1728"/> - <unit id="org.apache.log4j.source" version="1.2.19.v20220208-1728"/> - <unit id="org.apache.sshd.osgi" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.osgi.source" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp.source" version="2.8.0.v20211227-1750"/> - <unit id="org.bouncycastle.bcpg" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcpg.source" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcpkix" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcpkix.source" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcprov" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcprov.source" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcutil" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcutil.source" version="1.70.0.v20220105-1522"/> - <unit id="org.junit" version="4.13.2.v20211018-1956"/> - <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/> - <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/> - <unit id="org.mockito" version="2.23.0.v20200310-1642"/> - <unit id="org.mockito.source" version="2.23.0.v20200310-1642"/> - <unit id="org.objenesis" version="2.6.0.v20180420-1519"/> - <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> - <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/> - <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> - <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> - <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> - <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> - <unit id="org.hamcrest.generator" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.generator.source" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.integration.source" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> - <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> - <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/> - <unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.sdk.ide" version="0.0.0"/> - <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> - <unit id="org.eclipse.equinox.concurrent" version="0.0.0"/> - <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.team_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.context_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/> - <repository location="https://download.eclipse.org/staging/2021-03/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/> - <repository location="https://download.eclipse.org/releases/2020-09/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="javax.xml" version="0.0.0"/> - <unit id="org.apache.lucene.analyzers-common" version="6.1.0.v20161115-1612"/> - <unit id="org.apache.lucene.core" version="6.1.0.v20170814-1820"/> - <unit id="org.apache.lucene.queryparser" version="6.1.0.v20161115-1612"/> - <unit id="org.apache.xerces" version="0.0.0"/> - <unit id="org.apache.xml.resolver" version="0.0.0"/> - <unit id="org.apache.xml.serializer" version="0.0.0"/> - <repository location="https://download.eclipse.org/mylyn/releases/latest"/> - </location> - </locations> -</target> diff --git a/org.eclipse.egit.target/egit-4.19.tpd b/org.eclipse.egit.target/egit-4.19.tpd deleted file mode 100644 index a4651481fd..0000000000 --- a/org.eclipse.egit.target/egit-4.19.tpd +++ /dev/null @@ -1,7 +0,0 @@ -target "egit-4.19" with source configurePhase - -include "projects/jetty-10.0.x.tpd" -include "projects/license.tpd" -include "projects/swtbot-snapshot.tpd" -include "orbit/R20220531185310-2022-06.tpd" -include "releasetrain/4.19-2021-03.tpd" diff --git a/org.eclipse.egit.target/egit-4.20.target b/org.eclipse.egit.target/egit-4.20.target deleted file mode 100644 index 3b01fdfd63..0000000000 --- a/org.eclipse.egit.target/egit-4.20.target +++ /dev/null @@ -1,145 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde?> -<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="egit-4.20" sequenceNumber="1654550802"> - <locations> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="jakarta.servlet-api" version="4.0.0"/> - <unit id="jakarta.servlet-api.source" version="4.0.0"/> - <unit id="org.eclipse.jetty.http" version="10.0.6"/> - <unit id="org.eclipse.jetty.http.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.io" version="10.0.6"/> - <unit id="org.eclipse.jetty.io.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.security" version="10.0.6"/> - <unit id="org.eclipse.jetty.security.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.server" version="10.0.6"/> - <unit id="org.eclipse.jetty.server.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.servlet" version="10.0.6"/> - <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.util" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/> - <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.license.feature.group" version="0.0.0"/> - <repository id="eclipse-public-license" location="https://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> - <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> - <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/> - <repository id="swtbot-snapshot" location="https://download.eclipse.org/technology/swtbot/snapshots/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="com.google.gson" version="2.8.9.v20220111-1409"/> - <unit id="com.google.gson.source" version="2.8.9.v20220111-1409"/> - <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/> - <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/> - <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> - <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> - <unit id="com.sun.jna" version="5.8.0.v20210503-0343"/> - <unit id="com.sun.jna.source" version="5.8.0.v20210503-0343"/> - <unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/> - <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/> - <unit id="javaewah" version="1.1.13.v20211029-0839"/> - <unit id="javaewah.source" version="1.1.13.v20211029-0839"/> - <unit id="jakarta.activation" version="1.2.2.v20201119-1642"/> - <unit id="jakarta.activation.source" version="1.2.2.v20201119-1642"/> - <unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/> - <unit id="jakarta.xml.bind.source" version="2.3.3.v20201118-1818"/> - <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/> - <unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/> - <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.9.0.v20181106-1534"/> - <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/> - <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> - <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> - <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> - <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> - <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/> - <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/> - <unit id="org.apache.commons.compress" version="1.21.0.v20211103-2100"/> - <unit id="org.apache.commons.compress.source" version="1.21.0.v20211103-2100"/> - <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/> - <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/> - <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/> - <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> - <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.log4j" version="1.2.19.v20220208-1728"/> - <unit id="org.apache.log4j.source" version="1.2.19.v20220208-1728"/> - <unit id="org.apache.sshd.osgi" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.osgi.source" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp.source" version="2.8.0.v20211227-1750"/> - <unit id="org.bouncycastle.bcpg" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcpg.source" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcpkix" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcpkix.source" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcprov" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcprov.source" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcutil" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcutil.source" version="1.70.0.v20220105-1522"/> - <unit id="org.junit" version="4.13.2.v20211018-1956"/> - <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/> - <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/> - <unit id="org.mockito" version="2.23.0.v20200310-1642"/> - <unit id="org.mockito.source" version="2.23.0.v20200310-1642"/> - <unit id="org.objenesis" version="2.6.0.v20180420-1519"/> - <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> - <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/> - <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> - <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> - <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> - <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> - <unit id="org.hamcrest.generator" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.generator.source" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.integration.source" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> - <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> - <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/> - <unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.sdk.ide" version="0.0.0"/> - <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> - <unit id="org.eclipse.equinox.concurrent" version="0.0.0"/> - <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.team_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.context_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/> - <repository location="https://download.eclipse.org/releases/2021-06/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/> - <repository location="https://download.eclipse.org/releases/2020-09/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="javax.xml" version="0.0.0"/> - <unit id="org.apache.lucene.analyzers-common" version="6.1.0.v20161115-1612"/> - <unit id="org.apache.lucene.core" version="6.1.0.v20170814-1820"/> - <unit id="org.apache.lucene.queryparser" version="6.1.0.v20161115-1612"/> - <unit id="org.apache.xerces" version="0.0.0"/> - <unit id="org.apache.xml.resolver" version="0.0.0"/> - <unit id="org.apache.xml.serializer" version="0.0.0"/> - <repository location="https://download.eclipse.org/mylyn/releases/latest"/> - </location> - </locations> -</target> diff --git a/org.eclipse.egit.target/egit-4.20.tpd b/org.eclipse.egit.target/egit-4.20.tpd deleted file mode 100644 index 14372a9e06..0000000000 --- a/org.eclipse.egit.target/egit-4.20.tpd +++ /dev/null @@ -1,7 +0,0 @@ -target "egit-4.20" with source configurePhase - -include "projects/jetty-10.0.x.tpd" -include "projects/license.tpd" -include "projects/swtbot-snapshot.tpd" -include "orbit/R20220531185310-2022-06.tpd" -include "releasetrain/4.20-2021-06.tpd" diff --git a/org.eclipse.egit.target/egit-4.21.target b/org.eclipse.egit.target/egit-4.21.target deleted file mode 100644 index 743061710a..0000000000 --- a/org.eclipse.egit.target/egit-4.21.target +++ /dev/null @@ -1,145 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde?> -<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="egit-4.21" sequenceNumber="1654550802"> - <locations> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="jakarta.servlet-api" version="4.0.0"/> - <unit id="jakarta.servlet-api.source" version="4.0.0"/> - <unit id="org.eclipse.jetty.http" version="10.0.6"/> - <unit id="org.eclipse.jetty.http.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.io" version="10.0.6"/> - <unit id="org.eclipse.jetty.io.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.security" version="10.0.6"/> - <unit id="org.eclipse.jetty.security.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.server" version="10.0.6"/> - <unit id="org.eclipse.jetty.server.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.servlet" version="10.0.6"/> - <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.util" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/> - <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.license.feature.group" version="0.0.0"/> - <repository id="eclipse-public-license" location="https://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> - <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> - <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/> - <repository id="swtbot-snapshot" location="https://download.eclipse.org/technology/swtbot/snapshots/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="com.google.gson" version="2.8.9.v20220111-1409"/> - <unit id="com.google.gson.source" version="2.8.9.v20220111-1409"/> - <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/> - <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/> - <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> - <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> - <unit id="com.sun.jna" version="5.8.0.v20210503-0343"/> - <unit id="com.sun.jna.source" version="5.8.0.v20210503-0343"/> - <unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/> - <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/> - <unit id="javaewah" version="1.1.13.v20211029-0839"/> - <unit id="javaewah.source" version="1.1.13.v20211029-0839"/> - <unit id="jakarta.activation" version="1.2.2.v20201119-1642"/> - <unit id="jakarta.activation.source" version="1.2.2.v20201119-1642"/> - <unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/> - <unit id="jakarta.xml.bind.source" version="2.3.3.v20201118-1818"/> - <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/> - <unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/> - <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.9.0.v20181106-1534"/> - <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/> - <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> - <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> - <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> - <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> - <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/> - <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/> - <unit id="org.apache.commons.compress" version="1.21.0.v20211103-2100"/> - <unit id="org.apache.commons.compress.source" version="1.21.0.v20211103-2100"/> - <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/> - <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/> - <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/> - <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> - <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.log4j" version="1.2.19.v20220208-1728"/> - <unit id="org.apache.log4j.source" version="1.2.19.v20220208-1728"/> - <unit id="org.apache.sshd.osgi" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.osgi.source" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp.source" version="2.8.0.v20211227-1750"/> - <unit id="org.bouncycastle.bcpg" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcpg.source" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcpkix" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcpkix.source" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcprov" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcprov.source" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcutil" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcutil.source" version="1.70.0.v20220105-1522"/> - <unit id="org.junit" version="4.13.2.v20211018-1956"/> - <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/> - <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/> - <unit id="org.mockito" version="2.23.0.v20200310-1642"/> - <unit id="org.mockito.source" version="2.23.0.v20200310-1642"/> - <unit id="org.objenesis" version="2.6.0.v20180420-1519"/> - <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> - <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/> - <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> - <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> - <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> - <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> - <unit id="org.hamcrest.generator" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.generator.source" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.integration.source" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> - <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> - <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/> - <unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.sdk.ide" version="0.0.0"/> - <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> - <unit id="org.eclipse.equinox.concurrent" version="0.0.0"/> - <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.team_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.context_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/> - <repository location="https://download.eclipse.org/releases/2021-09/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/> - <repository location="https://download.eclipse.org/releases/2020-09/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="javax.xml" version="0.0.0"/> - <unit id="org.apache.lucene.analyzers-common" version="6.1.0.v20161115-1612"/> - <unit id="org.apache.lucene.core" version="6.1.0.v20170814-1820"/> - <unit id="org.apache.lucene.queryparser" version="6.1.0.v20161115-1612"/> - <unit id="org.apache.xerces" version="0.0.0"/> - <unit id="org.apache.xml.resolver" version="0.0.0"/> - <unit id="org.apache.xml.serializer" version="0.0.0"/> - <repository location="https://download.eclipse.org/mylyn/releases/latest"/> - </location> - </locations> -</target> diff --git a/org.eclipse.egit.target/egit-4.21.tpd b/org.eclipse.egit.target/egit-4.21.tpd deleted file mode 100644 index f6e7105b89..0000000000 --- a/org.eclipse.egit.target/egit-4.21.tpd +++ /dev/null @@ -1,7 +0,0 @@ -target "egit-4.21" with source configurePhase - -include "projects/jetty-10.0.x.tpd" -include "projects/license.tpd" -include "projects/swtbot-snapshot.tpd" -include "orbit/R20220531185310-2022-06.tpd" -include "releasetrain/4.21-2021-09.tpd" diff --git a/org.eclipse.egit.target/egit-4.22.target b/org.eclipse.egit.target/egit-4.22.target deleted file mode 100644 index ee0975688a..0000000000 --- a/org.eclipse.egit.target/egit-4.22.target +++ /dev/null @@ -1,145 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde?> -<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="egit-4.21" sequenceNumber="1654550802"> - <locations> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="jakarta.servlet-api" version="4.0.0"/> - <unit id="jakarta.servlet-api.source" version="4.0.0"/> - <unit id="org.eclipse.jetty.http" version="10.0.6"/> - <unit id="org.eclipse.jetty.http.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.io" version="10.0.6"/> - <unit id="org.eclipse.jetty.io.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.security" version="10.0.6"/> - <unit id="org.eclipse.jetty.security.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.server" version="10.0.6"/> - <unit id="org.eclipse.jetty.server.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.servlet" version="10.0.6"/> - <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.util" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/> - <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.license.feature.group" version="0.0.0"/> - <repository id="eclipse-public-license" location="https://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> - <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> - <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/> - <repository id="swtbot-snapshot" location="https://download.eclipse.org/technology/swtbot/snapshots/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="com.google.gson" version="2.8.9.v20220111-1409"/> - <unit id="com.google.gson.source" version="2.8.9.v20220111-1409"/> - <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/> - <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/> - <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> - <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> - <unit id="com.sun.jna" version="5.8.0.v20210503-0343"/> - <unit id="com.sun.jna.source" version="5.8.0.v20210503-0343"/> - <unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/> - <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/> - <unit id="javaewah" version="1.1.13.v20211029-0839"/> - <unit id="javaewah.source" version="1.1.13.v20211029-0839"/> - <unit id="jakarta.activation" version="1.2.2.v20201119-1642"/> - <unit id="jakarta.activation.source" version="1.2.2.v20201119-1642"/> - <unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/> - <unit id="jakarta.xml.bind.source" version="2.3.3.v20201118-1818"/> - <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/> - <unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/> - <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.9.0.v20181106-1534"/> - <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/> - <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> - <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> - <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> - <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> - <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/> - <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/> - <unit id="org.apache.commons.compress" version="1.21.0.v20211103-2100"/> - <unit id="org.apache.commons.compress.source" version="1.21.0.v20211103-2100"/> - <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/> - <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/> - <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/> - <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> - <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.log4j" version="1.2.19.v20220208-1728"/> - <unit id="org.apache.log4j.source" version="1.2.19.v20220208-1728"/> - <unit id="org.apache.sshd.osgi" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.osgi.source" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp.source" version="2.8.0.v20211227-1750"/> - <unit id="org.bouncycastle.bcpg" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcpg.source" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcpkix" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcpkix.source" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcprov" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcprov.source" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcutil" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcutil.source" version="1.70.0.v20220105-1522"/> - <unit id="org.junit" version="4.13.2.v20211018-1956"/> - <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/> - <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/> - <unit id="org.mockito" version="2.23.0.v20200310-1642"/> - <unit id="org.mockito.source" version="2.23.0.v20200310-1642"/> - <unit id="org.objenesis" version="2.6.0.v20180420-1519"/> - <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> - <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/> - <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> - <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> - <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> - <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> - <unit id="org.hamcrest.generator" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.generator.source" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.integration.source" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> - <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> - <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/> - <unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.sdk.ide" version="0.0.0"/> - <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> - <unit id="org.eclipse.equinox.concurrent" version="0.0.0"/> - <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.team_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.context_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/> - <repository location="https://download.eclipse.org/releases/2021-12/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/> - <repository location="https://download.eclipse.org/releases/2020-09/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="javax.xml" version="0.0.0"/> - <unit id="org.apache.lucene.analyzers-common" version="6.1.0.v20161115-1612"/> - <unit id="org.apache.lucene.core" version="6.1.0.v20170814-1820"/> - <unit id="org.apache.lucene.queryparser" version="6.1.0.v20161115-1612"/> - <unit id="org.apache.xerces" version="0.0.0"/> - <unit id="org.apache.xml.resolver" version="0.0.0"/> - <unit id="org.apache.xml.serializer" version="0.0.0"/> - <repository location="https://download.eclipse.org/mylyn/releases/latest"/> - </location> - </locations> -</target> diff --git a/org.eclipse.egit.target/egit-4.22.tpd b/org.eclipse.egit.target/egit-4.22.tpd deleted file mode 100644 index 022ac05e8c..0000000000 --- a/org.eclipse.egit.target/egit-4.22.tpd +++ /dev/null @@ -1,7 +0,0 @@ -target "egit-4.21" with source configurePhase - -include "projects/jetty-10.0.x.tpd" -include "projects/license.tpd" -include "projects/swtbot-snapshot.tpd" -include "orbit/R20220531185310-2022-06.tpd" -include "releasetrain/4.22-2021-12.tpd" diff --git a/org.eclipse.egit.target/egit-4.23.target b/org.eclipse.egit.target/egit-4.23.target deleted file mode 100644 index 91b2b1e7a5..0000000000 --- a/org.eclipse.egit.target/egit-4.23.target +++ /dev/null @@ -1,145 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<?pde?> -<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="egit-4.23" sequenceNumber="1654550802"> - <locations> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="jakarta.servlet-api" version="4.0.0"/> - <unit id="jakarta.servlet-api.source" version="4.0.0"/> - <unit id="org.eclipse.jetty.http" version="10.0.6"/> - <unit id="org.eclipse.jetty.http.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.io" version="10.0.6"/> - <unit id="org.eclipse.jetty.io.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.security" version="10.0.6"/> - <unit id="org.eclipse.jetty.security.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.server" version="10.0.6"/> - <unit id="org.eclipse.jetty.server.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.servlet" version="10.0.6"/> - <unit id="org.eclipse.jetty.servlet.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.util" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.source" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.ajax" version="10.0.6"/> - <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.6"/> - <repository id="jetty-10.0.x" location="https://download.eclipse.org/eclipse/jetty/10.0.6/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.license.feature.group" version="0.0.0"/> - <repository id="eclipse-public-license" location="https://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> - <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> - <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/> - <repository id="swtbot-snapshot" location="https://download.eclipse.org/technology/swtbot/snapshots/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="com.google.gson" version="2.8.9.v20220111-1409"/> - <unit id="com.google.gson.source" version="2.8.9.v20220111-1409"/> - <unit id="com.jcraft.jsch" version="0.1.55.v20190404-1902"/> - <unit id="com.jcraft.jsch.source" version="0.1.55.v20190404-1902"/> - <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> - <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> - <unit id="com.sun.jna" version="5.8.0.v20210503-0343"/> - <unit id="com.sun.jna.source" version="5.8.0.v20210503-0343"/> - <unit id="com.sun.jna.platform" version="5.8.0.v20210406-1004"/> - <unit id="com.sun.jna.platform.source" version="5.8.0.v20210406-1004"/> - <unit id="javaewah" version="1.1.13.v20211029-0839"/> - <unit id="javaewah.source" version="1.1.13.v20211029-0839"/> - <unit id="jakarta.activation" version="1.2.2.v20201119-1642"/> - <unit id="jakarta.activation.source" version="1.2.2.v20201119-1642"/> - <unit id="jakarta.xml.bind" version="2.3.3.v20201118-1818"/> - <unit id="jakarta.xml.bind.source" version="2.3.3.v20201118-1818"/> - <unit id="net.bytebuddy.byte-buddy" version="1.9.0.v20181107-1410"/> - <unit id="net.bytebuddy.byte-buddy-agent" version="1.9.0.v20181106-1534"/> - <unit id="net.bytebuddy.byte-buddy-agent.source" version="1.9.0.v20181106-1534"/> - <unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/> - <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> - <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> - <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> - <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> - <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/> - <unit id="org.apache.commons.codec.source" version="1.14.0.v20200818-1422"/> - <unit id="org.apache.commons.compress" version="1.21.0.v20211103-2100"/> - <unit id="org.apache.commons.compress.source" version="1.21.0.v20211103-2100"/> - <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/> - <unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/> - <unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/> - <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.13.v20210128-2225"/> - <unit id="org.apache.httpcomponents.httpcore" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.15.v20220209-2345"/> - <unit id="org.apache.log4j" version="1.2.19.v20220208-1728"/> - <unit id="org.apache.log4j.source" version="1.2.19.v20220208-1728"/> - <unit id="org.apache.sshd.osgi" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.osgi.source" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp" version="2.8.0.v20211227-1750"/> - <unit id="org.apache.sshd.sftp.source" version="2.8.0.v20211227-1750"/> - <unit id="org.bouncycastle.bcpg" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcpg.source" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcpkix" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcpkix.source" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcprov" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcprov.source" version="1.70.0.v20220507-1208"/> - <unit id="org.bouncycastle.bcutil" version="1.70.0.v20220105-1522"/> - <unit id="org.bouncycastle.bcutil.source" version="1.70.0.v20220105-1522"/> - <unit id="org.junit" version="4.13.2.v20211018-1956"/> - <unit id="org.junit.source" version="4.13.2.v20211018-1956"/> - <unit id="org.kohsuke.args4j" version="2.33.0.v20160323-2218"/> - <unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/> - <unit id="org.mockito" version="2.23.0.v20200310-1642"/> - <unit id="org.mockito.source" version="2.23.0.v20200310-1642"/> - <unit id="org.objenesis" version="2.6.0.v20180420-1519"/> - <unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/> - <unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.binding.simple" version="1.7.30.v20200204-2150"/> - <unit id="org.slf4j.binding.simple.source" version="1.7.30.v20200204-2150"/> - <unit id="org.tukaani.xz" version="1.9.0.v20210624-1259"/> - <unit id="org.tukaani.xz.source" version="1.9.0.v20210624-1259"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.assertj" version="3.14.0.v20200120-1926"/> - <unit id="org.assertj.source" version="3.14.0.v20200120-1926"/> - <unit id="org.hamcrest" version="1.1.0.v20090501071000"/> - <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/> - <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/> - <unit id="org.hamcrest.generator" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.generator.source" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.integration.source" version="1.3.0.v201305210900"/> - <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/> - <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/> - <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/> - <unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/> - <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.sdk.ide" version="0.0.0"/> - <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> - <unit id="org.eclipse.equinox.concurrent" version="0.0.0"/> - <unit id="org.eclipse.mylyn.ide_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.team_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.context_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.mylyn.bugzilla_feature.feature.group" version="0.0.0"/> - <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/> - <repository location="https://download.eclipse.org/releases/2022-03/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="org.eclipse.mylyn.commons.sdk.feature.group" version="0.0.0"/> - <repository location="https://download.eclipse.org/releases/2020-09/"/> - </location> - <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> - <unit id="javax.xml" version="0.0.0"/> - <unit id="org.apache.lucene.analyzers-common" version="6.1.0.v20161115-1612"/> - <unit id="org.apache.lucene.core" version="6.1.0.v20170814-1820"/> - <unit id="org.apache.lucene.queryparser" version="6.1.0.v20161115-1612"/> - <unit id="org.apache.xerces" version="0.0.0"/> - <unit id="org.apache.xml.resolver" version="0.0.0"/> - <unit id="org.apache.xml.serializer" version="0.0.0"/> - <repository location="https://download.eclipse.org/mylyn/releases/latest"/> - </location> - </locations> -</target> diff --git a/org.eclipse.egit.target/egit-4.23.tpd b/org.eclipse.egit.target/egit-4.23.tpd deleted file mode 100644 index 6b04f1141e..0000000000 --- a/org.eclipse.egit.target/egit-4.23.tpd +++ /dev/null @@ -1,7 +0,0 @@ -target "egit-4.23" with source configurePhase - -include "projects/jetty-10.0.x.tpd" -include "projects/license.tpd" -include "projects/swtbot-snapshot.tpd" -include "orbit/R20220531185310-2022-06.tpd" -include "releasetrain/4.23-2022-03.tpd" diff --git a/org.eclipse.egit.target/egit-4.26.target b/org.eclipse.egit.target/egit-4.26.target new file mode 100644 index 0000000000..0acf75c764 --- /dev/null +++ b/org.eclipse.egit.target/egit-4.26.target @@ -0,0 +1,339 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde?> +<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> +<target name="egit-4.26" sequenceNumber="1700179938"> + <locations> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="org.eclipse.license.feature.group" version="0.0.0"/> + <repository id="eclipse-public-license" location="https://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> + <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> + <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/> + <repository id="swtbot-snapshot" location="https://download.eclipse.org/technology/swtbot/snapshots/"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> + <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> + <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> + <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> + <unit id="jakarta.activation-api" version="1.2.2"/> + <unit id="jakarta.activation-api.source" version="1.2.2"/> + <unit id="jakarta.annotation-api" version="1.3.5"/> + <unit id="jakarta.annotation-api.source" version="1.3.5"/> + <unit id="jakarta.xml.bind-api" version="2.3.3"/> + <unit id="jakarta.xml.bind-api.source" version="2.3.3"/> + <unit id="jakarta.activation" version="2.0.0.v20221203-1659"/> + <unit id="jakarta.activation.source" version="2.0.0.v20221203-1659"/> + <unit id="jakarta.inject.jakarta.inject-api" version="1.0.5"/> + <unit id="jakarta.inject.jakarta.inject-api.source" version="1.0.5"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> + <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> + <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> + <unit id="org.apache.commons.commons-io" version="2.13.0"/> + <unit id="org.apache.commons.commons-io.source" version="2.13.0"/> + <unit id="org.apache.commons.logging" version="1.2.0"/> + <unit id="org.apache.commons.logging.source" version="1.2.0"/> + <unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/> + <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/> + <unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/> + <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.16"/> + <unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/> + <unit id="org.apache.log4j.source" version="1.2.24.v20221221-2012"/> + <unit id="org.eclipse.orbit.maven.lucene.feature.group" version="4.29.0.v20230703-0758"/> + <unit id="org.hamcrest" version="2.2.0"/> + <unit id="org.hamcrest.source" version="2.2.0"/> + <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.core.source" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.library.source" version="1.3.0.v20230809-1000"/> + <unit id="org.junit" version="4.13.2.v20230809-1000"/> + <unit id="org.junit.source" version="4.13.2.v20230809-1000"/> + <unit id="org.objenesis" version="3.3.0"/> + <unit id="org.objenesis.source" version="3.3.0"/> + <unit id="org.objectweb.asm" version="9.5.0"/> + <unit id="org.objectweb.asm.source" version="9.5.0"/> + <unit id="org.objectweb.asm.tree" version="9.5.0"/> + <unit id="org.objectweb.asm.tree.source" version="9.5.0"/> + <unit id="org.objectweb.asm.tree.analysis" version="9.5.0"/> + <unit id="org.objectweb.asm.tree.analysis.source" version="9.5.0"/> + <unit id="org.objectweb.asm.util" version="9.5.0"/> + <unit id="org.objectweb.asm.util.source" version="9.5.0"/> + <unit id="org.osgi.service.cm" version="1.6.1.202109301733"/> + <unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/> + <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="org.eclipse.sdk.ide" version="0.0.0"/> + <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.equinox.p2.director" version="0.0.0"/> + <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.e4.tools.emf.ui" version="0.0.0"/> + <unit id="org.eclipse.e4.tools.services" version="0.0.0"/> + <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/> + <unit id="org.eclipse.e4.ui.workbench" version="0.0.0"/> + <unit id="org.sat4j.core" version="0.0.0"/> + <unit id="org.sat4j.pb" version="0.0.0"/> + <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/> + <repository location="https://download.eclipse.org/releases/2022-12/"/> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="osgi"> + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.annotation.bundle</artifactId> + <version>2.0.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.annotation.versioning</artifactId> + <version>1.1.2</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.component.annotations</artifactId> + <version>1.5.1</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.metatype.annotations</artifactId> + <version>1.4.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="xz"> + <dependencies> + <dependency> + <groupId>org.tukaani</groupId> + <artifactId>xz</artifactId> + <version>1.9</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j"> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="sshd"> + <dependencies> + <dependency> + <groupId>org.apache.sshd</groupId> + <artifactId>sshd-osgi</artifactId> + <version>2.11.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.sshd</groupId> + <artifactId>sshd-sftp</artifactId> + <version>2.11.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.7.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> + <dependencies> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <version>5.13.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna-platform</artifactId> + <version>5.13.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>4.0.4</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="javaewah"> + <dependencies> + <dependency> + <groupId>com.googlecode.javaewah</groupId> + <artifactId>JavaEWAH</artifactId> + <version>1.2.3</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="gson"> + <dependencies> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.10.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> + <dependencies> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy</artifactId> + <version>1.14.9</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy-agent</artifactId> + <version>1.14.9</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle"> + <dependencies> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpg-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcutil-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="assertj"> + <dependencies> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>3.24.2</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="args4j"> + <dependencies> + <dependency> + <groupId>args4j</groupId> + <artifactId>args4j</artifactId> + <version>2.33</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache"> + <dependencies> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.16.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + <version>1.25.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.15.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + </locations> +</target> diff --git a/org.eclipse.egit.target/egit-4.26.tpd b/org.eclipse.egit.target/egit-4.26.tpd new file mode 100644 index 0000000000..fd15645c1f --- /dev/null +++ b/org.eclipse.egit.target/egit-4.26.tpd @@ -0,0 +1,7 @@ +target "egit-4.26" with source configurePhase + +include "projects/license.tpd" +include "projects/swtbot-snapshot.tpd" +include "orbit/orbit-4.29.tpd" +include "maven/dependencies.tpd" +include "releasetrain/4.26-2022-12.tpd" diff --git a/org.eclipse.egit.target/egit-4.27.target b/org.eclipse.egit.target/egit-4.27.target new file mode 100644 index 0000000000..621849f39a --- /dev/null +++ b/org.eclipse.egit.target/egit-4.27.target @@ -0,0 +1,340 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde?> +<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> +<target name="egit-4.27" sequenceNumber="1700179938"> + <locations> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="org.eclipse.license.feature.group" version="0.0.0"/> + <repository id="eclipse-public-license" location="https://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> + <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> + <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/> + <repository id="swtbot-snapshot" location="https://download.eclipse.org/technology/swtbot/snapshots/"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> + <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> + <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> + <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> + <unit id="jakarta.activation-api" version="1.2.2"/> + <unit id="jakarta.activation-api.source" version="1.2.2"/> + <unit id="jakarta.annotation-api" version="1.3.5"/> + <unit id="jakarta.annotation-api.source" version="1.3.5"/> + <unit id="jakarta.xml.bind-api" version="2.3.3"/> + <unit id="jakarta.xml.bind-api.source" version="2.3.3"/> + <unit id="jakarta.activation" version="2.0.0.v20221203-1659"/> + <unit id="jakarta.activation.source" version="2.0.0.v20221203-1659"/> + <unit id="jakarta.inject.jakarta.inject-api" version="1.0.5"/> + <unit id="jakarta.inject.jakarta.inject-api.source" version="1.0.5"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> + <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> + <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> + <unit id="org.apache.commons.commons-io" version="2.13.0"/> + <unit id="org.apache.commons.commons-io.source" version="2.13.0"/> + <unit id="org.apache.commons.logging" version="1.2.0"/> + <unit id="org.apache.commons.logging.source" version="1.2.0"/> + <unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/> + <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/> + <unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/> + <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.16"/> + <unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/> + <unit id="org.apache.log4j.source" version="1.2.24.v20221221-2012"/> + <unit id="org.eclipse.orbit.maven.lucene.feature.group" version="4.29.0.v20230703-0758"/> + <unit id="org.hamcrest" version="2.2.0"/> + <unit id="org.hamcrest.source" version="2.2.0"/> + <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.core.source" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.library.source" version="1.3.0.v20230809-1000"/> + <unit id="org.junit" version="4.13.2.v20230809-1000"/> + <unit id="org.junit.source" version="4.13.2.v20230809-1000"/> + <unit id="org.objenesis" version="3.3.0"/> + <unit id="org.objenesis.source" version="3.3.0"/> + <unit id="org.objectweb.asm" version="9.5.0"/> + <unit id="org.objectweb.asm.source" version="9.5.0"/> + <unit id="org.objectweb.asm.tree" version="9.5.0"/> + <unit id="org.objectweb.asm.tree.source" version="9.5.0"/> + <unit id="org.objectweb.asm.tree.analysis" version="9.5.0"/> + <unit id="org.objectweb.asm.tree.analysis.source" version="9.5.0"/> + <unit id="org.objectweb.asm.util" version="9.5.0"/> + <unit id="org.objectweb.asm.util.source" version="9.5.0"/> + <unit id="org.osgi.service.cm" version="1.6.1.202109301733"/> + <unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/> + <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="org.apache.commons.jxpath" version="0.0.0"/> + <unit id="org.eclipse.sdk.ide" version="0.0.0"/> + <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.equinox.p2.director" version="0.0.0"/> + <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.e4.tools.emf.ui" version="0.0.0"/> + <unit id="org.eclipse.e4.tools.services" version="0.0.0"/> + <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/> + <unit id="org.eclipse.e4.ui.workbench" version="0.0.0"/> + <unit id="org.sat4j.core" version="0.0.0"/> + <unit id="org.sat4j.pb" version="0.0.0"/> + <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/> + <repository location="https://download.eclipse.org/releases/2023-03"/> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="osgi"> + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.annotation.bundle</artifactId> + <version>2.0.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.annotation.versioning</artifactId> + <version>1.1.2</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.component.annotations</artifactId> + <version>1.5.1</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.metatype.annotations</artifactId> + <version>1.4.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="xz"> + <dependencies> + <dependency> + <groupId>org.tukaani</groupId> + <artifactId>xz</artifactId> + <version>1.9</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j"> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="sshd"> + <dependencies> + <dependency> + <groupId>org.apache.sshd</groupId> + <artifactId>sshd-osgi</artifactId> + <version>2.11.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.sshd</groupId> + <artifactId>sshd-sftp</artifactId> + <version>2.11.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.7.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> + <dependencies> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <version>5.13.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna-platform</artifactId> + <version>5.13.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>4.0.4</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="javaewah"> + <dependencies> + <dependency> + <groupId>com.googlecode.javaewah</groupId> + <artifactId>JavaEWAH</artifactId> + <version>1.2.3</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="gson"> + <dependencies> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.10.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> + <dependencies> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy</artifactId> + <version>1.14.9</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy-agent</artifactId> + <version>1.14.9</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle"> + <dependencies> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpg-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcutil-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="assertj"> + <dependencies> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>3.24.2</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="args4j"> + <dependencies> + <dependency> + <groupId>args4j</groupId> + <artifactId>args4j</artifactId> + <version>2.33</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache"> + <dependencies> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.16.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + <version>1.25.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.15.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + </locations> +</target> diff --git a/org.eclipse.egit.target/egit-4.27.tpd b/org.eclipse.egit.target/egit-4.27.tpd new file mode 100644 index 0000000000..434ad384fe --- /dev/null +++ b/org.eclipse.egit.target/egit-4.27.tpd @@ -0,0 +1,7 @@ +target "egit-4.27" with source configurePhase + +include "projects/license.tpd" +include "projects/swtbot-snapshot.tpd" +include "orbit/orbit-4.29.tpd" +include "maven/dependencies.tpd" +include "releasetrain/4.27-2023-03.tpd" diff --git a/org.eclipse.egit.target/egit-4.28.target b/org.eclipse.egit.target/egit-4.28.target new file mode 100644 index 0000000000..0dbed74ef8 --- /dev/null +++ b/org.eclipse.egit.target/egit-4.28.target @@ -0,0 +1,343 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde?> +<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> +<target name="egit-4.28" sequenceNumber="1700179938"> + <locations> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="org.eclipse.license.feature.group" version="0.0.0"/> + <repository id="eclipse-public-license" location="https://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> + <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> + <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/> + <repository id="swtbot-snapshot" location="https://download.eclipse.org/technology/swtbot/snapshots/"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> + <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> + <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> + <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> + <unit id="jakarta.activation-api" version="1.2.2"/> + <unit id="jakarta.activation-api.source" version="1.2.2"/> + <unit id="jakarta.annotation-api" version="1.3.5"/> + <unit id="jakarta.annotation-api.source" version="1.3.5"/> + <unit id="jakarta.xml.bind-api" version="2.3.3"/> + <unit id="jakarta.xml.bind-api.source" version="2.3.3"/> + <unit id="jakarta.activation" version="2.0.0.v20221203-1659"/> + <unit id="jakarta.activation.source" version="2.0.0.v20221203-1659"/> + <unit id="jakarta.inject.jakarta.inject-api" version="1.0.5"/> + <unit id="jakarta.inject.jakarta.inject-api.source" version="1.0.5"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> + <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> + <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> + <unit id="org.apache.commons.commons-io" version="2.13.0"/> + <unit id="org.apache.commons.commons-io.source" version="2.13.0"/> + <unit id="org.apache.commons.logging" version="1.2.0"/> + <unit id="org.apache.commons.logging.source" version="1.2.0"/> + <unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/> + <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/> + <unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/> + <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.16"/> + <unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/> + <unit id="org.apache.log4j.source" version="1.2.24.v20221221-2012"/> + <unit id="org.eclipse.orbit.maven.lucene.feature.group" version="4.29.0.v20230703-0758"/> + <unit id="org.hamcrest" version="2.2.0"/> + <unit id="org.hamcrest.source" version="2.2.0"/> + <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.core.source" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.library.source" version="1.3.0.v20230809-1000"/> + <unit id="org.junit" version="4.13.2.v20230809-1000"/> + <unit id="org.junit.source" version="4.13.2.v20230809-1000"/> + <unit id="org.objenesis" version="3.3.0"/> + <unit id="org.objenesis.source" version="3.3.0"/> + <unit id="org.objectweb.asm" version="9.5.0"/> + <unit id="org.objectweb.asm.source" version="9.5.0"/> + <unit id="org.objectweb.asm.tree" version="9.5.0"/> + <unit id="org.objectweb.asm.tree.source" version="9.5.0"/> + <unit id="org.objectweb.asm.tree.analysis" version="9.5.0"/> + <unit id="org.objectweb.asm.tree.analysis.source" version="9.5.0"/> + <unit id="org.objectweb.asm.util" version="9.5.0"/> + <unit id="org.objectweb.asm.util.source" version="9.5.0"/> + <unit id="org.osgi.service.cm" version="1.6.1.202109301733"/> + <unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/> + <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="biz.aQute.bnd.util" version="0.0.0"/> + <unit id="biz.aQute.bndlib" version="0.0.0"/> + <unit id="org.apache.commons.jxpath" version="0.0.0"/> + <unit id="org.eclipse.sdk.ide" version="0.0.0"/> + <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.equinox.p2.director" version="0.0.0"/> + <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.e4.tools.emf.ui" version="0.0.0"/> + <unit id="org.eclipse.e4.tools.services" version="0.0.0"/> + <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/> + <unit id="org.eclipse.e4.ui.workbench" version="0.0.0"/> + <unit id="org.osgi.service.repository" version="0.0.0"/> + <unit id="org.sat4j.core" version="0.0.0"/> + <unit id="org.sat4j.pb" version="0.0.0"/> + <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/> + <repository location="https://download.eclipse.org/releases/2023-06"/> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="osgi"> + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.annotation.bundle</artifactId> + <version>2.0.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.annotation.versioning</artifactId> + <version>1.1.2</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.component.annotations</artifactId> + <version>1.5.1</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.metatype.annotations</artifactId> + <version>1.4.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="xz"> + <dependencies> + <dependency> + <groupId>org.tukaani</groupId> + <artifactId>xz</artifactId> + <version>1.9</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j"> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="sshd"> + <dependencies> + <dependency> + <groupId>org.apache.sshd</groupId> + <artifactId>sshd-osgi</artifactId> + <version>2.11.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.sshd</groupId> + <artifactId>sshd-sftp</artifactId> + <version>2.11.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.7.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> + <dependencies> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <version>5.13.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna-platform</artifactId> + <version>5.13.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>4.0.4</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="javaewah"> + <dependencies> + <dependency> + <groupId>com.googlecode.javaewah</groupId> + <artifactId>JavaEWAH</artifactId> + <version>1.2.3</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="gson"> + <dependencies> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.10.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> + <dependencies> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy</artifactId> + <version>1.14.9</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy-agent</artifactId> + <version>1.14.9</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle"> + <dependencies> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpg-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcutil-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="assertj"> + <dependencies> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>3.24.2</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="args4j"> + <dependencies> + <dependency> + <groupId>args4j</groupId> + <artifactId>args4j</artifactId> + <version>2.33</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache"> + <dependencies> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.16.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + <version>1.25.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.15.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + </locations> +</target> diff --git a/org.eclipse.egit.target/egit-4.28.tpd b/org.eclipse.egit.target/egit-4.28.tpd new file mode 100644 index 0000000000..4d7c5d1d2c --- /dev/null +++ b/org.eclipse.egit.target/egit-4.28.tpd @@ -0,0 +1,7 @@ +target "egit-4.28" with source configurePhase + +include "projects/license.tpd" +include "projects/swtbot-snapshot.tpd" +include "orbit/orbit-4.29.tpd" +include "maven/dependencies.tpd" +include "releasetrain/4.28-2023-06.tpd" diff --git a/org.eclipse.egit.target/egit-4.29.target b/org.eclipse.egit.target/egit-4.29.target new file mode 100644 index 0000000000..28f2a30c38 --- /dev/null +++ b/org.eclipse.egit.target/egit-4.29.target @@ -0,0 +1,343 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde?> +<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> +<target name="egit-4.29" sequenceNumber="1700179938"> + <locations> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="org.eclipse.license.feature.group" version="0.0.0"/> + <repository id="eclipse-public-license" location="https://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> + <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> + <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/> + <repository id="swtbot-snapshot" location="https://download.eclipse.org/technology/swtbot/snapshots/"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/> + <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/> + <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/> + <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/> + <unit id="jakarta.activation-api" version="1.2.2"/> + <unit id="jakarta.activation-api.source" version="1.2.2"/> + <unit id="jakarta.annotation-api" version="1.3.5"/> + <unit id="jakarta.annotation-api.source" version="1.3.5"/> + <unit id="jakarta.xml.bind-api" version="2.3.3"/> + <unit id="jakarta.xml.bind-api.source" version="2.3.3"/> + <unit id="jakarta.activation" version="2.0.0.v20221203-1659"/> + <unit id="jakarta.activation.source" version="2.0.0.v20221203-1659"/> + <unit id="jakarta.inject.jakarta.inject-api" version="1.0.5"/> + <unit id="jakarta.inject.jakarta.inject-api.source" version="1.0.5"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/> + <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/> + <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/> + <unit id="org.apache.commons.commons-io" version="2.13.0"/> + <unit id="org.apache.commons.commons-io.source" version="2.13.0"/> + <unit id="org.apache.commons.logging" version="1.2.0"/> + <unit id="org.apache.commons.logging.source" version="1.2.0"/> + <unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/> + <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/> + <unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/> + <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.16"/> + <unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/> + <unit id="org.apache.log4j.source" version="1.2.24.v20221221-2012"/> + <unit id="org.eclipse.orbit.maven.lucene.feature.group" version="4.29.0.v20230703-0758"/> + <unit id="org.hamcrest" version="2.2.0"/> + <unit id="org.hamcrest.source" version="2.2.0"/> + <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.core.source" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.library.source" version="1.3.0.v20230809-1000"/> + <unit id="org.junit" version="4.13.2.v20230809-1000"/> + <unit id="org.junit.source" version="4.13.2.v20230809-1000"/> + <unit id="org.objenesis" version="3.3.0"/> + <unit id="org.objenesis.source" version="3.3.0"/> + <unit id="org.objectweb.asm" version="9.5.0"/> + <unit id="org.objectweb.asm.source" version="9.5.0"/> + <unit id="org.objectweb.asm.tree" version="9.5.0"/> + <unit id="org.objectweb.asm.tree.source" version="9.5.0"/> + <unit id="org.objectweb.asm.tree.analysis" version="9.5.0"/> + <unit id="org.objectweb.asm.tree.analysis.source" version="9.5.0"/> + <unit id="org.objectweb.asm.util" version="9.5.0"/> + <unit id="org.objectweb.asm.util.source" version="9.5.0"/> + <unit id="org.osgi.service.cm" version="1.6.1.202109301733"/> + <unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/> + <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="biz.aQute.bnd.util" version="0.0.0"/> + <unit id="biz.aQute.bndlib" version="0.0.0"/> + <unit id="org.apache.commons.jxpath" version="0.0.0"/> + <unit id="org.eclipse.sdk.ide" version="0.0.0"/> + <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.equinox.p2.director" version="0.0.0"/> + <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.e4.tools.emf.ui" version="0.0.0"/> + <unit id="org.eclipse.e4.tools.services" version="0.0.0"/> + <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/> + <unit id="org.eclipse.e4.ui.workbench" version="0.0.0"/> + <unit id="org.osgi.service.repository" version="0.0.0"/> + <unit id="org.sat4j.core" version="0.0.0"/> + <unit id="org.sat4j.pb" version="0.0.0"/> + <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/> + <repository location="https://download.eclipse.org/releases/2023-09"/> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="osgi"> + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.annotation.bundle</artifactId> + <version>2.0.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.annotation.versioning</artifactId> + <version>1.1.2</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.component.annotations</artifactId> + <version>1.5.1</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.metatype.annotations</artifactId> + <version>1.4.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="xz"> + <dependencies> + <dependency> + <groupId>org.tukaani</groupId> + <artifactId>xz</artifactId> + <version>1.9</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j"> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="sshd"> + <dependencies> + <dependency> + <groupId>org.apache.sshd</groupId> + <artifactId>sshd-osgi</artifactId> + <version>2.11.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.sshd</groupId> + <artifactId>sshd-sftp</artifactId> + <version>2.11.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.7.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> + <dependencies> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <version>5.13.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna-platform</artifactId> + <version>5.13.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>4.0.4</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="javaewah"> + <dependencies> + <dependency> + <groupId>com.googlecode.javaewah</groupId> + <artifactId>JavaEWAH</artifactId> + <version>1.2.3</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="gson"> + <dependencies> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.10.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> + <dependencies> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy</artifactId> + <version>1.14.9</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy-agent</artifactId> + <version>1.14.9</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle"> + <dependencies> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpg-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcutil-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="assertj"> + <dependencies> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>3.24.2</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="args4j"> + <dependencies> + <dependency> + <groupId>args4j</groupId> + <artifactId>args4j</artifactId> + <version>2.33</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache"> + <dependencies> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.16.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + <version>1.25.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.15.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + </locations> +</target> diff --git a/org.eclipse.egit.target/egit-4.29.tpd b/org.eclipse.egit.target/egit-4.29.tpd new file mode 100644 index 0000000000..cace3d0094 --- /dev/null +++ b/org.eclipse.egit.target/egit-4.29.tpd @@ -0,0 +1,7 @@ +target "egit-4.29" with source configurePhase + +include "projects/license.tpd" +include "projects/swtbot-snapshot.tpd" +include "orbit/orbit-4.29.tpd" +include "maven/dependencies.tpd" +include "releasetrain/4.29-2023-09.tpd" diff --git a/org.eclipse.egit.target/egit-4.30.target b/org.eclipse.egit.target/egit-4.30.target new file mode 100644 index 0000000000..896e0b1c18 --- /dev/null +++ b/org.eclipse.egit.target/egit-4.30.target @@ -0,0 +1,341 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde?> +<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> +<target name="egit-4.30" sequenceNumber="1700179938"> + <locations> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="org.eclipse.license.feature.group" version="0.0.0"/> + <repository id="eclipse-public-license" location="https://download.eclipse.org/cbi/updates/license/2.0.2.v20181016-2210"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/> + <unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/> + <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/> + <repository id="swtbot-snapshot" location="https://download.eclipse.org/technology/swtbot/snapshots/"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/> + <unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/> + <unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/> + <unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/> + <unit id="jakarta.activation-api" version="2.1.2"/> + <unit id="jakarta.activation-api.source" version="2.1.2"/> + <unit id="jakarta.annotation-api" version="1.3.5"/> + <unit id="jakarta.annotation-api.source" version="1.3.5"/> + <unit id="jakarta.xml.bind-api" version="2.3.3"/> + <unit id="jakarta.xml.bind-api.source" version="2.3.3"/> + <unit id="jakarta.inject.jakarta.inject-api" version="1.0.5"/> + <unit id="jakarta.inject.jakarta.inject-api.source" version="1.0.5"/> + <unit id="net.i2p.crypto.eddsa" version="0.3.0"/> + <unit id="net.i2p.crypto.eddsa.source" version="0.3.0"/> + <unit id="org.apache.ant" version="1.10.14.v20230922-1200"/> + <unit id="org.apache.ant.source" version="1.10.14.v20230922-1200"/> + <unit id="org.apache.commons.logging" version="1.2.0"/> + <unit id="org.apache.commons.logging.source" version="1.2.0"/> + <unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/> + <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/> + <unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/> + <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.16"/> + <unit id="org.eclipse.jetty.servlet-api" version="4.0.6"/> + <unit id="org.eclipse.orbit.maven.lucene.feature.group" version="4.30.0.v20230929-1030"/> + <unit id="org.eclipse.orbit.xml-apis-ext" version="1.0.0.v20230923-0644"/> + <unit id="org.hamcrest" version="2.2.0"/> + <unit id="org.hamcrest.source" version="2.2.0"/> + <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.core.source" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/> + <unit id="org.hamcrest.library.source" version="1.3.0.v20230809-1000"/> + <unit id="org.junit" version="4.13.2.v20230809-1000"/> + <unit id="org.junit.source" version="4.13.2.v20230809-1000"/> + <unit id="org.mortbay.jasper.apache-jsp" version="9.0.52"/> + <unit id="org.objenesis" version="3.3.0"/> + <unit id="org.objenesis.source" version="3.3.0"/> + <unit id="org.objectweb.asm" version="9.6.0"/> + <unit id="org.objectweb.asm.source" version="9.6.0"/> + <unit id="org.objectweb.asm.tree" version="9.6.0"/> + <unit id="org.objectweb.asm.tree.source" version="9.6.0"/> + <unit id="org.objectweb.asm.tree.analysis" version="9.6.0"/> + <unit id="org.objectweb.asm.tree.analysis.source" version="9.6.0"/> + <unit id="org.objectweb.asm.util" version="9.6.0"/> + <unit id="org.objectweb.asm.util.source" version="9.6.0"/> + <unit id="org.osgi.service.cm" version="1.6.1.202109301733"/> + <unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/> + <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest"/> + </location> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="biz.aQute.bnd.util" version="0.0.0"/> + <unit id="biz.aQute.bndlib" version="0.0.0"/> + <unit id="org.apache.commons.jxpath" version="0.0.0"/> + <unit id="org.eclipse.sdk.ide" version="0.0.0"/> + <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.equinox.p2.director" version="0.0.0"/> + <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.e4.tools.emf.ui" version="0.0.0"/> + <unit id="org.eclipse.e4.tools.services" version="0.0.0"/> + <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/> + <unit id="org.eclipse.e4.ui.workbench" version="0.0.0"/> + <unit id="org.eclipse.search.core" version="0.0.0"/> + <unit id="org.osgi.service.repository" version="0.0.0"/> + <unit id="org.sat4j.core" version="0.0.0"/> + <unit id="org.sat4j.pb" version="0.0.0"/> + <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/> + <repository location="https://download.eclipse.org/staging/2023-12"/> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="osgi"> + <dependencies> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.annotation.bundle</artifactId> + <version>2.0.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.annotation.versioning</artifactId> + <version>1.1.2</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.component.annotations</artifactId> + <version>1.5.1</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.service.metatype.annotations</artifactId> + <version>1.4.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="xz"> + <dependencies> + <dependency> + <groupId>org.tukaani</groupId> + <artifactId>xz</artifactId> + <version>1.9</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j"> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.36</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="sshd"> + <dependencies> + <dependency> + <groupId>org.apache.sshd</groupId> + <artifactId>sshd-osgi</artifactId> + <version>2.11.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.sshd</groupId> + <artifactId>sshd-sftp</artifactId> + <version>2.11.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito"> + <dependencies> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>5.7.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna"> + <dependencies> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <version>5.13.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna-platform</artifactId> + <version>5.13.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty"> + <dependencies> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-http</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-servlet</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util-ajax</artifactId> + <version>10.0.18</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>jakarta.servlet</groupId> + <artifactId>jakarta.servlet-api</artifactId> + <version>4.0.4</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="javaewah"> + <dependencies> + <dependency> + <groupId>com.googlecode.javaewah</groupId> + <artifactId>JavaEWAH</artifactId> + <version>1.2.3</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="gson"> + <dependencies> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>2.10.1</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy"> + <dependencies> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy</artifactId> + <version>1.14.9</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy-agent</artifactId> + <version>1.14.9</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle"> + <dependencies> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpg-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcpkix-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcutil-jdk18on</artifactId> + <version>1.77</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="assertj"> + <dependencies> + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + <version>3.24.2</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="args4j"> + <dependencies> + <dependency> + <groupId>args4j</groupId> + <artifactId>args4j</artifactId> + <version>2.33</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache"> + <dependencies> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.16.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + <version>1.25.0</version> + <type>jar</type> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.15.0</version> + <type>jar</type> + </dependency> + </dependencies> + </location> + </locations> +</target> diff --git a/org.eclipse.egit.target/egit-4.30.tpd b/org.eclipse.egit.target/egit-4.30.tpd new file mode 100644 index 0000000000..e699ada05a --- /dev/null +++ b/org.eclipse.egit.target/egit-4.30.tpd @@ -0,0 +1,7 @@ +target "egit-4.30" with source configurePhase + +include "projects/license.tpd" +include "projects/swtbot-snapshot.tpd" +include "orbit/orbit-4.30.tpd" +include "maven/dependencies.tpd" +include "releasetrain/4.30-2023-12.tpd" diff --git a/org.eclipse.egit.target/maven/dependencies.tpd b/org.eclipse.egit.target/maven/dependencies.tpd new file mode 100644 index 0000000000..7d4556d7ed --- /dev/null +++ b/org.eclipse.egit.target/maven/dependencies.tpd @@ -0,0 +1,279 @@ +target "dependencies" + +maven apache + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "commons-codec" + artifactId = "commons-codec" + version = "1.16.0" + } + dependency { + groupId = "org.apache.commons" + artifactId = "commons-compress" + version = "1.25.0" + } + dependency { + groupId = "commons-io" + artifactId = "commons-io" + version = "2.15.0" + } +} + +maven args4j + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "args4j" + artifactId = "args4j" + version = "2.33" + } +} + +maven assertj + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "org.assertj" + artifactId = "assertj-core" + version = "3.24.2" + } +} + +maven bouncycastle + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "org.bouncycastle" + artifactId = "bcpg-jdk18on" + version = "1.77" + } + dependency { + groupId = "org.bouncycastle" + artifactId = "bcprov-jdk18on" + version = "1.77" + } + dependency { + groupId = "org.bouncycastle" + artifactId = "bcpkix-jdk18on" + version = "1.77" + } + dependency { + groupId = "org.bouncycastle" + artifactId = "bcutil-jdk18on" + version = "1.77" + } +} + +maven bytebuddy + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "net.bytebuddy" + artifactId = "byte-buddy" + version = "1.14.9" + } + dependency { + groupId = "net.bytebuddy" + artifactId = "byte-buddy-agent" + version = "1.14.9" + } +} + +maven gson + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "com.google.code.gson" + artifactId = "gson" + version = "2.10.1" + } +} + +maven javaewah + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "com.googlecode.javaewah" + artifactId = "JavaEWAH" + version = "1.2.3" + } +} + +maven jetty + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "org.eclipse.jetty" + artifactId = "jetty-http" + version = "10.0.18" + } + dependency { + groupId = "org.eclipse.jetty" + artifactId = "jetty-io" + version = "10.0.18" + } + dependency { + groupId = "org.eclipse.jetty" + artifactId = "jetty-security" + version = "10.0.18" + } + dependency { + groupId = "org.eclipse.jetty" + artifactId = "jetty-server" + version = "10.0.18" + } + dependency { + groupId = "org.eclipse.jetty" + artifactId = "jetty-servlet" + version = "10.0.18" + } + dependency { + groupId = "org.eclipse.jetty" + artifactId = "jetty-util" + version = "10.0.18" + } + dependency { + groupId = "org.eclipse.jetty" + artifactId = "jetty-util-ajax" + version = "10.0.18" + } + dependency { + groupId = "jakarta.servlet" + artifactId = "jakarta.servlet-api" + version = "4.0.4" + } +} + +maven jna + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "net.java.dev.jna" + artifactId = "jna" + version = "5.13.0" + } + dependency { + groupId = "net.java.dev.jna" + artifactId = "jna-platform" + version = "5.13.0" + } +} + +maven mockito + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "org.mockito" + artifactId = "mockito-core" + version = "5.7.0" + } +} + +maven sshd + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "org.apache.sshd" + artifactId = "sshd-osgi" + version = "2.11.0" + } + dependency { + groupId = "org.apache.sshd" + artifactId = "sshd-sftp" + version = "2.11.0" + } +} + +maven slf4j + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "org.slf4j" + artifactId = "slf4j-api" + version = "1.7.36" + } + dependency { + groupId = "org.slf4j" + artifactId = "slf4j-simple" + version = "1.7.36" + } +} + +maven xz + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId = "org.tukaani" + artifactId = "xz" + version = "1.9" + } +} + +// Needed by PDE, which we include when running the UI tests +maven osgi + scope = compile + dependencyDepth = none + missingManifest = error + includeSources +{ + dependency { + groupId ="org.osgi" + artifactId="org.osgi.annotation.bundle" + version="2.0.0" + } + dependency { + groupId ="org.osgi" + artifactId="org.osgi.annotation.versioning" + version="1.1.2" + } + dependency { + groupId ="org.osgi" + artifactId="org.osgi.service.component.annotations" + version="1.5.1" + } + dependency { + groupId ="org.osgi" + artifactId="org.osgi.service.metatype.annotations" + version="1.4.1" + } +}
\ No newline at end of file diff --git a/org.eclipse.egit.target/orbit/R20210825222808-2021-09.tpd b/org.eclipse.egit.target/orbit/R20210825222808-2021-09.tpd deleted file mode 100644 index 29f80fd871..0000000000 --- a/org.eclipse.egit.target/orbit/R20210825222808-2021-09.tpd +++ /dev/null @@ -1,86 +0,0 @@ -target "R20210825222808-2021-09" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository" { - com.google.gson [2.8.7.v20210624-1215,2.8.7.v20210624-1215] - com.google.gson.source [2.8.7.v20210624-1215,2.8.7.v20210624-1215] - com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902] - com.jcraft.jsch.source [0.1.55.v20190404-1902,0.1.55.v20190404-1902] - com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305] - com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305] - com.sun.jna [5.8.0.v20210503-0343,5.8.0.v20210503-0343] - com.sun.jna.source [5.8.0.v20210503-0343,5.8.0.v20210503-0343] - com.sun.jna.platform [5.8.0.v20210406-1004,5.8.0.v20210406-1004] - com.sun.jna.platform.source [5.8.0.v20210406-1004,5.8.0.v20210406-1004] - javaewah [1.1.12.v20210622-2206,1.1.12.v20210622-2206] - javaewah.source [1.1.12.v20210622-2206,1.1.12.v20210622-2206] - javax.activation [1.1.0.v201211130549,1.1.0.v201211130549] - javax.activation.source [1.1.0.v201211130549,1.1.0.v201211130549] - javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800] - javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800] - javax.xml.bind [2.2.0.v201105210648,2.2.0.v201105210648] - javax.xml.bind.source [2.2.0.v201105210648,2.2.0.v201105210648] - javax.xml.stream [1.0.1.v201004272200,1.0.1.v201004272200] - net.bytebuddy.byte-buddy [1.9.0.v20181107-1410,1.9.0.v20181107-1410] - net.bytebuddy.byte-buddy-agent [1.9.0.v20181106-1534,1.9.0.v20181106-1534] - net.bytebuddy.byte-buddy-agent.source [1.9.0.v20181106-1534,1.9.0.v20181106-1534] - net.bytebuddy.byte-buddy.source [1.9.0.v20181107-1410,1.9.0.v20181107-1410] - net.i2p.crypto.eddsa [0.3.0.v20181102-1323,0.3.0.v20181102-1323] - net.i2p.crypto.eddsa.source [0.3.0.v20181102-1323,0.3.0.v20181102-1323] - org.apache.ant [1.10.11.v20210720-1445,1.10.11.v20210720-1445] - org.apache.ant.source [1.10.11.v20210720-1445,1.10.11.v20210720-1445] - org.apache.commons.codec [1.14.0.v20200818-1422,1.14.0.v20200818-1422] - org.apache.commons.codec.source [1.14.0.v20200818-1422,1.14.0.v20200818-1422] - org.apache.commons.compress [1.20.0.v20210713-1928,1.20.0.v20210713-1928] - org.apache.commons.compress.source [1.20.0.v20210713-1928,1.20.0.v20210713-1928] - org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502] - org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502] - org.apache.httpcomponents.httpclient [4.5.13.v20210128-2225,4.5.13.v20210128-2225] - org.apache.httpcomponents.httpclient.source [4.5.13.v20210128-2225,4.5.13.v20210128-2225] - org.apache.httpcomponents.httpcore [4.4.14.v20210128-2225,4.4.14.v20210128-2225] - org.apache.httpcomponents.httpcore.source [4.4.14.v20210128-2225,4.4.14.v20210128-2225] - org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.sshd.osgi [2.7.0.v20210623-0618,2.7.0.v20210623-0618] - org.apache.sshd.osgi.source [2.7.0.v20210623-0618,2.7.0.v20210623-0618] - org.apache.sshd.sftp [2.7.0.v20210623-0618,2.7.0.v20210623-0618] - org.apache.sshd.sftp.source [2.7.0.v20210623-0618,2.7.0.v20210623-0618] - org.bouncycastle.bcpg [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcpg.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcpkix [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcpkix.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcprov [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcprov.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcutil [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcutil.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.junit [4.13.0.v20200204-1500,4.13.0.v20200204-1500] - org.junit.source [4.13.0.v20200204-1500,4.13.0.v20200204-1500] - org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218] - org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218] - org.mockito [2.23.0.v20200310-1642,2.23.0.v20200310-1642] - org.mockito.source [2.23.0.v20200310-1642,2.23.0.v20200310-1642] - org.objenesis [2.6.0.v20180420-1519,2.6.0.v20180420-1519] - org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519] - org.slf4j.api [1.7.30.v20200204-2150,1.7.30.v20200204-2150] - org.slf4j.api.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150] - org.slf4j.binding.log4j12 [1.7.30.v20201108-2042,1.7.30.v20201108-2042] - org.slf4j.binding.log4j12.source [1.7.30.v20201108-2042,1.7.30.v20201108-2042] - org.tukaani.xz [1.9.0.v20210624-1259,1.9.0.v20210624-1259] - org.tukaani.xz.source [1.9.0.v20210624-1259,1.9.0.v20210624-1259] -} - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" { - org.assertj [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.assertj.source [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000] - org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519] - org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519] - org.hamcrest.generator [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.generator.source [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.integration [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.integration.source [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246] - org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246] - org.hamcrest.text [1.1.0.v20090501071000,1.1.0.v20090501071000] - org.hamcrest.text.source [1.1.0.v20090501071000,1.1.0.v20090501071000] -} diff --git a/org.eclipse.egit.target/orbit/R20211122181901-2021-12.tpd b/org.eclipse.egit.target/orbit/R20211122181901-2021-12.tpd deleted file mode 100644 index 554df34320..0000000000 --- a/org.eclipse.egit.target/orbit/R20211122181901-2021-12.tpd +++ /dev/null @@ -1,84 +0,0 @@ -target "R20211122181901-2021-12" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20211122181901/repository" { - com.google.gson [2.8.8.v20211029-0838,2.8.8.v20211029-0838] - com.google.gson.source [2.8.8.v20211029-0838,2.8.8.v20211029-0838] - com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902] - com.jcraft.jsch.source [0.1.55.v20190404-1902,0.1.55.v20190404-1902] - com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305] - com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305] - com.sun.jna [5.8.0.v20210503-0343,5.8.0.v20210503-0343] - com.sun.jna.source [5.8.0.v20210503-0343,5.8.0.v20210503-0343] - com.sun.jna.platform [5.8.0.v20210406-1004,5.8.0.v20210406-1004] - com.sun.jna.platform.source [5.8.0.v20210406-1004,5.8.0.v20210406-1004] - javaewah [1.1.13.v20211029-0839,1.1.13.v20211029-0839] - javaewah.source [1.1.13.v20211029-0839,1.1.13.v20211029-0839] - javax.activation [1.1.0.v201211130549,1.1.0.v201211130549] - javax.activation.source [1.1.0.v201211130549,1.1.0.v201211130549] - javax.xml.bind [2.2.0.v201105210648,2.2.0.v201105210648] - javax.xml.bind.source [2.2.0.v201105210648,2.2.0.v201105210648] - javax.xml.stream [1.0.1.v201004272200,1.0.1.v201004272200] - net.bytebuddy.byte-buddy [1.9.0.v20181107-1410,1.9.0.v20181107-1410] - net.bytebuddy.byte-buddy-agent [1.9.0.v20181106-1534,1.9.0.v20181106-1534] - net.bytebuddy.byte-buddy-agent.source [1.9.0.v20181106-1534,1.9.0.v20181106-1534] - net.bytebuddy.byte-buddy.source [1.9.0.v20181107-1410,1.9.0.v20181107-1410] - net.i2p.crypto.eddsa [0.3.0.v20210923-1401,0.3.0.v20210923-1401] - net.i2p.crypto.eddsa.source [0.3.0.v20210923-1401,0.3.0.v20210923-1401] - org.apache.ant [1.10.12.v20211102-1452,1.10.12.v20211102-1452] - org.apache.ant.source [1.10.12.v20211102-1452,1.10.12.v20211102-1452] - org.apache.commons.codec [1.14.0.v20200818-1422,1.14.0.v20200818-1422] - org.apache.commons.codec.source [1.14.0.v20200818-1422,1.14.0.v20200818-1422] - org.apache.commons.compress [1.21.0.v20211103-2100,1.21.0.v20211103-2100] - org.apache.commons.compress.source [1.21.0.v20211103-2100,1.21.0.v20211103-2100] - org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502] - org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502] - org.apache.httpcomponents.httpclient [4.5.13.v20210128-2225,4.5.13.v20210128-2225] - org.apache.httpcomponents.httpclient.source [4.5.13.v20210128-2225,4.5.13.v20210128-2225] - org.apache.httpcomponents.httpcore [4.4.14.v20210128-2225,4.4.14.v20210128-2225] - org.apache.httpcomponents.httpcore.source [4.4.14.v20210128-2225,4.4.14.v20210128-2225] - org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.sshd.osgi [2.7.0.v20210623-0618,2.7.0.v20210623-0618] - org.apache.sshd.osgi.source [2.7.0.v20210623-0618,2.7.0.v20210623-0618] - org.apache.sshd.sftp [2.7.0.v20210623-0618,2.7.0.v20210623-0618] - org.apache.sshd.sftp.source [2.7.0.v20210623-0618,2.7.0.v20210623-0618] - org.bouncycastle.bcpg [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcpg.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcpkix [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcpkix.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcprov [1.69.0.v20210923-1401,1.69.0.v20210923-1401] - org.bouncycastle.bcprov.source [1.69.0.v20210923-1401,1.69.0.v20210923-1401] - org.bouncycastle.bcutil [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcutil.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.junit [4.13.2.v20211018-1956,4.13.2.v20211018-1956] - org.junit.source [4.13.2.v20211018-1956,4.13.2.v20211018-1956] - org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218] - org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218] - org.mockito [2.23.0.v20200310-1642,2.23.0.v20200310-1642] - org.mockito.source [2.23.0.v20200310-1642,2.23.0.v20200310-1642] - org.objenesis [2.6.0.v20180420-1519,2.6.0.v20180420-1519] - org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519] - org.slf4j.api [1.7.30.v20200204-2150,1.7.30.v20200204-2150] - org.slf4j.api.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150] - org.slf4j.binding.log4j12 [1.7.30.v20201108-2042,1.7.30.v20201108-2042] - org.slf4j.binding.log4j12.source [1.7.30.v20201108-2042,1.7.30.v20201108-2042] - org.tukaani.xz [1.9.0.v20210624-1259,1.9.0.v20210624-1259] - org.tukaani.xz.source [1.9.0.v20210624-1259,1.9.0.v20210624-1259] -} - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" { - org.assertj [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.assertj.source [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000] - org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519] - org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519] - org.hamcrest.generator [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.generator.source [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.integration [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.integration.source [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246] - org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246] - org.hamcrest.text [1.1.0.v20090501071000,1.1.0.v20090501071000] - org.hamcrest.text.source [1.1.0.v20090501071000,1.1.0.v20090501071000] -} diff --git a/org.eclipse.egit.target/orbit/R20211213173813-2021-12.tpd b/org.eclipse.egit.target/orbit/R20211213173813-2021-12.tpd deleted file mode 100644 index 86ca2cd612..0000000000 --- a/org.eclipse.egit.target/orbit/R20211213173813-2021-12.tpd +++ /dev/null @@ -1,84 +0,0 @@ -target "R20211213173813-2021-12" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository" { - com.google.gson [2.8.8.v20211029-0838,2.8.8.v20211029-0838] - com.google.gson.source [2.8.8.v20211029-0838,2.8.8.v20211029-0838] - com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902] - com.jcraft.jsch.source [0.1.55.v20190404-1902,0.1.55.v20190404-1902] - com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305] - com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305] - com.sun.jna [5.8.0.v20210503-0343,5.8.0.v20210503-0343] - com.sun.jna.source [5.8.0.v20210503-0343,5.8.0.v20210503-0343] - com.sun.jna.platform [5.8.0.v20210406-1004,5.8.0.v20210406-1004] - com.sun.jna.platform.source [5.8.0.v20210406-1004,5.8.0.v20210406-1004] - javaewah [1.1.13.v20211029-0839,1.1.13.v20211029-0839] - javaewah.source [1.1.13.v20211029-0839,1.1.13.v20211029-0839] - javax.activation [1.1.0.v201211130549,1.1.0.v201211130549] - javax.activation.source [1.1.0.v201211130549,1.1.0.v201211130549] - javax.xml.bind [2.2.0.v201105210648,2.2.0.v201105210648] - javax.xml.bind.source [2.2.0.v201105210648,2.2.0.v201105210648] - javax.xml.stream [1.0.1.v201004272200,1.0.1.v201004272200] - net.bytebuddy.byte-buddy [1.9.0.v20181107-1410,1.9.0.v20181107-1410] - net.bytebuddy.byte-buddy-agent [1.9.0.v20181106-1534,1.9.0.v20181106-1534] - net.bytebuddy.byte-buddy-agent.source [1.9.0.v20181106-1534,1.9.0.v20181106-1534] - net.bytebuddy.byte-buddy.source [1.9.0.v20181107-1410,1.9.0.v20181107-1410] - net.i2p.crypto.eddsa [0.3.0.v20210923-1401,0.3.0.v20210923-1401] - net.i2p.crypto.eddsa.source [0.3.0.v20210923-1401,0.3.0.v20210923-1401] - org.apache.ant [1.10.12.v20211102-1452,1.10.12.v20211102-1452] - org.apache.ant.source [1.10.12.v20211102-1452,1.10.12.v20211102-1452] - org.apache.commons.codec [1.14.0.v20200818-1422,1.14.0.v20200818-1422] - org.apache.commons.codec.source [1.14.0.v20200818-1422,1.14.0.v20200818-1422] - org.apache.commons.compress [1.21.0.v20211103-2100,1.21.0.v20211103-2100] - org.apache.commons.compress.source [1.21.0.v20211103-2100,1.21.0.v20211103-2100] - org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502] - org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502] - org.apache.httpcomponents.httpclient [4.5.13.v20210128-2225,4.5.13.v20210128-2225] - org.apache.httpcomponents.httpclient.source [4.5.13.v20210128-2225,4.5.13.v20210128-2225] - org.apache.httpcomponents.httpcore [4.4.14.v20210128-2225,4.4.14.v20210128-2225] - org.apache.httpcomponents.httpcore.source [4.4.14.v20210128-2225,4.4.14.v20210128-2225] - org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.sshd.osgi [2.7.0.v20210623-0618,2.7.0.v20210623-0618] - org.apache.sshd.osgi.source [2.7.0.v20210623-0618,2.7.0.v20210623-0618] - org.apache.sshd.sftp [2.7.0.v20210623-0618,2.7.0.v20210623-0618] - org.apache.sshd.sftp.source [2.7.0.v20210623-0618,2.7.0.v20210623-0618] - org.bouncycastle.bcpg [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcpg.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcpkix [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcpkix.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcprov [1.69.0.v20210923-1401,1.69.0.v20210923-1401] - org.bouncycastle.bcprov.source [1.69.0.v20210923-1401,1.69.0.v20210923-1401] - org.bouncycastle.bcutil [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcutil.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - org.junit [4.13.2.v20211018-1956,4.13.2.v20211018-1956] - org.junit.source [4.13.2.v20211018-1956,4.13.2.v20211018-1956] - org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218] - org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218] - org.mockito [2.23.0.v20200310-1642,2.23.0.v20200310-1642] - org.mockito.source [2.23.0.v20200310-1642,2.23.0.v20200310-1642] - org.objenesis [2.6.0.v20180420-1519,2.6.0.v20180420-1519] - org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519] - org.slf4j.api [1.7.30.v20200204-2150,1.7.30.v20200204-2150] - org.slf4j.api.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150] - org.slf4j.binding.simple [1.7.30.v20200204-2150,1.7.30.v20200204-2150] - org.slf4j.binding.simple.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150] - org.tukaani.xz [1.9.0.v20210624-1259,1.9.0.v20210624-1259] - org.tukaani.xz.source [1.9.0.v20210624-1259,1.9.0.v20210624-1259] -} - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" { - org.assertj [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.assertj.source [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000] - org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519] - org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519] - org.hamcrest.generator [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.generator.source [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.integration [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.integration.source [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246] - org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246] - org.hamcrest.text [1.1.0.v20090501071000,1.1.0.v20090501071000] - org.hamcrest.text.source [1.1.0.v20090501071000,1.1.0.v20090501071000] -} diff --git a/org.eclipse.egit.target/orbit/R20220302172233-2022-03.tpd b/org.eclipse.egit.target/orbit/R20220302172233-2022-03.tpd deleted file mode 100644 index a64907de68..0000000000 --- a/org.eclipse.egit.target/orbit/R20220302172233-2022-03.tpd +++ /dev/null @@ -1,85 +0,0 @@ -target "R20220302172233" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -// when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository" { - com.google.gson [2.8.9.v20220111-1409,2.8.9.v20220111-1409] - com.google.gson.source [2.8.9.v20220111-1409,2.8.9.v20220111-1409] - com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902] - com.jcraft.jsch.source [0.1.55.v20190404-1902,0.1.55.v20190404-1902] - com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305] - com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305] - com.sun.jna [5.8.0.v20210503-0343,5.8.0.v20210503-0343] - com.sun.jna.source [5.8.0.v20210503-0343,5.8.0.v20210503-0343] - com.sun.jna.platform [5.8.0.v20210406-1004,5.8.0.v20210406-1004] - com.sun.jna.platform.source [5.8.0.v20210406-1004,5.8.0.v20210406-1004] - javaewah [1.1.13.v20211029-0839,1.1.13.v20211029-0839] - javaewah.source [1.1.13.v20211029-0839,1.1.13.v20211029-0839] - javax.activation [1.1.0.v201211130549,1.1.0.v201211130549] - javax.activation.source [1.1.0.v201211130549,1.1.0.v201211130549] - javax.xml.bind [2.2.0.v201105210648,2.2.0.v201105210648] - javax.xml.bind.source [2.2.0.v201105210648,2.2.0.v201105210648] - javax.xml.stream [1.0.1.v201004272200,1.0.1.v201004272200] - net.bytebuddy.byte-buddy [1.9.0.v20181107-1410,1.9.0.v20181107-1410] - net.bytebuddy.byte-buddy-agent [1.9.0.v20181106-1534,1.9.0.v20181106-1534] - net.bytebuddy.byte-buddy-agent.source [1.9.0.v20181106-1534,1.9.0.v20181106-1534] - net.bytebuddy.byte-buddy.source [1.9.0.v20181107-1410,1.9.0.v20181107-1410] - net.i2p.crypto.eddsa [0.3.0.v20210923-1401,0.3.0.v20210923-1401] - net.i2p.crypto.eddsa.source [0.3.0.v20210923-1401,0.3.0.v20210923-1401] - org.apache.ant [1.10.12.v20211102-1452,1.10.12.v20211102-1452] - org.apache.ant.source [1.10.12.v20211102-1452,1.10.12.v20211102-1452] - org.apache.commons.codec [1.14.0.v20200818-1422,1.14.0.v20200818-1422] - org.apache.commons.codec.source [1.14.0.v20200818-1422,1.14.0.v20200818-1422] - org.apache.commons.compress [1.21.0.v20211103-2100,1.21.0.v20211103-2100] - org.apache.commons.compress.source [1.21.0.v20211103-2100,1.21.0.v20211103-2100] - org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502] - org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502] - org.apache.httpcomponents.httpclient [4.5.13.v20210128-2225,4.5.13.v20210128-2225] - org.apache.httpcomponents.httpclient.source [4.5.13.v20210128-2225,4.5.13.v20210128-2225] - org.apache.httpcomponents.httpcore [4.4.15.v20220209-2345,4.4.15.v20220209-2345] - org.apache.httpcomponents.httpcore.source [4.4.15.v20220209-2345,4.4.15.v20220209-2345] - org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.sshd.osgi [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.osgi.source [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.sftp [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.sftp.source [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.bouncycastle.bcpg [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcpg.source [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcpkix [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcpkix.source [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcprov [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcprov.source [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcutil [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcutil.source [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.junit [4.13.2.v20211018-1956,4.13.2.v20211018-1956] - org.junit.source [4.13.2.v20211018-1956,4.13.2.v20211018-1956] - org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218] - org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218] - org.mockito [2.23.0.v20200310-1642,2.23.0.v20200310-1642] - org.mockito.source [2.23.0.v20200310-1642,2.23.0.v20200310-1642] - org.objenesis [2.6.0.v20180420-1519,2.6.0.v20180420-1519] - org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519] - org.slf4j.api [1.7.30.v20200204-2150,1.7.30.v20200204-2150] - org.slf4j.api.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150] - org.slf4j.binding.simple [1.7.30.v20200204-2150,1.7.30.v20200204-2150] - org.slf4j.binding.simple.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150] - org.tukaani.xz [1.9.0.v20210624-1259,1.9.0.v20210624-1259] - org.tukaani.xz.source [1.9.0.v20210624-1259,1.9.0.v20210624-1259] -} - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" { - org.assertj [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.assertj.source [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000] - org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519] - org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519] - org.hamcrest.generator [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.generator.source [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.integration [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.integration.source [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246] - org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246] - org.hamcrest.text [1.1.0.v20090501071000,1.1.0.v20090501071000] - org.hamcrest.text.source [1.1.0.v20090501071000,1.1.0.v20090501071000] -} diff --git a/org.eclipse.egit.target/orbit/R20220531185310-2022-06.tpd b/org.eclipse.egit.target/orbit/R20220531185310-2022-06.tpd deleted file mode 100644 index 662cef7bc5..0000000000 --- a/org.eclipse.egit.target/orbit/R20220531185310-2022-06.tpd +++ /dev/null @@ -1,84 +0,0 @@ -target "R20220531185310-2022-06" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -// when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository" { - com.google.gson [2.8.9.v20220111-1409,2.8.9.v20220111-1409] - com.google.gson.source [2.8.9.v20220111-1409,2.8.9.v20220111-1409] - com.jcraft.jsch [0.1.55.v20190404-1902,0.1.55.v20190404-1902] - com.jcraft.jsch.source [0.1.55.v20190404-1902,0.1.55.v20190404-1902] - com.jcraft.jzlib [1.1.3.v20220502-1820,1.1.3.v20220502-1820] - com.jcraft.jzlib.source [1.1.3.v20220502-1820,1.1.3.v20220502-1820] - com.sun.jna [5.8.0.v20210503-0343,5.8.0.v20210503-0343] - com.sun.jna.source [5.8.0.v20210503-0343,5.8.0.v20210503-0343] - com.sun.jna.platform [5.8.0.v20210406-1004,5.8.0.v20210406-1004] - com.sun.jna.platform.source [5.8.0.v20210406-1004,5.8.0.v20210406-1004] - javaewah [1.1.13.v20211029-0839,1.1.13.v20211029-0839] - javaewah.source [1.1.13.v20211029-0839,1.1.13.v20211029-0839] - jakarta.activation [1.2.2.v20201119-1642,1.2.2.v20201119-1642] - jakarta.activation.source [1.2.2.v20201119-1642,1.2.2.v20201119-1642] - jakarta.xml.bind [2.3.3.v20201118-1818,2.3.3.v20201118-1818] - jakarta.xml.bind.source [2.3.3.v20201118-1818,2.3.3.v20201118-1818] - net.bytebuddy.byte-buddy [1.9.0.v20181107-1410,1.9.0.v20181107-1410] - net.bytebuddy.byte-buddy-agent [1.9.0.v20181106-1534,1.9.0.v20181106-1534] - net.bytebuddy.byte-buddy-agent.source [1.9.0.v20181106-1534,1.9.0.v20181106-1534] - net.bytebuddy.byte-buddy.source [1.9.0.v20181107-1410,1.9.0.v20181107-1410] - net.i2p.crypto.eddsa [0.3.0.v20220506-1020,0.3.0.v20220506-1020] - net.i2p.crypto.eddsa.source [0.3.0.v20220506-1020,0.3.0.v20220506-1020] - org.apache.ant [1.10.12.v20211102-1452,1.10.12.v20211102-1452] - org.apache.ant.source [1.10.12.v20211102-1452,1.10.12.v20211102-1452] - org.apache.commons.codec [1.14.0.v20200818-1422,1.14.0.v20200818-1422] - org.apache.commons.codec.source [1.14.0.v20200818-1422,1.14.0.v20200818-1422] - org.apache.commons.compress [1.21.0.v20211103-2100,1.21.0.v20211103-2100] - org.apache.commons.compress.source [1.21.0.v20211103-2100,1.21.0.v20211103-2100] - org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502] - org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502] - org.apache.httpcomponents.httpclient [4.5.13.v20210128-2225,4.5.13.v20210128-2225] - org.apache.httpcomponents.httpclient.source [4.5.13.v20210128-2225,4.5.13.v20210128-2225] - org.apache.httpcomponents.httpcore [4.4.15.v20220209-2345,4.4.15.v20220209-2345] - org.apache.httpcomponents.httpcore.source [4.4.15.v20220209-2345,4.4.15.v20220209-2345] - org.apache.log4j [1.2.19.v20220208-1728,1.2.19.v20220208-1728] - org.apache.log4j.source [1.2.19.v20220208-1728,1.2.19.v20220208-1728] - org.apache.sshd.osgi [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.osgi.source [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.sftp [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.sftp.source [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.bouncycastle.bcpg [1.70.0.v20220507-1208,1.70.0.v20220507-1208] - org.bouncycastle.bcpg.source [1.70.0.v20220507-1208,1.70.0.v20220507-1208] - org.bouncycastle.bcpkix [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcpkix.source [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcprov [1.70.0.v20220507-1208,1.70.0.v20220507-1208] - org.bouncycastle.bcprov.source [1.70.0.v20220507-1208,1.70.0.v20220507-1208] - org.bouncycastle.bcutil [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcutil.source [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.junit [4.13.2.v20211018-1956,4.13.2.v20211018-1956] - org.junit.source [4.13.2.v20211018-1956,4.13.2.v20211018-1956] - org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218] - org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218] - org.mockito [2.23.0.v20200310-1642,2.23.0.v20200310-1642] - org.mockito.source [2.23.0.v20200310-1642,2.23.0.v20200310-1642] - org.objenesis [2.6.0.v20180420-1519,2.6.0.v20180420-1519] - org.objenesis.source [2.6.0.v20180420-1519,2.6.0.v20180420-1519] - org.slf4j.api [1.7.30.v20200204-2150,1.7.30.v20200204-2150] - org.slf4j.api.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150] - org.slf4j.binding.simple [1.7.30.v20200204-2150,1.7.30.v20200204-2150] - org.slf4j.binding.simple.source [1.7.30.v20200204-2150,1.7.30.v20200204-2150] - org.tukaani.xz [1.9.0.v20210624-1259,1.9.0.v20210624-1259] - org.tukaani.xz.source [1.9.0.v20210624-1259,1.9.0.v20210624-1259] -} - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" { - org.assertj [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.assertj.source [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000] - org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519] - org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519] - org.hamcrest.generator [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.generator.source [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.integration [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.integration.source [1.3.0.v201305210900,1.3.0.v201305210900] - org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246] - org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246] - org.hamcrest.text [1.1.0.v20090501071000,1.1.0.v20090501071000] - org.hamcrest.text.source [1.1.0.v20090501071000,1.1.0.v20090501071000] -} diff --git a/org.eclipse.egit.target/orbit/R20230302014618-2023-03.tpd b/org.eclipse.egit.target/orbit/R20230302014618-2023-03.tpd new file mode 100644 index 0000000000..e8dc979b89 --- /dev/null +++ b/org.eclipse.egit.target/orbit/R20230302014618-2023-03.tpd @@ -0,0 +1,57 @@ +target "R20230302014618-2023-03" with source configurePhase +// see https://download.eclipse.org/tools/orbit/downloads/ + +// when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml +location "https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository" { + com.jcraft.jsch [0.1.55.v20221112-0806,0.1.55.v20221112-0806] + com.jcraft.jsch.source [0.1.55.v20221112-0806,0.1.55.v20221112-0806] + com.jcraft.jzlib [1.1.3.v20220502-1820,1.1.3.v20220502-1820] + com.jcraft.jzlib.source [1.1.3.v20220502-1820,1.1.3.v20220502-1820] + jakarta.activation [1.2.2.v20221203-1659,1.2.2.v20221203-1659] + jakarta.activation.source [1.2.2.v20221203-1659,1.2.2.v20221203-1659] + jakarta.xml.bind [2.3.3.v20221203-1659,2.3.3.v20221203-1659] + jakarta.xml.bind.source [2.3.3.v20221203-1659,2.3.3.v20221203-1659] + javax.activation [2.0.0.v20221203-1659,2.0.0.v20221203-1659] + javax.activation.source [2.0.0.v20221203-1659,2.0.0.v20221203-1659] + javax.xml [1.4.1.v20220503-2331,1.4.1.v20220503-2331] + javax.xml.source [1.4.1.v20220503-2331,1.4.1.v20220503-2331] + net.i2p.crypto.eddsa [0.3.0.v20220506-1020,0.3.0.v20220506-1020] + net.i2p.crypto.eddsa.source [0.3.0.v20220506-1020,0.3.0.v20220506-1020] + org.apache.ant [1.10.12.v20211102-1452,1.10.12.v20211102-1452] + org.apache.ant.source [1.10.12.v20211102-1452,1.10.12.v20211102-1452] + org.apache.commons.io [2.8.0.v20210415-0900,2.8.0.v20210415-0900] + org.apache.commons.io.source [2.8.0.v20210415-0900,2.8.0.v20210415-0900] + org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502] + org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502] + org.apache.httpcomponents.httpclient [4.5.14.v20221207-1049,4.5.14.v20221207-1049] + org.apache.httpcomponents.httpclient.source [4.5.14.v20221207-1049,4.5.14.v20221207-1049] + org.apache.httpcomponents.httpcore [4.4.16.v20221207-1049,4.4.16.v20221207-1049] + org.apache.httpcomponents.httpcore.source [4.4.16.v20221207-1049,4.4.16.v20221207-1049] + org.apache.log4j [1.2.24.v20221221-2012,1.2.24.v20221221-2012] + org.apache.log4j.source [1.2.24.v20221221-2012,1.2.24.v20221221-2012] + org.junit [4.13.2.v20211018-1956,4.13.2.v20211018-1956] + org.junit.source [4.13.2.v20211018-1956,4.13.2.v20211018-1956] + org.mockito.mockito-core [4.8.1.v20221103-2317,4.8.1.v20221103-2317] + org.mockito.mockito-core.source [4.8.1.v20221103-2317,4.8.1.v20221103-2317] + org.objenesis [3.3.0.v20221103-2317,3.3.0.v20221103-2317] + org.objenesis.source [3.3.0.v20221103-2317,3.3.0.v20221103-2317] + org.objectweb.asm [9.4.0.v20221107-1714,9.4.0.v20221107-1714] + org.objectweb.asm.source [9.4.0.v20221107-1714,9.4.0.v20221107-1714] + org.objectweb.asm.tree [9.4.0.v20221107-1714,9.4.0.v20221107-1714] + org.objectweb.asm.tree.source [9.4.0.v20221107-1714,9.4.0.v20221107-1714] +} + +// We can update to org.hamcrest 2.2.0 only once SWTBot does. +location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" { + org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000] + org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519] + org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519] + org.hamcrest.generator [1.3.0.v201305210900,1.3.0.v201305210900] + org.hamcrest.generator.source [1.3.0.v201305210900,1.3.0.v201305210900] + org.hamcrest.integration [1.3.0.v201305210900,1.3.0.v201305210900] + org.hamcrest.integration.source [1.3.0.v201305210900,1.3.0.v201305210900] + org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246] + org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246] + org.hamcrest.text [1.1.0.v20090501071000,1.1.0.v20090501071000] + org.hamcrest.text.source [1.1.0.v20090501071000,1.1.0.v20090501071000] +} diff --git a/org.eclipse.egit.target/orbit/R20230531010532-2023-06.tpd b/org.eclipse.egit.target/orbit/R20230531010532-2023-06.tpd new file mode 100644 index 0000000000..4c7e577b05 --- /dev/null +++ b/org.eclipse.egit.target/orbit/R20230531010532-2023-06.tpd @@ -0,0 +1,63 @@ +target "R20230531010532-2023-06" with source configurePhase +// see https://download.eclipse.org/tools/orbit/downloads/ + +// when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml +location "https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository" { + com.jcraft.jsch [0.1.55.v20221112-0806,0.1.55.v20221112-0806] + com.jcraft.jsch.source [0.1.55.v20221112-0806,0.1.55.v20221112-0806] + com.jcraft.jzlib [1.1.3.v20220502-1820,1.1.3.v20220502-1820] + com.jcraft.jzlib.source [1.1.3.v20220502-1820,1.1.3.v20220502-1820] + jakarta.activation [1.2.2.v20221203-1659,1.2.2.v20221203-1659] + jakarta.activation.source [1.2.2.v20221203-1659,1.2.2.v20221203-1659] + jakarta.xml.bind [2.3.3.v20221203-1659,2.3.3.v20221203-1659] + jakarta.xml.bind.source [2.3.3.v20221203-1659,2.3.3.v20221203-1659] + javax.activation [2.0.0.v20221203-1659,2.0.0.v20221203-1659] + javax.activation.source [2.0.0.v20221203-1659,2.0.0.v20221203-1659] + javax.annotation [1.3.5.v20230504-0748,1.3.5.v20230504-0748] + javax.annotation.source [1.3.5.v20230504-0748,1.3.5.v20230504-0748] + javax.inject [1.0.0.v20220405-0441,1.0.0.v20220405-0441] + javax.inject.source [1.0.0.v20220405-0441,1.0.0.v20220405-0441] + javax.xml [1.4.1.v20220503-2331,1.4.1.v20220503-2331] + javax.xml.source [1.4.1.v20220503-2331,1.4.1.v20220503-2331] + net.i2p.crypto.eddsa [0.3.0.v20220506-1020,0.3.0.v20220506-1020] + net.i2p.crypto.eddsa.source [0.3.0.v20220506-1020,0.3.0.v20220506-1020] + org.apache.ant [1.10.12.v20211102-1452,1.10.12.v20211102-1452] + org.apache.ant.source [1.10.12.v20211102-1452,1.10.12.v20211102-1452] + org.apache.commons.io [2.8.0.v20210415-0900,2.8.0.v20210415-0900] + org.apache.commons.io.source [2.8.0.v20210415-0900,2.8.0.v20210415-0900] + org.apache.commons.logging [1.2.0.v20180409-1502,1.2.0.v20180409-1502] + org.apache.commons.logging.source [1.2.0.v20180409-1502,1.2.0.v20180409-1502] + org.apache.httpcomponents.httpclient [4.5.14.v20230516-1249,4.5.14.v20230516-1249] + org.apache.httpcomponents.httpclient.source [4.5.14.v20230516-1249,4.5.14.v20230516-1249] + org.apache.httpcomponents.httpcore [4.4.16.v20221207-1049,4.4.16.v20221207-1049] + org.apache.httpcomponents.httpcore.source [4.4.16.v20221207-1049,4.4.16.v20221207-1049] + org.apache.log4j [1.2.24.v20221221-2012,1.2.24.v20221221-2012] + org.apache.log4j.source [1.2.24.v20221221-2012,1.2.24.v20221221-2012] + org.junit [4.13.2.v20211018-1956,4.13.2.v20211018-1956] + org.junit.source [4.13.2.v20211018-1956,4.13.2.v20211018-1956] + org.objenesis [3.3.0.v20221103-2317,3.3.0.v20221103-2317] + org.objenesis.source [3.3.0.v20221103-2317,3.3.0.v20221103-2317] + org.objectweb.asm [9.4.0.v20221107-1714,9.4.0.v20221107-1714] + org.objectweb.asm.source [9.4.0.v20221107-1714,9.4.0.v20221107-1714] + org.objectweb.asm.tree [9.4.0.v20221107-1714,9.4.0.v20221107-1714] + org.objectweb.asm.tree.source [9.4.0.v20221107-1714,9.4.0.v20221107-1714] + org.objectweb.asm.analysis [9.4.0.v20221107-1714,9.4.0.v20221107-1714] + org.objectweb.asm.analysis.source [9.4.0.v20221107-1714,9.4.0.v20221107-1714] + org.objectweb.asm.util [9.4.0.v20221107-1714,9.4.0.v20221107-1714] + org.objectweb.asm.util.source [9.4.0.v20221107-1714,9.4.0.v20221107-1714] +} + +// We can update to org.hamcrest 2.2.0 only once SWTBot does. +location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" { + org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000] + org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519] + org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519] + org.hamcrest.generator [1.3.0.v201305210900,1.3.0.v201305210900] + org.hamcrest.generator.source [1.3.0.v201305210900,1.3.0.v201305210900] + org.hamcrest.integration [1.3.0.v201305210900,1.3.0.v201305210900] + org.hamcrest.integration.source [1.3.0.v201305210900,1.3.0.v201305210900] + org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246] + org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246] + org.hamcrest.text [1.1.0.v20090501071000,1.1.0.v20090501071000] + org.hamcrest.text.source [1.1.0.v20090501071000,1.1.0.v20090501071000] +} diff --git a/org.eclipse.egit.target/orbit/orbit-4.29.tpd b/org.eclipse.egit.target/orbit/orbit-4.29.tpd new file mode 100644 index 0000000000..871753a38e --- /dev/null +++ b/org.eclipse.egit.target/orbit/orbit-4.29.tpd @@ -0,0 +1,55 @@ +target "orbit-4.29" with source configurePhase +// see https://download.eclipse.org/tools/orbit/downloads/ + +// when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0" { + com.jcraft.jsch [0.1.55.v20221112-0806,0.1.55.v20221112-0806] + com.jcraft.jsch.source [0.1.55.v20221112-0806,0.1.55.v20221112-0806] + com.jcraft.jzlib [1.1.3.v20220502-1820,1.1.3.v20220502-1820] + com.jcraft.jzlib.source [1.1.3.v20220502-1820,1.1.3.v20220502-1820] + jakarta.activation-api [1.2.2,1.2.2] + jakarta.activation-api.source [1.2.2,1.2.2] + jakarta.annotation-api [1.3.5,1.3.5] + jakarta.annotation-api.source [1.3.5,1.3.5] + jakarta.xml.bind-api [2.3.3,2.3.3] + jakarta.xml.bind-api.source [2.3.3,2.3.3] + jakarta.activation [2.0.0.v20221203-1659,2.0.0.v20221203-1659] + jakarta.activation.source [2.0.0.v20221203-1659,2.0.0.v20221203-1659] + jakarta.inject.jakarta.inject-api [1.0.5,1.0.5] + jakarta.inject.jakarta.inject-api.source [1.0.5,1.0.5] + net.i2p.crypto.eddsa [0.3.0.v20220506-1020,0.3.0.v20220506-1020] + net.i2p.crypto.eddsa.source [0.3.0.v20220506-1020,0.3.0.v20220506-1020] + org.apache.ant [1.10.12.v20211102-1452,1.10.12.v20211102-1452] + org.apache.ant.source [1.10.12.v20211102-1452,1.10.12.v20211102-1452] + org.apache.commons.commons-io [2.13.0,2.13.0] + org.apache.commons.commons-io.source [2.13.0,2.13.0] + org.apache.commons.logging [1.2.0,1.2.0] + org.apache.commons.logging.source [1.2.0,1.2.0] + org.apache.httpcomponents.httpclient [4.5.14,4.5.14] + org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] + org.apache.httpcomponents.httpcore [4.4.16,4.4.16] + org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] + org.apache.log4j [1.2.24.v20221221-2012,1.2.24.v20221221-2012] + org.apache.log4j.source [1.2.24.v20221221-2012,1.2.24.v20221221-2012] + org.eclipse.orbit.maven.lucene.feature.group [4.29.0.v20230703-0758,4.29.0.v20230703-0758] + org.hamcrest [2.2.0,2.2.0] + org.hamcrest.source [2.2.0,2.2.0] + org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.junit [4.13.2.v20230809-1000,4.13.2.v20230809-1000] + org.junit.source [4.13.2.v20230809-1000,4.13.2.v20230809-1000] + org.objenesis [3.3,3.3] + org.objenesis.source [3.3,3.3] + org.objectweb.asm [9.5.0, 9.5.0] + org.objectweb.asm.source [9.5.0, 9.5.0] + org.objectweb.asm.tree [9.5.0,9.5.0] + org.objectweb.asm.tree.source [9.5.0,9.5.0] + org.objectweb.asm.tree.analysis [9.5.0,9.5.0] + org.objectweb.asm.tree.analysis.source [9.5.0,9.5.0] + org.objectweb.asm.util [9.5.0,9.5.0] + org.objectweb.asm.util.source [9.5.0,9.5.0] + org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] + org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] +} diff --git a/org.eclipse.egit.target/orbit/orbit-4.30.tpd b/org.eclipse.egit.target/orbit/orbit-4.30.tpd new file mode 100644 index 0000000000..ce7c52c935 --- /dev/null +++ b/org.eclipse.egit.target/orbit/orbit-4.30.tpd @@ -0,0 +1,52 @@ +target "orbit-4.30" with source configurePhase +// see https://download.eclipse.org/tools/orbit/downloads/ + +// when updating the Orbit URL don't forget to update org.eclipse.egit.repository/category.xml +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/milestone/latest" { + com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + jakarta.activation-api [2.1.2,2.1.2] + jakarta.activation-api.source [2.1.2,2.1.2] + jakarta.annotation-api [1.3.5,1.3.5] + jakarta.annotation-api.source [1.3.5,1.3.5] + jakarta.xml.bind-api [2.3.3,2.3.3] + jakarta.xml.bind-api.source [2.3.3,2.3.3] + jakarta.inject.jakarta.inject-api [1.0.5,1.0.5] + jakarta.inject.jakarta.inject-api.source [1.0.5,1.0.5] + net.i2p.crypto.eddsa [0.3.0,0.3.0] + net.i2p.crypto.eddsa.source [0.3.0,0.3.0] + org.apache.ant [1.10.14.v20230922-1200,1.10.14.v20230922-1200] + org.apache.ant.source [1.10.14.v20230922-1200,1.10.14.v20230922-1200] + org.apache.commons.logging [1.2.0,1.2.0] + org.apache.commons.logging.source [1.2.0,1.2.0] + org.apache.httpcomponents.httpclient [4.5.14,4.5.14] + org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] + org.apache.httpcomponents.httpcore [4.4.16,4.4.16] + org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] + org.eclipse.jetty.servlet-api [4.0.6,4.0.6] + org.eclipse.orbit.maven.lucene.feature.group [4.30.0.v20230929-1030,4.30.0.v20230929-1030] + org.eclipse.orbit.xml-apis-ext [1.0.0.v20230923-0644,1.0.0.v20230923-0644] + org.hamcrest [2.2.0,2.2.0] + org.hamcrest.source [2.2.0,2.2.0] + org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.junit [4.13.2.v20230809-1000,4.13.2.v20230809-1000] + org.junit.source [4.13.2.v20230809-1000,4.13.2.v20230809-1000] + org.mortbay.jasper.apache-jsp [9.0.52,9.0.52] + org.objenesis [3.3,3.3] + org.objenesis.source [3.3,3.3] + org.objectweb.asm [9.6.0, 9.6.0] + org.objectweb.asm.source [9.6.0, 9.6.0] + org.objectweb.asm.tree [9.6.0,9.6.0] + org.objectweb.asm.tree.source [9.6.0,9.6.0] + org.objectweb.asm.tree.analysis [9.6.0,9.6.0] + org.objectweb.asm.tree.analysis.source [9.6.0,9.6.0] + org.objectweb.asm.util [9.6.0,9.6.0] + org.objectweb.asm.util.source [9.6.0,9.6.0] + org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] + org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] +} diff --git a/org.eclipse.egit.target/pom.xml b/org.eclipse.egit.target/pom.xml index 26910f030a..7012d910a0 100644 --- a/org.eclipse.egit.target/pom.xml +++ b/org.eclipse.egit.target/pom.xml @@ -20,6 +20,6 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> + <version>6.8.0-SNAPSHOT</version> </parent> </project> diff --git a/org.eclipse.egit.target/projects/jetty-10.0.x.tpd b/org.eclipse.egit.target/projects/jetty-10.0.x.tpd deleted file mode 100644 index 6c3ee18332..0000000000 --- a/org.eclipse.egit.target/projects/jetty-10.0.x.tpd +++ /dev/null @@ -1,20 +0,0 @@ -target "jetty-10.0.x" with source configurePhase - -location jetty-10.0.x "https://download.eclipse.org/eclipse/jetty/10.0.6/" { - jakarta.servlet-api [4.0.0, 5.0.0) - jakarta.servlet-api.source [4.0.0, 5.0.0) - org.eclipse.jetty.http [10.0.6,10.0.6] - org.eclipse.jetty.http.source [10.0.6,10.0.6] - org.eclipse.jetty.io [10.0.6,10.0.6] - org.eclipse.jetty.io.source [10.0.6,10.0.6] - org.eclipse.jetty.security [10.0.6,10.0.6] - org.eclipse.jetty.security.source [10.0.6,10.0.6] - org.eclipse.jetty.server [10.0.6,10.0.6] - org.eclipse.jetty.server.source [10.0.6,10.0.6] - org.eclipse.jetty.servlet [10.0.6,10.0.6] - org.eclipse.jetty.servlet.source [10.0.6,10.0.6] - org.eclipse.jetty.util [10.0.6,10.0.6] - org.eclipse.jetty.util.source [10.0.6,10.0.6] - org.eclipse.jetty.util.ajax [10.0.6,10.0.6] - org.eclipse.jetty.util.ajax.source [10.0.6,10.0.6] -} diff --git a/org.eclipse.egit.target/releasetrain/4.17-2020-09.tpd b/org.eclipse.egit.target/releasetrain/4.17-2020-09.tpd deleted file mode 100644 index cd5307cc7d..0000000000 --- a/org.eclipse.egit.target/releasetrain/4.17-2020-09.tpd +++ /dev/null @@ -1,32 +0,0 @@ -target "4.17-2020-09" with source configurePhase - -location "https://download.eclipse.org/releases/2020-09/" { - // Eclipse platform - org.eclipse.sdk.ide lazy - org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.equinox.concurrent lazy - - // Mylyn integration - org.eclipse.mylyn.commons.sdk.feature.group lazy - org.eclipse.mylyn.ide_feature.feature.group lazy - org.eclipse.mylyn.team_feature.feature.group lazy - org.eclipse.mylyn_feature.feature.group lazy - org.eclipse.mylyn.context_feature.feature.group lazy - org.eclipse.mylyn.bugzilla_feature.feature.group lazy - - // debugging SWT layouts - org.eclipse.tools.layout.spy lazy -} - -location "https://download.eclipse.org/mylyn/releases/latest" { - // some Mylyn dependencies as bundles, to avoid mylyn.trac, which would lead to conflicts - javax.xml lazy - org.apache.lucene.analyzers-common [6.1.0,6.2.0) - org.apache.lucene.core [6.1.0,6.2.0) - org.apache.lucene.queryparser [6.1.0,6.2.0) - org.apache.xerces lazy - org.apache.xml.resolver lazy - org.apache.xml.serializer lazy -}
\ No newline at end of file diff --git a/org.eclipse.egit.target/releasetrain/4.18-2020-12.tpd b/org.eclipse.egit.target/releasetrain/4.18-2020-12.tpd deleted file mode 100644 index 8e10091dfc..0000000000 --- a/org.eclipse.egit.target/releasetrain/4.18-2020-12.tpd +++ /dev/null @@ -1,38 +0,0 @@ -target "4.18-2020-12" with source configurePhase - -location "https://download.eclipse.org/releases/2020-12/" { - // Eclipse platform - org.eclipse.sdk.ide lazy - org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.equinox.concurrent lazy - - // Mylyn integration - // TODO: removed temporarily in 2020-12 staging repo - // org.eclipse.mylyn.commons.sdk.feature.group lazy - org.eclipse.mylyn.ide_feature.feature.group lazy - org.eclipse.mylyn.team_feature.feature.group lazy - org.eclipse.mylyn_feature.feature.group lazy - org.eclipse.mylyn.context_feature.feature.group lazy - org.eclipse.mylyn.bugzilla_feature.feature.group lazy - - // debugging SWT layouts - org.eclipse.tools.layout.spy lazy -} - -location "https://download.eclipse.org/releases/2020-09/" { - // TODO: remove this workaround for temporarily removed feature in 2020-12 - org.eclipse.mylyn.commons.sdk.feature.group lazy -} - -location "https://download.eclipse.org/mylyn/releases/latest" { - // some Mylyn dependencies as bundles, to avoid mylyn.trac, which would lead to conflicts - javax.xml lazy - org.apache.lucene.analyzers-common [6.1.0,6.2.0) - org.apache.lucene.core [6.1.0,6.2.0) - org.apache.lucene.queryparser [6.1.0,6.2.0) - org.apache.xerces lazy - org.apache.xml.resolver lazy - org.apache.xml.serializer lazy -}
\ No newline at end of file diff --git a/org.eclipse.egit.target/releasetrain/4.19-2021-03.tpd b/org.eclipse.egit.target/releasetrain/4.19-2021-03.tpd deleted file mode 100644 index 0a398caa79..0000000000 --- a/org.eclipse.egit.target/releasetrain/4.19-2021-03.tpd +++ /dev/null @@ -1,38 +0,0 @@ -target "4.19-2021-03" with source configurePhase - -location "https://download.eclipse.org/staging/2021-03/" { - // Eclipse platform - org.eclipse.sdk.ide lazy - org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.equinox.concurrent lazy - - // Mylyn integration - // TODO: removed temporarily in 2020-12 staging repo - // org.eclipse.mylyn.commons.sdk.feature.group lazy - org.eclipse.mylyn.ide_feature.feature.group lazy - org.eclipse.mylyn.team_feature.feature.group lazy - org.eclipse.mylyn_feature.feature.group lazy - org.eclipse.mylyn.context_feature.feature.group lazy - org.eclipse.mylyn.bugzilla_feature.feature.group lazy - - // debugging SWT layouts - org.eclipse.tools.layout.spy lazy -} - -location "https://download.eclipse.org/releases/2020-09/" { - // TODO: remove this workaround for temporarily removed feature in 2020-12 - org.eclipse.mylyn.commons.sdk.feature.group lazy -} - -location "https://download.eclipse.org/mylyn/releases/latest" { - // some Mylyn dependencies as bundles, to avoid mylyn.trac, which would lead to conflicts - javax.xml lazy - org.apache.lucene.analyzers-common [6.1.0,6.2.0) - org.apache.lucene.core [6.1.0,6.2.0) - org.apache.lucene.queryparser [6.1.0,6.2.0) - org.apache.xerces lazy - org.apache.xml.resolver lazy - org.apache.xml.serializer lazy -}
\ No newline at end of file diff --git a/org.eclipse.egit.target/releasetrain/4.20-2021-06.tpd b/org.eclipse.egit.target/releasetrain/4.20-2021-06.tpd deleted file mode 100644 index bc57738016..0000000000 --- a/org.eclipse.egit.target/releasetrain/4.20-2021-06.tpd +++ /dev/null @@ -1,38 +0,0 @@ -target "4.20-2021-06" with source configurePhase - -location "https://download.eclipse.org/releases/2021-06/" { - // Eclipse platform - org.eclipse.sdk.ide lazy - org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.equinox.concurrent lazy - - // Mylyn integration - // TODO: removed temporarily in 2020-12 staging repo - // org.eclipse.mylyn.commons.sdk.feature.group lazy - org.eclipse.mylyn.ide_feature.feature.group lazy - org.eclipse.mylyn.team_feature.feature.group lazy - org.eclipse.mylyn_feature.feature.group lazy - org.eclipse.mylyn.context_feature.feature.group lazy - org.eclipse.mylyn.bugzilla_feature.feature.group lazy - - // debugging SWT layouts - org.eclipse.tools.layout.spy lazy -} - -location "https://download.eclipse.org/releases/2020-09/" { - // TODO: remove this workaround for temporarily removed feature in 2020-12 - org.eclipse.mylyn.commons.sdk.feature.group lazy -} - -location "https://download.eclipse.org/mylyn/releases/latest" { - // some Mylyn dependencies as bundles, to avoid mylyn.trac, which would lead to conflicts - javax.xml lazy - org.apache.lucene.analyzers-common [6.1.0,6.2.0) - org.apache.lucene.core [6.1.0,6.2.0) - org.apache.lucene.queryparser [6.1.0,6.2.0) - org.apache.xerces lazy - org.apache.xml.resolver lazy - org.apache.xml.serializer lazy -}
\ No newline at end of file diff --git a/org.eclipse.egit.target/releasetrain/4.21-2021-09.tpd b/org.eclipse.egit.target/releasetrain/4.21-2021-09.tpd deleted file mode 100644 index 8efce86ac2..0000000000 --- a/org.eclipse.egit.target/releasetrain/4.21-2021-09.tpd +++ /dev/null @@ -1,38 +0,0 @@ -target "4.21-2021-09" with source configurePhase - -location "https://download.eclipse.org/releases/2021-09/" { - // Eclipse platform - org.eclipse.sdk.ide lazy - org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.equinox.concurrent lazy - - // Mylyn integration - // TODO: removed temporarily in 2020-12 staging repo - // org.eclipse.mylyn.commons.sdk.feature.group lazy - org.eclipse.mylyn.ide_feature.feature.group lazy - org.eclipse.mylyn.team_feature.feature.group lazy - org.eclipse.mylyn_feature.feature.group lazy - org.eclipse.mylyn.context_feature.feature.group lazy - org.eclipse.mylyn.bugzilla_feature.feature.group lazy - - // debugging SWT layouts - org.eclipse.tools.layout.spy lazy -} - -location "https://download.eclipse.org/releases/2020-09/" { - // TODO: remove this workaround for temporarily removed feature in 2020-12 - org.eclipse.mylyn.commons.sdk.feature.group lazy -} - -location "https://download.eclipse.org/mylyn/releases/latest" { - // some Mylyn dependencies as bundles, to avoid mylyn.trac, which would lead to conflicts - javax.xml lazy - org.apache.lucene.analyzers-common [6.1.0,6.2.0) - org.apache.lucene.core [6.1.0,6.2.0) - org.apache.lucene.queryparser [6.1.0,6.2.0) - org.apache.xerces lazy - org.apache.xml.resolver lazy - org.apache.xml.serializer lazy -}
\ No newline at end of file diff --git a/org.eclipse.egit.target/releasetrain/4.22-2021-12.tpd b/org.eclipse.egit.target/releasetrain/4.22-2021-12.tpd deleted file mode 100644 index 4990448993..0000000000 --- a/org.eclipse.egit.target/releasetrain/4.22-2021-12.tpd +++ /dev/null @@ -1,38 +0,0 @@ -target "4.22-2021-12" with source configurePhase - -location "https://download.eclipse.org/releases/2021-12/" { - // Eclipse platform - org.eclipse.sdk.ide lazy - org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.equinox.concurrent lazy - - // Mylyn integration - // TODO: removed temporarily in 2020-12 staging repo - // org.eclipse.mylyn.commons.sdk.feature.group lazy - org.eclipse.mylyn.ide_feature.feature.group lazy - org.eclipse.mylyn.team_feature.feature.group lazy - org.eclipse.mylyn_feature.feature.group lazy - org.eclipse.mylyn.context_feature.feature.group lazy - org.eclipse.mylyn.bugzilla_feature.feature.group lazy - - // debugging SWT layouts - org.eclipse.tools.layout.spy lazy -} - -location "https://download.eclipse.org/releases/2020-09/" { - // TODO: remove this workaround for temporarily removed feature in 2020-12 - org.eclipse.mylyn.commons.sdk.feature.group lazy -} - -location "https://download.eclipse.org/mylyn/releases/latest" { - // some Mylyn dependencies as bundles, to avoid mylyn.trac, which would lead to conflicts - javax.xml lazy - org.apache.lucene.analyzers-common [6.1.0,6.2.0) - org.apache.lucene.core [6.1.0,6.2.0) - org.apache.lucene.queryparser [6.1.0,6.2.0) - org.apache.xerces lazy - org.apache.xml.resolver lazy - org.apache.xml.serializer lazy -}
\ No newline at end of file diff --git a/org.eclipse.egit.target/releasetrain/4.23-2022-03.tpd b/org.eclipse.egit.target/releasetrain/4.23-2022-03.tpd deleted file mode 100644 index 5180fabdd0..0000000000 --- a/org.eclipse.egit.target/releasetrain/4.23-2022-03.tpd +++ /dev/null @@ -1,38 +0,0 @@ -target "4.23-2022-03" with source configurePhase - -location "https://download.eclipse.org/releases/2022-03/" { - // Eclipse platform - org.eclipse.sdk.ide lazy - org.eclipse.ecf.core.feature.feature.group lazy - org.eclipse.ecf.filetransfer.feature.feature.group lazy - org.eclipse.emf.sdk.feature.group lazy - org.eclipse.equinox.concurrent lazy - - // Mylyn integration - // TODO: removed temporarily in 2020-12 staging repo - // org.eclipse.mylyn.commons.sdk.feature.group lazy - org.eclipse.mylyn.ide_feature.feature.group lazy - org.eclipse.mylyn.team_feature.feature.group lazy - org.eclipse.mylyn_feature.feature.group lazy - org.eclipse.mylyn.context_feature.feature.group lazy - org.eclipse.mylyn.bugzilla_feature.feature.group lazy - - // debugging SWT layouts - org.eclipse.tools.layout.spy lazy -} - -location "https://download.eclipse.org/releases/2020-09/" { - // TODO: remove this workaround for temporarily removed feature in 2020-12 - org.eclipse.mylyn.commons.sdk.feature.group lazy -} - -location "https://download.eclipse.org/mylyn/releases/latest" { - // some Mylyn dependencies as bundles, to avoid mylyn.trac, which would lead to conflicts - javax.xml lazy - org.apache.lucene.analyzers-common [6.1.0,6.2.0) - org.apache.lucene.core [6.1.0,6.2.0) - org.apache.lucene.queryparser [6.1.0,6.2.0) - org.apache.xerces lazy - org.apache.xml.resolver lazy - org.apache.xml.serializer lazy -}
\ No newline at end of file diff --git a/org.eclipse.egit.target/releasetrain/4.26-2022-12.tpd b/org.eclipse.egit.target/releasetrain/4.26-2022-12.tpd new file mode 100644 index 0000000000..a16b258c20 --- /dev/null +++ b/org.eclipse.egit.target/releasetrain/4.26-2022-12.tpd @@ -0,0 +1,20 @@ +target "4.26-2022-12" with source configurePhase + +location "https://download.eclipse.org/releases/2022-12/" { + // Eclipse platform + org.eclipse.sdk.ide lazy + org.eclipse.ecf.core.feature.feature.group lazy + org.eclipse.ecf.filetransfer.feature.feature.group lazy + org.eclipse.emf.sdk.feature.group lazy + org.eclipse.equinox.p2.director lazy + org.eclipse.equinox.sdk.feature.group lazy + org.eclipse.e4.tools.emf.ui lazy + org.eclipse.e4.tools.services lazy + org.eclipse.e4.ui.progress lazy + org.eclipse.e4.ui.workbench lazy + org.sat4j.core lazy + org.sat4j.pb lazy + + // debugging SWT layouts + org.eclipse.tools.layout.spy lazy +} diff --git a/org.eclipse.egit.target/releasetrain/4.27-2023-03.tpd b/org.eclipse.egit.target/releasetrain/4.27-2023-03.tpd new file mode 100644 index 0000000000..5a636348af --- /dev/null +++ b/org.eclipse.egit.target/releasetrain/4.27-2023-03.tpd @@ -0,0 +1,21 @@ +target "4.27-2023-03" with source configurePhase + +location "https://download.eclipse.org/releases/2023-03" { + // Eclipse platform + org.apache.commons.jxpath lazy + org.eclipse.sdk.ide lazy + org.eclipse.ecf.core.feature.feature.group lazy + org.eclipse.ecf.filetransfer.feature.feature.group lazy + org.eclipse.emf.sdk.feature.group lazy + org.eclipse.equinox.p2.director lazy + org.eclipse.equinox.sdk.feature.group lazy + org.eclipse.e4.tools.emf.ui lazy + org.eclipse.e4.tools.services lazy + org.eclipse.e4.ui.progress lazy + org.eclipse.e4.ui.workbench lazy + org.sat4j.core lazy + org.sat4j.pb lazy + + // debugging SWT layouts + org.eclipse.tools.layout.spy lazy +} diff --git a/org.eclipse.egit.target/releasetrain/4.28-2023-06.target b/org.eclipse.egit.target/releasetrain/4.28-2023-06.target new file mode 100644 index 0000000000..949243ac04 --- /dev/null +++ b/org.eclipse.egit.target/releasetrain/4.28-2023-06.target @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde?> +<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> +<target name="4.28-2023-06" sequenceNumber="1686318469"> + <locations> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="org.apache.commons.jxpath" version="0.0.0"/> + <unit id="org.eclipse.sdk.ide" version="0.0.0"/> + <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.equinox.concurrent" version="0.0.0"/> + <unit id="org.eclipse.equinox.p2.director" version="0.0.0"/> + <unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.800.v20230523-2142"/> + <unit id="org.eclipse.e4.tools.emf.ui" version="0.0.0"/> + <unit id="org.eclipse.e4.tools.services" version="0.0.0"/> + <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/> + <unit id="org.eclipse.e4.ui.workbench" version="0.0.0"/> + <unit id="org.sat4j.core" version="0.0.0"/> + <unit id="org.sat4j.pb" version="0.0.0"/> + <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/> + <repository location="https://download.eclipse.org/staging/2023-06"/> + </location> + </locations> +</target> diff --git a/org.eclipse.egit.target/releasetrain/4.28-2023-06.tpd b/org.eclipse.egit.target/releasetrain/4.28-2023-06.tpd new file mode 100644 index 0000000000..db87ba29c4 --- /dev/null +++ b/org.eclipse.egit.target/releasetrain/4.28-2023-06.tpd @@ -0,0 +1,24 @@ +target "4.28-2023-06" with source configurePhase + +location "https://download.eclipse.org/releases/2023-06" { + // Eclipse platform + biz.aQute.bnd.util lazy + biz.aQute.bndlib lazy + org.apache.commons.jxpath lazy + org.eclipse.sdk.ide lazy + org.eclipse.ecf.core.feature.feature.group lazy + org.eclipse.ecf.filetransfer.feature.feature.group lazy + org.eclipse.emf.sdk.feature.group lazy + org.eclipse.equinox.p2.director lazy + org.eclipse.equinox.sdk.feature.group lazy + org.eclipse.e4.tools.emf.ui lazy + org.eclipse.e4.tools.services lazy + org.eclipse.e4.ui.progress lazy + org.eclipse.e4.ui.workbench lazy + org.osgi.service.repository lazy + org.sat4j.core lazy + org.sat4j.pb lazy + + // debugging SWT layouts + org.eclipse.tools.layout.spy lazy +} diff --git a/org.eclipse.egit.target/releasetrain/4.29-2023-09.tpd b/org.eclipse.egit.target/releasetrain/4.29-2023-09.tpd new file mode 100644 index 0000000000..6f8ee85860 --- /dev/null +++ b/org.eclipse.egit.target/releasetrain/4.29-2023-09.tpd @@ -0,0 +1,24 @@ +target "4.29-2023-09" with source configurePhase + +location "https://download.eclipse.org/releases/2023-09" { + // Eclipse platform + biz.aQute.bnd.util lazy + biz.aQute.bndlib lazy + org.apache.commons.jxpath lazy + org.eclipse.sdk.ide lazy + org.eclipse.ecf.core.feature.feature.group lazy + org.eclipse.ecf.filetransfer.feature.feature.group lazy + org.eclipse.emf.sdk.feature.group lazy + org.eclipse.equinox.p2.director lazy + org.eclipse.equinox.sdk.feature.group lazy + org.eclipse.e4.tools.emf.ui lazy + org.eclipse.e4.tools.services lazy + org.eclipse.e4.ui.progress lazy + org.eclipse.e4.ui.workbench lazy + org.osgi.service.repository lazy + org.sat4j.core lazy + org.sat4j.pb lazy + + // debugging SWT layouts + org.eclipse.tools.layout.spy lazy +} diff --git a/org.eclipse.egit.target/releasetrain/4.30-2023-12.target b/org.eclipse.egit.target/releasetrain/4.30-2023-12.target new file mode 100644 index 0000000000..e34b25f1b6 --- /dev/null +++ b/org.eclipse.egit.target/releasetrain/4.30-2023-12.target @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<?pde?> +<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> +<target name="4.30-2023-12" sequenceNumber="1697196370"> + <locations> + <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> + <unit id="biz.aQute.bnd.util" version="0.0.0"/> + <unit id="biz.aQute.bndlib" version="0.0.0"/> + <unit id="org.apache.commons.jxpath" version="0.0.0"/> + <unit id="org.eclipse.sdk.ide" version="0.0.0"/> + <unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/> + <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.equinox.p2.director" version="0.0.0"/> + <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/> + <unit id="org.eclipse.e4.tools.emf.ui" version="0.0.0"/> + <unit id="org.eclipse.e4.tools.services" version="0.0.0"/> + <unit id="org.eclipse.e4.ui.progress" version="0.0.0"/> + <unit id="org.eclipse.e4.ui.workbench" version="0.0.0"/> + <unit id="org.osgi.service.repository" version="0.0.0"/> + <unit id="org.sat4j.core" version="0.0.0"/> + <unit id="org.sat4j.pb" version="0.0.0"/> + <unit id="org.eclipse.tools.layout.spy" version="0.0.0"/> + <repository location="https://download.eclipse.org/staging/2023-12"/> + </location> + </locations> +</target> diff --git a/org.eclipse.egit.target/releasetrain/4.30-2023-12.tpd b/org.eclipse.egit.target/releasetrain/4.30-2023-12.tpd new file mode 100644 index 0000000000..4ed2dcda49 --- /dev/null +++ b/org.eclipse.egit.target/releasetrain/4.30-2023-12.tpd @@ -0,0 +1,25 @@ +target "4.30-2023-12" with source configurePhase + +location "https://download.eclipse.org/staging/2023-12" { + // Eclipse platform + biz.aQute.bnd.util lazy + biz.aQute.bndlib lazy + org.apache.commons.jxpath lazy + org.eclipse.sdk.ide lazy + org.eclipse.ecf.core.feature.feature.group lazy + org.eclipse.ecf.filetransfer.feature.feature.group lazy + org.eclipse.emf.sdk.feature.group lazy + org.eclipse.equinox.p2.director lazy + org.eclipse.equinox.sdk.feature.group lazy + org.eclipse.e4.tools.emf.ui lazy + org.eclipse.e4.tools.services lazy + org.eclipse.e4.ui.progress lazy + org.eclipse.e4.ui.workbench lazy + org.eclipse.search.core lazy + org.osgi.service.repository lazy + org.sat4j.core lazy + org.sat4j.pb lazy + + // debugging SWT layouts + org.eclipse.tools.layout.spy lazy +} diff --git a/org.eclipse.egit.ui.test/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit.ui.test/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit.ui.test/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit.ui.test/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.ui.test/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit.ui.test/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit.ui.test/.settings/org.eclipse.pde.prefs b/org.eclipse.egit.ui.test/.settings/org.eclipse.pde.prefs index caeaa5a45b..b2aecffcfa 100644 --- a/org.eclipse.egit.ui.test/.settings/org.eclipse.pde.prefs +++ b/org.eclipse.egit.ui.test/.settings/org.eclipse.pde.prefs @@ -25,7 +25,7 @@ compilers.p.service.component.without.lazyactivation=1 compilers.p.unknown-attribute=1 compilers.p.unknown-class=1 compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 +compilers.p.unknown-identifier=0 compilers.p.unknown-resource=1 compilers.p.unresolved-ex-points=0 compilers.p.unresolved-import=0 diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index d0a5d7d597..ad38bdc1a2 100644 --- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF @@ -5,33 +5,34 @@ Bundle-Vendor: Eclipse.org Automatic-Module-Name: org.eclipse.egit.ui.test Bundle-SymbolicName: org.eclipse.egit.ui.test;singleton:=true Fragment-Host: org.eclipse.egit.ui -Bundle-Version: 6.3.0.qualifier +Bundle-Version: 6.8.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)", - org.eclipse.core.filesystem;bundle-version="[1.7.700,2.0.0)", - org.eclipse.core.resources;bundle-version="[3.13.800,4.0.0)", - org.eclipse.search;bundle-version="[3.12.0,4.0.0)";resolution:=optional, - org.eclipse.ui;bundle-version="[3.118.0,4.0.0)", - org.eclipse.jdt.launching;bundle-version="[3.18.0,4.0.0)", - org.eclipse.egit.core.junit;bundle-version="[6.3.0,6.4.0)", +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.9.500,2.0.0)", + org.eclipse.core.resources;bundle-version="[3.18.100,4.0.0)", + org.eclipse.search;bundle-version="[3.14.300,4.0.0)";resolution:=optional, + org.eclipse.ui;bundle-version="[3.201.200,4.0.0)", + org.eclipse.jdt.launching;bundle-version="[3.19.800,4.0.0)", + org.eclipse.egit.core.junit;bundle-version="[6.8.0,6.9.0)", + org.hamcrest.core;bundle-version="[1.3.0,2.0.0)", org.hamcrest.library;bundle-version="[1.3.0,2.0.0)" Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)", org.eclipse.core.net.proxy;bundle-version="[1.3.1000,2.0.0)", - org.eclipse.egit.gitflow;version="[6.3.0,6.4.0)", - org.eclipse.egit.gitflow.op;version="[6.3.0,6.4.0)", - org.eclipse.egit.gitflow.ui;version="[6.3.0,6.4.0)", - org.eclipse.egit.gitflow.ui.internal;version="[6.3.0,6.4.0)", - org.eclipse.jgit.api;version="[6.3.0,6.4.0)", - org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)", - org.eclipse.jgit.attributes;version="[6.3.0,6.4.0)", - org.eclipse.jgit.junit;version="[6.3.0,6.4.0)", - org.eclipse.jgit.junit.http;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lib;version="[6.3.0,6.4.0)", - org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)", - org.eclipse.jgit.storage.file;version="[6.3.0,6.4.0)", - org.eclipse.jgit.transport;version="[6.3.0,6.4.0)", - org.eclipse.jgit.transport.resolver;version="[6.3.0,6.4.0)", - org.eclipse.jgit.util;version="[6.3.0,6.4.0)", + org.eclipse.egit.gitflow;version="[6.8.0,6.9.0)", + org.eclipse.egit.gitflow.op;version="[6.8.0,6.9.0)", + org.eclipse.egit.gitflow.ui;version="[6.8.0,6.9.0)", + org.eclipse.egit.gitflow.ui.internal;version="[6.8.0,6.9.0)", + org.eclipse.jgit.api;version="[6.8.0,6.9.0)", + org.eclipse.jgit.api.errors;version="[6.8.0,6.9.0)", + org.eclipse.jgit.attributes;version="[6.8.0,6.9.0)", + org.eclipse.jgit.junit;version="[6.8.0,6.9.0)", + org.eclipse.jgit.junit.http;version="[6.8.0,6.9.0)", + org.eclipse.jgit.lib;version="[6.8.0,6.9.0)", + org.eclipse.jgit.revwalk;version="[6.8.0,6.9.0)", + org.eclipse.jgit.storage.file;version="[6.8.0,6.9.0)", + org.eclipse.jgit.transport;version="[6.8.0,6.9.0)", + org.eclipse.jgit.transport.resolver;version="[6.8.0,6.9.0)", + org.eclipse.jgit.util;version="[6.8.0,6.9.0)", org.eclipse.swt.widgets, org.eclipse.swtbot.eclipse.finder, org.eclipse.swtbot.eclipse.finder.waits, @@ -49,10 +50,9 @@ Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)", org.junit.rules;version="[4.13.0,5.0.0)", org.junit.runner;version="[4.13.0,5.0.0)", org.junit.runners;version="[4.13.0,5.0.0)", - org.mockito;version="[2.13.0,3.0.0)", - org.mockito.hamcrest;version="[2.13.0,3.0.0)", - org.mockito.invocation;version="[2.13.0,3.0.0)", - org.mockito.junit;version="[2.13.0,3.0.0)", - org.mockito.stubbing;version="[2.13.0,3.0.0)", + org.mockito;version="[5.4.0,6.0.0)", + org.mockito.invocation;version="[5.4.0,6.0.0)", + org.mockito.junit;version="[5.4.0,6.0.0)", + org.mockito.stubbing;version="[5.4.0,6.0.0)", org.osgi.framework;version="[1.4.0,2.0.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 62e5b1ca6b..0c58a78911 100644 --- a/org.eclipse.egit.ui.test/pom.xml +++ b/org.eclipse.egit.ui.test/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> + <version>6.8.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.ui.test</artifactId> diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java index b63c687841..0d691fbc33 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/common/LocalRepositoryTestCase.java @@ -21,16 +21,20 @@ import java.io.File; import java.io.FilenameFilter; import java.io.IOException; import java.lang.reflect.InvocationTargetException; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import java.util.Optional; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.preferences.IEclipsePreferences; @@ -155,6 +159,8 @@ public abstract class LocalRepositoryTestCase extends EGitTestCase { /** A folder obtained by checking in a project without .project */ protected static final String PROJ2 = "ProjectWithoutDotProject"; + protected static final String SETTINGS = ".settings/org.eclipse.core.resources.prefs"; + protected static final String FOLDER = "folder"; protected static final String FILE1 = "test.txt"; @@ -370,27 +376,24 @@ public abstract class LocalRepositoryTestCase extends EGitTestCase { assertConnected(secondProject); } + ArrayList<IFile> toCommit = new ArrayList<>(); IFile dotProject = firstProject.getFile(".project"); assertTrue(".project is not accessible: " + dotProject, dotProject.isAccessible()); + toCommit.add(dotProject); IFolder folder = firstProject.getFolder(FOLDER); - IFile textFile = folder.getFile(FILE1); - IFile textFile2 = folder.getFile(FILE2); - IFile[] committableFiles = null; + toCommit.add(folder.getFile(FILE1)); + toCommit.add(folder.getFile(FILE2)); + getSettings(firstProject).ifPresent(f -> toCommit.add(f)); if (secondProject != null) { folder = secondProject.getFolder(FOLDER); - IFile secondtextFile = folder.getFile(FILE1); - IFile secondtextFile2 = folder.getFile(FILE2); - - committableFiles = new IFile[] { dotProject, textFile, textFile2, - secondtextFile, secondtextFile2 }; - } else { - committableFiles = new IFile[] { dotProject, textFile, textFile2 }; + toCommit.add(folder.getFile(FILE1)); + toCommit.add(folder.getFile(FILE2)); + getSettings(secondProject).ifPresent(f -> toCommit.add(f)); } - ArrayList<IFile> untracked = new ArrayList<>(); - untracked.addAll(Arrays.asList(committableFiles)); + ArrayList<IFile> untracked = new ArrayList<>(toCommit); // commit to stable - CommitOperation op = new CommitOperation(committableFiles, + CommitOperation op = new CommitOperation(toCommit.toArray(new IFile[0]), untracked, TestUtil.TESTAUTHOR, TestUtil.TESTCOMMITTER, "Initial commit"); op.execute(null); @@ -410,6 +413,14 @@ public abstract class LocalRepositoryTestCase extends EGitTestCase { return gitDir; } + private Optional<IFile> getSettings(IProject project) { + IResource rsc = project.findMember(SETTINGS); + if (rsc instanceof IFile) { + return Optional.of((IFile) rsc); + } + return Optional.empty(); + } + protected Repository createLocalTestRepository(String repoName) throws IOException { File gitDir = new File(new File(testDirectory, repoName), @@ -422,19 +433,21 @@ public abstract class LocalRepositoryTestCase extends EGitTestCase { protected IProject createStandardTestProjectInRepository( Repository repository, String name) throws Exception { - IProject project = ResourcesPlugin.getWorkspace().getRoot() - .getProject(name); + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + IProject project = workspace.getRoot().getProject(name); if (project.exists()) { project.delete(true, null); TestUtil.waitForJobs(100, 5000); } - IProjectDescription desc = ResourcesPlugin.getWorkspace() - .newProjectDescription(name); - desc.setLocation( - new Path(new File(repository.getWorkTree(), name).getPath())); + File projectDir = new File(repository.getWorkTree(), name); + IProjectDescription desc = workspace.newProjectDescription(name); + desc.setLocation(new Path(projectDir.getPath())); project.create(desc, null); project.open(null); + workspace.run(m -> project + .setDefaultCharset(StandardCharsets.UTF_8.name(), m), project, + IWorkspace.AVOID_UPDATE, null); TestUtil.waitForJobs(50, 5000); assertTrue("Project is not accessible: " + project, @@ -451,6 +464,7 @@ public abstract class LocalRepositoryTestCase extends EGitTestCase { textFile2.create(new ByteArrayInputStream( "Some more content".getBytes(project.getDefaultCharset())), false, null); + assertTrue(getSettings(project).isPresent()); return project; } diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureRebaseHandlerTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureRebaseHandlerTest.java index aef233e633..9f98335190 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureRebaseHandlerTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureRebaseHandlerTest.java @@ -107,6 +107,7 @@ public class FeatureRebaseHandlerTest extends AbstractGitflowHandlerTest { new FeatureCheckoutOperation(new GitFlowRepository(repository), featureName).execute(null); } + @Override protected void checkoutBranch(String branchToCheckout) throws CoreException { new BranchOperation(repository, branchToCheckout).execute(null); } diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/push/PushToUpstreamTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/push/PushToUpstreamTest.java index d0803cc4c3..9ce6c47958 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/push/PushToUpstreamTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/internal/push/PushToUpstreamTest.java @@ -1,5 +1,6 @@ /******************************************************************************* * Copyright (c) 2014, 2022 Robin Stocker <robin@nibor.org> and others. + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -12,10 +13,15 @@ package org.eclipse.egit.ui.internal.push; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.io.File; +import java.nio.file.Files; +import java.text.MessageFormat; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import org.eclipse.egit.core.internal.CoreText; import org.eclipse.egit.core.op.BranchOperation; import org.eclipse.egit.core.op.CreateLocalBranchOperation; import org.eclipse.egit.ui.JobFamilies; @@ -25,6 +31,7 @@ import org.eclipse.egit.ui.test.ContextMenuHelper; import org.eclipse.egit.ui.test.JobJoiner; import org.eclipse.egit.ui.test.TestUtil; import org.eclipse.jgit.lib.ConfigConstants; +import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; import org.eclipse.swtbot.swt.finder.SWTBot; @@ -70,6 +77,46 @@ public class PushToUpstreamTest extends LocalRepositoryTestCase { } @Test + public void pushWithHook() throws Exception { + checkoutNewLocalBranch("foo"); + // Existing configuration without push refspec + String remoteName = "origin"; + String pushUrl = repository.getConfig().getString("remote", "push", + "pushurl"); + repository.getConfig().setString("remote", remoteName, "url", pushUrl); + repository.getConfig().setString("remote", remoteName, "fetch", + "refs/heads/*:refs/remotes/origin/*"); + File gitDir = repository.getDirectory(); + File hookDir = new File(gitDir, "hooks"); + assertTrue(hookDir.mkdir() || hookDir.isDirectory()); + File hookFile = new File(hookDir, "pre-push"); + Files.writeString(hookFile.toPath(), "#!/bin/sh\n" + + "echo \"1:$1 2:$2 3:$3\"\n" // to stdout + + "cat - 1>&2\n" // to stderr + + "exit 0\n"); + if (repository.getFS().supportsExecute()) { + repository.getFS().setExecute(hookFile, true); + } + String headId = repository.resolve(Constants.HEAD).getName(); + String forUri = MessageFormat.format(CoreText.PushOperation_ForUri, + pushUrl); + String expectedHookOutput = MessageFormat.format( + UIText.PushResultTable_PrePushHookOutput, + "stdout: " + forUri+ '\n' + + "stdout: 1:" + pushUrl + " 2:" + pushUrl + " 3:\n", + "stderr: " + forUri + '\n' + + "stderr: refs/heads/foo " + headId + + " refs/heads/foo "+ ObjectId.zeroId().getName() + '\n'); + String resultText = pushToUpstream("origin", "foo", true, false); + assertEquals("Hook message doesn't match: " + resultText, + expectedHookOutput, + resultText.substring(0, Math.min(resultText.length(), + expectedHookOutput.length()))); + + assertBranchPushed("foo", remoteRepository); + } + + @Test public void pushIsDisabledWithPushDefaultNothing() throws Exception { checkoutNewLocalBranch("foo"); repository.getConfig().setString(ConfigConstants.CONFIG_PUSH_SECTION, @@ -194,7 +241,7 @@ public class PushToUpstreamTest extends LocalRepositoryTestCase { pushToUpstream(remoteName, "", false, false); } - private void pushToUpstream(String remoteName, String branchName, + private String pushToUpstream(String remoteName, String branchName, boolean expectBranchWizard, boolean expectMultipleWarning) { SWTBotTree project = selectProject(); JobJoiner joiner = null; @@ -218,7 +265,10 @@ public class PushToUpstreamTest extends LocalRepositoryTestCase { } SWTBotShell resultDialog = TestUtil .botForShellStartingWith("Push Results"); + String resultText = resultDialog.bot().styledText().getLines().stream() + .collect(Collectors.joining("\n")); resultDialog.close(); + return resultText; } private void assertPushToUpstreamDisabled() { diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/GitHistoryRefFilterConfigurationDialogTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/GitHistoryRefFilterConfigurationDialogTest.java index 198d37a0e1..96ad0c4a3a 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/GitHistoryRefFilterConfigurationDialogTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/GitHistoryRefFilterConfigurationDialogTest.java @@ -223,7 +223,7 @@ public class GitHistoryRefFilterConfigurationDialogTest private Matcher<SWTBotTableItem> newTableRowMatcher(String text, boolean preConfigured, boolean checked) { - return new TypeSafeMatcher<SWTBotTableItem>() { + return new TypeSafeMatcher<>() { @Override public void describeTo(Description description) { diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/RefFilterHelperTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/RefFilterHelperTest.java index 176a58c1d8..953e2d6909 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/RefFilterHelperTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/RefFilterHelperTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.mockito.hamcrest.MockitoHamcrest.argThat; import java.io.File; import java.util.ArrayList; @@ -53,6 +52,7 @@ import org.hamcrest.TypeSafeMatcher; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentCaptor; public class RefFilterHelperTest extends LocalRepositoryTestCase { @@ -135,10 +135,15 @@ public class RefFilterHelperTest extends LocalRepositoryTestCase { List<String> filters = Arrays.asList("Mock", "test", "filter"); refFilterHelper.setConfiguredFilters(filters, false); + ArgumentCaptor<String> prefString = ArgumentCaptor + .forClass(String.class); verify(prefStore).setValue( eq(getRepoSpecificPrefKeyForConfiguredFilters()), - argThat(refFilterConfigStringOf( - containsInAnyOrder("Mock", "test", "filter")))); + prefString.capture()); + assertThat("Unexpected filter list in preference value", + prefString.getValue(), + refFilterConfigStringOf( + containsInAnyOrder("Mock", "test", "filter"))); verify(prefStore, never()).save(); } @@ -147,10 +152,15 @@ public class RefFilterHelperTest extends LocalRepositoryTestCase { List<String> filters = Arrays.asList("Mock", "test", "filter"); refFilterHelper.setConfiguredFilters(filters, true); + ArgumentCaptor<String> prefString = ArgumentCaptor + .forClass(String.class); verify(prefStore).setValue( eq(getRepoSpecificPrefKeyForConfiguredFilters()), - argThat(refFilterConfigStringOf( - containsInAnyOrder("Mock", "test", "filter")))); + prefString.capture()); + assertThat("Unexpected filter list in preference value", + prefString.getValue(), + refFilterConfigStringOf( + containsInAnyOrder("Mock", "test", "filter"))); verify(prefStore).save(); } @@ -174,10 +184,15 @@ public class RefFilterHelperTest extends LocalRepositoryTestCase { List<String> filters = Arrays.asList("Mock", "test", "filter"); refFilterHelper.setSelectedFilters(filters, false); + ArgumentCaptor<String> prefString = ArgumentCaptor + .forClass(String.class); verify(prefStore).setValue( eq(getRepoSpecificPrefKeyForSelectedFilters()), - argThat(refFilterConfigStringOf( - containsInAnyOrder("Mock", "test", "filter")))); + prefString.capture()); + assertThat("Unexpected filter list in preference value", + prefString.getValue(), + refFilterConfigStringOf( + containsInAnyOrder("Mock", "test", "filter"))); verify(prefStore, never()).save(); } @@ -186,10 +201,15 @@ public class RefFilterHelperTest extends LocalRepositoryTestCase { List<String> filters = Arrays.asList("Mock", "test", "filter"); refFilterHelper.setSelectedFilters(filters, true); + ArgumentCaptor<String> prefString = ArgumentCaptor + .forClass(String.class); verify(prefStore).setValue( eq(getRepoSpecificPrefKeyForSelectedFilters()), - argThat(refFilterConfigStringOf( - containsInAnyOrder("Mock", "test", "filter")))); + prefString.capture()); + assertThat("Unexpected filter list in preference value", + prefString.getValue(), + refFilterConfigStringOf( + containsInAnyOrder("Mock", "test", "filter"))); verify(prefStore).save(); } @@ -214,10 +234,15 @@ public class RefFilterHelperTest extends LocalRepositoryTestCase { List<String> filters = Arrays.asList("Mock", "test", "filter"); refFilterHelper.setLastSelectedFilters(filters, false); + ArgumentCaptor<String> prefString = ArgumentCaptor + .forClass(String.class); verify(prefStore).setValue( eq(getRepoSpecificPrefKeyForLastSelectedFilters()), - argThat(refFilterConfigStringOf( - containsInAnyOrder("Mock", "test", "filter")))); + prefString.capture()); + assertThat("Unexpected filter list in preference value", + prefString.getValue(), + refFilterConfigStringOf( + containsInAnyOrder("Mock", "test", "filter"))); verify(prefStore, never()).save(); } @@ -226,10 +251,15 @@ public class RefFilterHelperTest extends LocalRepositoryTestCase { List<String> filters = Arrays.asList("Mock", "test", "filter"); refFilterHelper.setLastSelectedFilters(filters, true); + ArgumentCaptor<String> prefString = ArgumentCaptor + .forClass(String.class); verify(prefStore).setValue( eq(getRepoSpecificPrefKeyForLastSelectedFilters()), - argThat(refFilterConfigStringOf( - containsInAnyOrder("Mock", "test", "filter")))); + prefString.capture()); + assertThat("Unexpected filter list in preference value", + prefString.getValue(), + refFilterConfigStringOf( + containsInAnyOrder("Mock", "test", "filter"))); verify(prefStore).save(); } @@ -311,15 +341,23 @@ public class RefFilterHelperTest extends LocalRepositoryTestCase { refFilterHelper.setRefFilters(testSet); + ArgumentCaptor<String> prefString = ArgumentCaptor + .forClass(String.class); verify(prefStore).setValue( eq(getRepoSpecificPrefKeyForConfiguredFilters()), - argThat(refFilterConfigStringOf( - containsInAnyOrder("Mock", "test", "filter")))); + prefString.capture()); + assertThat("Unexpected filter list in preference value", + prefString.getValue(), + refFilterConfigStringOf( + containsInAnyOrder("Mock", "test", "filter"))); verify(prefStore).setValue( eq(getRepoSpecificPrefKeyForSelectedFilters()), - argThat(refFilterConfigStringOf( - containsInAnyOrder("refs/heads/**", "filter")))); + prefString.capture()); + assertThat("Unexpected filter list in preference value", + prefString.getValue(), + refFilterConfigStringOf( + containsInAnyOrder("refs/heads/**", "filter"))); verify(prefStore).save(); } @@ -339,10 +377,15 @@ public class RefFilterHelperTest extends LocalRepositoryTestCase { refFilterHelper.saveSelectionStateAsLastSelectionState(testSet); + ArgumentCaptor<String> prefString = ArgumentCaptor + .forClass(String.class); verify(prefStore).setValue( eq(getRepoSpecificPrefKeyForLastSelectedFilters()), - argThat(refFilterConfigStringOf( - containsInAnyOrder("refs/heads/**", "filter")))); + prefString.capture()); + assertThat("Unexpected filter list in preference value", + prefString.getValue(), + refFilterConfigStringOf( + containsInAnyOrder("refs/heads/**", "filter"))); verify(prefStore).save(); } @@ -358,7 +401,7 @@ public class RefFilterHelperTest extends LocalRepositoryTestCase { } private Matcher<Ref> ref(Matcher<String> refName) { - return new TypeSafeMatcher<Ref>() { + return new TypeSafeMatcher<>() { @Override public void describeTo(Description description) { description.appendText("A ref with the name "); diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/RefFilterUtil.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/RefFilterUtil.java index 9e6c76b38c..e7226d6bd0 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/RefFilterUtil.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/history/RefFilterUtil.java @@ -29,7 +29,7 @@ public class RefFilterUtil { public static Matcher<RefFilter> newRefFilterMatcher(String filterString, boolean preConfigured, boolean selected) { - return new TypeSafeMatcher<RefFilterHelper.RefFilter>() { + return new TypeSafeMatcher<>() { @Override public void describeTo(Description description) { description.appendText("a ref filter with "); diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/StagingViewTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/StagingViewTest.java index 96f76eb59f..ffe766c319 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/StagingViewTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/stagview/StagingViewTest.java @@ -14,15 +14,30 @@ import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.List; import java.util.concurrent.TimeUnit; import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IProjectDescription; +import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.SubMonitor; +import org.eclipse.egit.core.GitProvider; import org.eclipse.egit.core.JobFamilies; +import org.eclipse.egit.core.RepositoryUtil; import org.eclipse.egit.core.internal.indexdiff.IndexDiffCache; +import org.eclipse.egit.core.op.DisconnectProviderOperation; +import org.eclipse.egit.ui.common.CompareEditorTester; import org.eclipse.egit.ui.common.StagingViewTester; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.actions.ReplaceConflictActionHandler; @@ -35,6 +50,7 @@ import org.eclipse.jgit.api.Git; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RepositoryState; import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.revwalk.RevCommit; @@ -45,6 +61,7 @@ import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; import org.eclipse.swtbot.swt.finder.waits.DefaultCondition; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.eclipse.team.core.RepositoryProvider; import org.junit.Test; public class StagingViewTest extends AbstractStagingViewTestCase { @@ -402,6 +419,220 @@ public class StagingViewTest extends AbstractStagingViewTestCase { TestUtil.getHeadCommit(repository).getShortMessage()); } + private void openComparison(boolean shared) throws Exception { + setContent("I have changed this"); + + if (!shared) { + IProject project = ResourcesPlugin.getWorkspace().getRoot() + .getProject(PROJ1); + new DisconnectProviderOperation(List.of(project)).execute(null); + assertNull(RepositoryProvider.getProvider(project, GitProvider.ID)); + } + + StagingViewTester stagingView = StagingViewTester.openStagingView(); + SWTBotView view = stagingView.getView(); + SWTBot viewBot = view.bot(); + SWTBotTree unstagedTree = viewBot.tree(0); + TestUtil.waitUntilTreeHasNodeContainsText(viewBot, unstagedTree, + FILE1_PATH, 10000); + SWTBotTreeItem item = TestUtil.getNode(unstagedTree.getAllItems(), + FILE1_PATH); + item.select(); + ContextMenuHelper.clickContextMenu(unstagedTree, + UIText.StagingView_CompareWithIndexMenuLabel); + + CompareEditorTester compareEditor = CompareEditorTester + .forTitleContaining("Compare " + FILE1); + String leftText = compareEditor.getLeftEditor().getText(); + assertEquals("I have changed this", leftText); + } + + /** + * Tests that a comparison between an unstaged file and the index works. + * + * @throws Exception + * on errors + */ + @Test + public void testCompare() throws Exception { + openComparison(true); + } + + /** + * Tests that a comparison between an unstaged file and the index works if + * the file is in an Eclipse project that is not managed by EGit. + * + * @throws Exception + * on errors + */ + @Test + public void testCompareNonShared() throws Exception { + openComparison(false); + } + + /** + * Tests that a comparison between an unstaged file and the index works if + * the file is in an Eclipse project that is not managed by EGit, and is at + * the repository root. + * + * @throws Exception + * on errors + */ + @Test + public void testCompareNonSharedAtRoot() throws Exception { + Repository rootRepo = createLocalTestRepository("RootRepository"); + File workingTree = rootRepo.getWorkTree(); + try (Git git = new Git(rootRepo)) { + File testFile = new File(workingTree, FILE1); + Files.write(testFile.toPath(), + "Content".getBytes(StandardCharsets.UTF_8)); + git.add().addFilepattern(".").call(); + git.commit().setMessage("Initial commit").call(); + } + File gitDir = rootRepo.getDirectory(); + rootRepo.close(); + // Import this repository into Eclipse + RepositoryUtil.INSTANCE.addConfiguredRepository(gitDir); + rootRepo = lookupRepository(gitDir); + IProject project = ResourcesPlugin.getWorkspace().getRoot() + .getProject("unsharedProject"); + assertFalse(project.exists()); + // Import the project + IWorkspaceRunnable importProject = monitor -> { + SubMonitor progress = SubMonitor.convert(monitor, 2); + IProjectDescription desc = ResourcesPlugin.getWorkspace() + .newProjectDescription("unsharedProject"); + desc.setLocation(new Path(workingTree.getPath())); + project.create(desc, progress.newChild(1)); + project.open(progress.newChild(1)); + }; + ResourcesPlugin.getWorkspace().run(importProject, null); + assertTrue(project.exists()); + assertTrue(project.isAccessible()); + assertNull(RepositoryProvider.getProvider(project, GitProvider.ID)); + // Modify the file + IFile file = project.getFile(new Path(FILE1)); + file.refreshLocal(0, null); + file.setContents( + new ByteArrayInputStream( + "Changed".getBytes(project.getDefaultCharset())), + 0, null); + + IndexDiffCache.INSTANCE.getIndexDiffCacheEntry(rootRepo).refresh(); + + // Open the git repositories view, select this repository + SWTBotTree repoTree = getOrOpenView().bot().tree(); + SWTBotTreeItem repoItem = myRepoViewUtil.getRootItem(repoTree, gitDir); + repoItem.select(); + // Open the staging view, compare + StagingViewTester stagingView = StagingViewTester.openStagingView(); + SWTBotView view = stagingView.getView(); + SWTBot viewBot = view.bot(); + SWTBotTree unstagedTree = viewBot.tree(0); + TestUtil.waitUntilTreeHasNodeContainsText(viewBot, unstagedTree, FILE1, + 10000); + SWTBotTreeItem item = TestUtil.getNode(unstagedTree.getAllItems(), + FILE1); + item.select(); + ContextMenuHelper.clickContextMenu(unstagedTree, + UIText.StagingView_CompareWithIndexMenuLabel); + + CompareEditorTester compareEditor = CompareEditorTester + .forTitleContaining("Compare " + FILE1); + String leftText = compareEditor.getLeftEditor().getText(); + assertEquals("Changed", leftText); + } + + /** + * Tests that a staged rename compares against the original file. + * + * @throws Exception + * on errors + */ + @Test + public void testCompareRenamedFileStaged() throws Exception { + IFile file = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJ1) + .getFolder(FOLDER).getFile(FILE1); + String moved = "moved.txt"; + String movedPath = PROJ1 + '/' + FOLDER + '/' + moved; + try (Git git = new Git(repository)) { + assertTrue(file.exists()); + file.move(file.getParent().getFullPath().append(moved), true, + null); + assertFalse(file.exists()); + git.rm().addFilepattern(FILE1_PATH).call(); + git.add().addFilepattern(movedPath).call(); + TestUtil.joinJobs(JobFamilies.INDEX_DIFF_CACHE_UPDATE); + } + StagingViewTester stagingView = StagingViewTester.openStagingView(); + SWTBotView view = stagingView.getView(); + SWTBot viewBot = view.bot(); + SWTBotTree stagedTree = viewBot.tree(1); + TestUtil.waitUntilTreeHasNodeContainsText(viewBot, stagedTree, + movedPath, 10000); + SWTBotTreeItem item = TestUtil.getNode(stagedTree.getAllItems(), + movedPath); + item.select(); + ContextMenuHelper.clickContextMenu(stagedTree, + UIText.StagingView_CompareWithHeadMenuLabel); + + CompareEditorTester compareEditor = CompareEditorTester + .forTitleContaining("Compare " + moved); + String leftText = compareEditor.getLeftEditor().getText(); + String rightText = compareEditor.getRightEditor().getText(); + assertEquals(leftText, rightText); + } + + /** + * Tests that a staged copy compares against the original file. + * + * @throws Exception + * on errors + */ + @Test + public void testCompareCopiedFileStaged() throws Exception { + IFile file = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJ1) + .getFolder(FOLDER).getFile(FILE1); + String moved = "moved.txt"; + String movedPath = PROJ1 + '/' + FOLDER + '/' + moved; + try (Git git = new Git(repository)) { + assertTrue(file.exists()); + file.move(file.getParent().getFullPath().append(moved), true, null); + assertFalse(file.exists()); + touch("New content"); + assertTrue(file.exists()); + git.add().addFilepattern(movedPath).addFilepattern(FILE1_PATH) + .call(); + TestUtil.joinJobs(JobFamilies.INDEX_DIFF_CACHE_UPDATE); + } + StagingViewTester stagingView = StagingViewTester.openStagingView(); + SWTBotView view = stagingView.getView(); + SWTBot viewBot = view.bot(); + SWTBotTree stagedTree = viewBot.tree(1); + TestUtil.waitUntilTreeHasNodeContainsText(viewBot, stagedTree, + movedPath, 10000); + SWTBotTreeItem item = TestUtil.getNode(stagedTree.getAllItems(), + movedPath); + item.select(); + ContextMenuHelper.clickContextMenu(stagedTree, + UIText.StagingView_CompareWithHeadMenuLabel); + + CompareEditorTester compareEditor = CompareEditorTester + .forTitleContaining("Compare " + moved); + String leftText = compareEditor.getLeftEditor().getText(); + String rightText = compareEditor.getRightEditor().getText(); + assertEquals(leftText, rightText); + item = TestUtil.getNode(stagedTree.getAllItems(), FILE1_PATH); + item.select(); + ContextMenuHelper.clickContextMenu(stagedTree, + UIText.StagingView_CompareWithHeadMenuLabel); + + compareEditor = CompareEditorTester + .forTitleContaining("Compare " + FILE1); + leftText = compareEditor.getLeftEditor().getText(); + assertEquals("New content", leftText); + } + private StagingViewTester commitOneFileChange(String fileContent) throws Exception { return commitOneFileChange(fileContent, TestUtil.TESTAUTHOR, diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CommitNonWSChangesTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CommitNonWSChangesTest.java index 8241ff5179..a43e7a0e31 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CommitNonWSChangesTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/CommitNonWSChangesTest.java @@ -82,11 +82,12 @@ public class CommitNonWSChangesTest extends LocalRepositoryTestCase { showUntracked.select(); SWTBotTree tree = commitDialog.bot().tree(); - assertEquals("Wrong row count", 4, tree.rowCount()); + assertEquals("Wrong row count", 5, tree.rowCount()); assertTreeLineContent(tree, 0, "GeneralProject/.project"); - assertTreeLineContent(tree, 1, "GeneralProject/folder/test.txt"); - assertTreeLineContent(tree, 2, "GeneralProject/folder/test2.txt"); - assertTreeLineContent(tree, 3, "ProjectWithoutDotProject/.project"); + assertTreeLineContent(tree, 1, "GeneralProject/" + SETTINGS); + assertTreeLineContent(tree, 2, "GeneralProject/folder/test.txt"); + assertTreeLineContent(tree, 3, "GeneralProject/folder/test2.txt"); + assertTreeLineContent(tree, 4, "ProjectWithoutDotProject/.project"); commitDialog.bot().textWithLabel(UIText.CommitDialog_Author) .setText(TestUtil.TESTAUTHOR); @@ -100,6 +101,7 @@ public class CommitNonWSChangesTest extends LocalRepositoryTestCase { // wait until commit is completed Job.getJobManager().join(JobFamilies.COMMIT, null); String[] paths = { "ProjectWithoutDotProject/.project", + "ProjectWithoutDotProject/" + SETTINGS, "ProjectWithoutDotProject/folder/test.txt", "ProjectWithoutDotProject/folder/test2.txt" }; TestUtil.assertRepositoryContainsFiles(repository, paths); diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTest.java index 7cb02b8d13..63d7d4c7d3 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTest.java @@ -191,9 +191,9 @@ public class GitRepositoriesViewTest extends GitRepositoriesViewTestBase { bot.activeEditor().close(); refreshAndWait(); - // open a branch (checkout) - checkoutWithDoubleClick(tree, "master"); + // opening current branch is a no-op String contentMaster = getTestFileContent(); + // open a branch (checkout) checkoutWithDoubleClick(tree, "stable"); String contentStable = getTestFileContent(); assertNotEquals("Content of master and stable should differ", diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/AbstractSynchronizeViewTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/AbstractSynchronizeViewTest.java index 208a414777..3946ce539d 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/AbstractSynchronizeViewTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/AbstractSynchronizeViewTest.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; import java.io.File; import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -32,6 +33,7 @@ import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Path; @@ -203,14 +205,14 @@ public abstract class AbstractSynchronizeViewTest extends myRepository.create(); // we need to commit into master first - IProject firstProject = ResourcesPlugin.getWorkspace().getRoot() - .getProject(EMPTY_PROJECT); + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + IProject firstProject = workspace.getRoot().getProject(EMPTY_PROJECT); if (firstProject.exists()) { firstProject.delete(true, null); TestUtil.waitForJobs(100, 5000); } - IProjectDescription desc = ResourcesPlugin.getWorkspace() + IProjectDescription desc = workspace .newProjectDescription(EMPTY_PROJECT); desc.setLocation(new Path(new File(myRepository.getWorkTree(), EMPTY_PROJECT).getPath())); @@ -218,6 +220,10 @@ public abstract class AbstractSynchronizeViewTest extends firstProject.open(null); assertTrue("Project is not accessible: " + firstProject, firstProject.isAccessible()); + workspace.run( + m -> firstProject + .setDefaultCharset(StandardCharsets.UTF_8.name(), m), + firstProject, IWorkspace.AVOID_UPDATE, null); IFolder folder = firstProject.getFolder(FOLDER); folder.create(false, true, null); diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewGitChangeSetModelTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewGitChangeSetModelTest.java index 29f524dfa5..5f8accc67e 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewGitChangeSetModelTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewGitChangeSetModelTest.java @@ -175,7 +175,7 @@ public class SynchronizeViewGitChangeSetModelTest extends SWTBotTreeItem workingTree = getExpandedWorkingTreeItem(); SWTBotTreeItem projectTree = waitForNodeWithText(workingTree, EMPTY_PROJECT); - assertEquals(2, projectTree.getItems().length); + assertEquals(3, projectTree.getItems().length); SWTBotTreeItem folderTree = waitForNodeWithText(projectTree, FOLDER); assertEquals(2, folderTree.getItems().length); diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/clone/GitCloneSourceProviderExtensionTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/clone/GitCloneSourceProviderExtensionTest.java index 4e41dd7a04..a2c2da1f9d 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/clone/GitCloneSourceProviderExtensionTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/clone/GitCloneSourceProviderExtensionTest.java @@ -16,6 +16,8 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; import java.util.List; @@ -32,19 +34,32 @@ public class GitCloneSourceProviderExtensionTest { .getCloneSourceProvider(); assertThat(repositoryImports, is(notNullValue())); assertThat(repositoryImports.size(), is(4)); - assertThat(repositoryImports.get(1).getLabel(), - is("ServerWithoutPage1")); - assertThat(repositoryImports.get(1).hasFixLocation(), is(true)); - assertThat(repositoryImports.get(1).getRepositoryServerProvider(), - instanceOf(TestRepositoryServerProvider.class)); - assertThat(repositoryImports.get(2).getLabel(), is("TestServer")); - assertThat(repositoryImports.get(2).hasFixLocation(), is(false)); - assertThat(repositoryImports.get(2).getRepositoryServerProvider(), - instanceOf(TestRepositoryServerProvider.class)); - assertThat(repositoryImports.get(2).getRepositorySearchPage(), - instanceOf(TestRepositorySearchPage.class)); - assertThat(repositoryImports.get(3).getLabel(), - is("ServerWithoutPage2")); - assertThat(repositoryImports.get(3).hasFixLocation(), is(false)); + + for (CloneSourceProvider ri : repositoryImports) { + String label = ri.getLabel(); + switch (label) { + case "Clone URI": + assertThat(ri.hasFixLocation(), is(true)); + assertNull(ri.getRepositoryServerProvider()); + break; + case "ServerWithoutPage1": + assertThat(ri.hasFixLocation(), is(true)); + assertThat(ri.getRepositoryServerProvider(), + instanceOf(TestRepositoryServerProvider.class)); + break; + case "ServerWithoutPage2": + assertThat(ri.hasFixLocation(), is(false)); + break; + case "TestServer": + assertThat(ri.hasFixLocation(), is(false)); + assertThat(ri.getRepositoryServerProvider(), + instanceOf(TestRepositoryServerProvider.class)); + assertThat(ri.getRepositorySearchPage(), + instanceOf(TestRepositorySearchPage.class)); + break; + default: + fail("unexpected CloneSourceProvider " + label); + } + } } } diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/share/SharingWizardTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/share/SharingWizardTest.java index 393cdf2804..15046ebf27 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/share/SharingWizardTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/share/SharingWizardTest.java @@ -14,6 +14,8 @@ package org.eclipse.egit.ui.wizards.share; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -31,6 +33,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.QualifiedName; +import org.eclipse.egit.core.RepositoryCache; import org.eclipse.egit.core.RepositoryUtil; import org.eclipse.egit.core.op.DisconnectProviderOperation; import org.eclipse.egit.core.project.RepositoryMapping; @@ -45,7 +48,9 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.junit.MockSystemReader; import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.storage.file.FileRepositoryBuilder; import org.eclipse.jgit.util.FileUtils; import org.eclipse.jgit.util.SystemReader; @@ -157,6 +162,8 @@ public class SharingWizardTest extends LocalRepositoryTestCase { @Test public void shareProjectAndCreateRepo() throws Exception { + StoredConfig userConfig = SystemReader.getInstance().getUserConfig(); + userConfig.setString("init", null, "defaultBranch", "foobar"); createProject(projectName0); ExistingOrNewPage existingOrNewPage = sharingWizard .openWizard(projectName0); @@ -198,6 +205,14 @@ public class SharingWizardTest extends LocalRepositoryTestCase { .getPersistentProperty( new QualifiedName("org.eclipse.team.core", "repository"))); + Repository repository = RepositoryCache.INSTANCE + .getRepository(new File(repopath)); + assertNotNull(repository); + Ref head = repository.exactRef(Constants.HEAD); + assertNotNull(head); + assertTrue(head.isSymbolic()); + assertNull(head.getObjectId()); + assertEquals(Constants.R_HEADS + "foobar", head.getTarget().getName()); } @Test diff --git a/org.eclipse.egit.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.egit.ui/.settings/org.eclipse.jdt.core.prefs index 0689c41a36..764501283e 100644 --- a/org.eclipse.egit.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.egit.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jgit.annotations.NonNull @@ -18,6 +19,7 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.doc.comment.support=enabled org.eclipse.jdt.core.compiler.problem.APILeak=warning +org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=warning @@ -106,7 +108,7 @@ org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warni org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning diff --git a/org.eclipse.egit.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit.ui/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit.ui/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.ui/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit.ui/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit.ui/.settings/org.eclipse.pde.prefs b/org.eclipse.egit.ui/.settings/org.eclipse.pde.prefs index aab7cee96f..99e4c1ae6a 100644 --- a/org.eclipse.egit.ui/.settings/org.eclipse.pde.prefs +++ b/org.eclipse.egit.ui/.settings/org.eclipse.pde.prefs @@ -25,7 +25,7 @@ compilers.p.service.component.without.lazyactivation=1 compilers.p.unknown-attribute=1 compilers.p.unknown-class=1 compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 +compilers.p.unknown-identifier=0 compilers.p.unknown-resource=1 compilers.p.unresolved-ex-points=1 compilers.p.unresolved-import=0 diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF index a07a964036..3c9ca525f0 100644 --- a/org.eclipse.egit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.egit.ui/META-INF/MANIFEST.MF @@ -3,143 +3,143 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.egit.ui Bundle-SymbolicName: org.eclipse.egit.ui;singleton:=true -Bundle-Version: 6.3.0.qualifier +Bundle-Version: 6.8.0.qualifier Bundle-Activator: org.eclipse.egit.ui.Activator Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.19.0,4.0.0)", - org.eclipse.core.filesystem;bundle-version="[1.7.700,2.0.0)", - org.eclipse.core.resources;bundle-version="[3.13.800,4.0.0)", - org.eclipse.core.variables;bundle-version="[3.4.800,4.0.0)", - org.eclipse.core.expressions;bundle-version="[3.7.0,4.0.0)", - org.eclipse.ui;bundle-version="[3.118.0,4.0.0)", - org.eclipse.team.core;bundle-version="[3.8.1100,4.0.0)", - org.eclipse.team.ui;bundle-version="[3.8.1000,4.0.0)", - org.eclipse.jface.text;bundle-version="[3.16.400,4.0.0)", - org.eclipse.ui.ide;bundle-version="[3.17.200,4.0.0)", - org.eclipse.ui.workbench.texteditor;bundle-version="[3.15.0,4.0.0)", - org.eclipse.compare;bundle-version="[3.7.1100,4.0.0)", - org.eclipse.ui.editors;bundle-version="[3.13.300,4.0.0)", - org.eclipse.ui.navigator;bundle-version="[3.9.400,4.0.0)", - org.eclipse.ui.forms;bundle-version="[3.10.0,4.0.0)", - org.eclipse.equinox.security;bundle-version="[1.3.500,2.0.0)", - org.eclipse.help;bundle-version="[3.8.800,4.0.0)", - org.eclipse.search;bundle-version="[3.12.0,4.0.0)";resolution:=optional, - org.eclipse.debug.ui;bundle-version="[3.14.600,4.0.0)";resolution:=optional, - org.eclipse.jdt.core;bundle-version="[3.23.0,4.0.0)";resolution:=optional, - org.eclipse.jdt.ui;bundle-version="[3.21.200,4.0.0)";resolution:=optional, - org.eclipse.ui.views;bundle-version="[3.10.400,4.0.0)", - org.eclipse.osgi.services;bundle-version="[3.9.0,4.0.0)", - org.eclipse.e4.core.contexts;bundle-version="[1.8.400,2.0.0)", - org.eclipse.e4.core.services;bundle-version="[2.2.400,3.0.0)", - org.eclipse.e4.ui.workbench;bundle-version="[1.11.400,2.0.0)", - org.eclipse.ui.workbench;bundle-version="[3.120.0,4.0.0)" +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)", + org.eclipse.core.filesystem;bundle-version="[1.9.500,2.0.0)", + org.eclipse.core.resources;bundle-version="[3.18.100,4.0.0)", + org.eclipse.core.variables;bundle-version="[3.5.100,4.0.0)", + org.eclipse.core.expressions;bundle-version="[3.8.200,4.0.0)", + org.eclipse.ui;bundle-version="[3.201.200,4.0.0)", + org.eclipse.team.core;bundle-version="[3.9.600,4.0.0)", + org.eclipse.team.ui;bundle-version="[3.9.500,4.0.0)", + org.eclipse.jface.text;bundle-version="[3.22.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.20.0,4.0.0)", + org.eclipse.ui.workbench.texteditor;bundle-version="[3.16.600,4.0.0)", + org.eclipse.compare;bundle-version="[3.8.500,4.0.0)", + org.eclipse.ui.editors;bundle-version="[3.14.400,4.0.0)", + org.eclipse.ui.navigator;bundle-version="[3.10.400,4.0.0)", + org.eclipse.ui.forms;bundle-version="[3.11.500,4.0.0)", + org.eclipse.equinox.security;bundle-version="[1.3.1000,2.0.0)", + org.eclipse.help;bundle-version="[3.9.100,4.0.0)", + org.eclipse.search;bundle-version="[3.14.300,4.0.0)";resolution:=optional, + org.eclipse.debug.ui;bundle-version="[3.17.100,4.0.0)";resolution:=optional, + org.eclipse.jdt.core;bundle-version="[3.32.0,4.0.0)";resolution:=optional, + org.eclipse.jdt.ui;bundle-version="[3.27.100,4.0.0)";resolution:=optional, + org.eclipse.ui.views;bundle-version="[3.11.300,4.0.0)", + org.eclipse.osgi.services;bundle-version="[3.11.100,4.0.0)", + org.eclipse.e4.core.contexts;bundle-version="[1.11.0,2.0.0)", + org.eclipse.e4.core.services;bundle-version="[2.3.400,3.0.0)", + org.eclipse.e4.ui.workbench;bundle-version="[1.14.0,2.0.0)", + org.eclipse.ui.workbench;bundle-version="[3.127.0,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.egit.core;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.attributes;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.credentials;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.info;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.internal;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.internal.credentials;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.internal.efs;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.internal.gerrit;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.internal.hosts;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.internal.indexdiff;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.internal.info;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.internal.job;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.internal.rebase;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.internal.signing;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.internal.storage;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.internal.util;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.op;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.project;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.settings;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.synchronize;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.synchronize.dto;version="[6.3.0,6.4.0)", - org.eclipse.egit.core.util;version="[6.3.0,6.4.0)", - org.eclipse.jgit.annotations;version="[6.3.0,6.4.0)", - org.eclipse.jgit.api;version="[6.3.0,6.4.0)", - org.eclipse.jgit.api.errors;version="[6.3.0,6.4.0)", - org.eclipse.jgit.attributes;version="[6.3.0,6.4.0)", - org.eclipse.jgit.blame;version="[6.3.0,6.4.0)", - org.eclipse.jgit.diff;version="[6.3.0,6.4.0)", - org.eclipse.jgit.dircache;version="[6.3.0,6.4.0)", - org.eclipse.jgit.errors;version="[6.3.0,6.4.0)", - org.eclipse.jgit.events;version="[6.3.0,6.4.0)", - org.eclipse.jgit.ignore;version="[6.3.0,6.4.0)", - org.eclipse.jgit.internal.diffmergetool;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lib;version="[6.3.0,6.4.0)", - org.eclipse.jgit.lib.internal;version="[6.3.0,6.4.0)", - org.eclipse.jgit.merge;version="[6.3.0,6.4.0)", - org.eclipse.jgit.notes;version="[6.3.0,6.4.0)", - org.eclipse.jgit.revplot;version="[6.3.0,6.4.0)", - org.eclipse.jgit.revwalk;version="[6.3.0,6.4.0)", - org.eclipse.jgit.revwalk.filter;version="[6.3.0,6.4.0)", - org.eclipse.jgit.storage.file;version="[6.3.0,6.4.0)", - org.eclipse.jgit.submodule;version="[6.3.0,6.4.0)", - org.eclipse.jgit.transport;version="[6.3.0,6.4.0)", - org.eclipse.jgit.transport.sshd.agent;version="[6.3.0,6.4.0)", - org.eclipse.jgit.treewalk;version="[6.3.0,6.4.0)", - org.eclipse.jgit.treewalk.filter;version="[6.3.0,6.4.0)", - org.eclipse.jgit.util;version="[6.3.0,6.4.0)", - org.eclipse.jgit.util.io;version="[6.3.0,6.4.0)" -Export-Package: org.eclipse.egit.ui;version="6.3.0";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.history;version="6.3.0", - org.eclipse.egit.ui.internal;version="6.3.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal.actions;version="6.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.blame;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.branch;version="6.3.0";x-friends:="org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal.clean;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.clone;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.commands.shared;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.commit;version="6.3.0";x-friends:="org.eclipse.egit.mylyn.ui,org.eclipse.egit.gitflow.ui,org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal.commit.command;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.components;version="6.3.0";x-friends:="org.eclipse.mylyn.github.ui,org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.credentials;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.decorators;version="6.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.dialogs;version="6.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.expressions;version="6.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.factories;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.fetch;version="6.3.0";x-friends:="org.eclipse.mylyn.github.ui", - org.eclipse.egit.ui.internal.gerrit;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.groups;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.handler;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.history;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.history.command;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.importing;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.jobs;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.merge;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.operations;version="6.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.patch;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.preferences;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.properties;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.provisional.wizards;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.pull;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.push;version="6.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.rebase;version="6.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.reflog;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.reflog.command;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree;version="6.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.repository.tree.command;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.repository.tree.filter;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.resources;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.revision;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.search;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.selection;version="6.3.0";x-friends:="org.eclipse.egit.gitflow.ui", - org.eclipse.egit.ui.internal.sharing;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.staging;version="6.3.0";x-friends:="org.eclipse.egit.mylyn.ui", - org.eclipse.egit.ui.internal.stash;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.submodule;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.action;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.compare;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.mapping;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.synchronize.model;version="6.3.0";x-friends:="org.eclipse.egit.mylyn.ui", - org.eclipse.egit.ui.internal.trace;version="6.3.0";x-internal:=true, - org.eclipse.egit.ui.internal.variables;version="6.3.0";x-internal:=true +Import-Package: org.eclipse.egit.core;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.attributes;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.credentials;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.info;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.internal;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.internal.credentials;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.internal.efs;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.internal.gerrit;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.internal.hosts;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.internal.indexdiff;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.internal.info;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.internal.job;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.internal.rebase;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.internal.signing;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.internal.storage;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.internal.util;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.op;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.project;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.settings;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.synchronize;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.synchronize.dto;version="[6.8.0,6.9.0)", + org.eclipse.egit.core.util;version="[6.8.0,6.9.0)", + org.eclipse.jgit.annotations;version="[6.8.0,6.9.0)", + org.eclipse.jgit.api;version="[6.8.0,6.9.0)", + org.eclipse.jgit.api.errors;version="[6.8.0,6.9.0)", + org.eclipse.jgit.attributes;version="[6.8.0,6.9.0)", + org.eclipse.jgit.blame;version="[6.8.0,6.9.0)", + org.eclipse.jgit.diff;version="[6.8.0,6.9.0)", + org.eclipse.jgit.dircache;version="[6.8.0,6.9.0)", + org.eclipse.jgit.errors;version="[6.8.0,6.9.0)", + org.eclipse.jgit.events;version="[6.8.0,6.9.0)", + org.eclipse.jgit.ignore;version="[6.8.0,6.9.0)", + org.eclipse.jgit.internal.diffmergetool;version="[6.8.0,6.9.0)", + org.eclipse.jgit.lib;version="[6.8.0,6.9.0)", + org.eclipse.jgit.lib.internal;version="[6.8.0,6.9.0)", + org.eclipse.jgit.merge;version="[6.8.0,6.9.0)", + org.eclipse.jgit.notes;version="[6.8.0,6.9.0)", + org.eclipse.jgit.revplot;version="[6.8.0,6.9.0)", + org.eclipse.jgit.revwalk;version="[6.8.0,6.9.0)", + org.eclipse.jgit.revwalk.filter;version="[6.8.0,6.9.0)", + org.eclipse.jgit.storage.file;version="[6.8.0,6.9.0)", + org.eclipse.jgit.submodule;version="[6.8.0,6.9.0)", + org.eclipse.jgit.transport;version="[6.8.0,6.9.0)", + org.eclipse.jgit.transport.sshd.agent;version="[6.8.0,6.9.0)", + org.eclipse.jgit.treewalk;version="[6.8.0,6.9.0)", + org.eclipse.jgit.treewalk.filter;version="[6.8.0,6.9.0)", + org.eclipse.jgit.util;version="[6.8.0,6.9.0)", + org.eclipse.jgit.util.io;version="[6.8.0,6.9.0)" +Export-Package: org.eclipse.egit.ui;version="6.8.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.history;version="6.8.0", + org.eclipse.egit.ui.internal;version="6.8.0";x-friends:="org.eclipse.egit.import,org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.actions;version="6.8.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.blame;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.branch;version="6.8.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.clean;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.clone;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.commands.shared;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.commit;version="6.8.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.commit.command;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.components;version="6.8.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.credentials;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.decorators;version="6.8.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.dialogs;version="6.8.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.expressions;version="6.8.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.factories;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.fetch;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.gerrit;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.groups;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.handler;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.history;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.history.command;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.importing;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.jobs;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.merge;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.operations;version="6.8.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.patch;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.preferences;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.properties;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.provisional.wizards;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.pull;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.push;version="6.8.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.rebase;version="6.8.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.reflog;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.reflog.command;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree;version="6.8.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.repository.tree.command;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.repository.tree.filter;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.resources;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.revision;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.search;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.selection;version="6.8.0";x-friends:="org.eclipse.egit.gitflow.ui", + org.eclipse.egit.ui.internal.sharing;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.staging;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.stash;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.submodule;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.action;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.compare;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.mapping;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.synchronize.model;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.trace;version="6.8.0";x-internal:=true, + org.eclipse.egit.ui.internal.variables;version="6.8.0";x-internal:=true Service-Component: OSGI-INF/org.eclipse.egit.ui.internal.ApplicationActiveListener.xml, OSGI-INF/org.eclipse.egit.ui.internal.ConfigurationChecker$Checker.xml, OSGI-INF/org.eclipse.egit.ui.internal.ExternalRepositoryScanner.xml, diff --git a/org.eclipse.egit.ui/plugin.properties b/org.eclipse.egit.ui/plugin.properties index 3dba44c73b..9ca6686efd 100644 --- a/org.eclipse.egit.ui/plugin.properties +++ b/org.eclipse.egit.ui/plugin.properties @@ -88,6 +88,7 @@ SynchronizePreferencePage_keywords = git egit synchronize fetch commit models me GitServersPreferencePage_keywords = git egit server github gitlab gitea HistoryPreferencePage_keywords = git egit history branches tags refs notes rename revision comment date author committer diff first parent signing signed signature HistoryColumnsPreferencePage_keywords = git egit history columns id author committer date +DiffPreferencePage_keywords = git egit diff merge compare GitActions_label=Git GitActions_description = Git commands in workbench toolbar and menu diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml index cbd0c0b4de..b038b13396 100644 --- a/org.eclipse.egit.ui/plugin.xml +++ b/org.eclipse.egit.ui/plugin.xml @@ -711,6 +711,10 @@ label="%GitPreferences_keywords"> </keyword> <keyword + id="org.eclipse.egit.ui.DiffPreferencePage" + label="%DiffPreferencePage_keywords"> + </keyword> + <keyword id="org.eclipse.egit.ui.internal.preferences.ProjectsPreferencePage" label="%ProjectsPreferencePage_keywords"> </keyword> @@ -6308,45 +6312,31 @@ </menu> </menuContribution> <menuContribution - locationURI="popup:#AbstractTextEditorRulerContext?after=QuickDiff.Toggle"> + locationURI="popup:#AbstractTextEditorRulerContext?before=Linenumbers.Toggle"> <command commandId="org.eclipse.egit.ui.team.ShowBlame" label="%ShowBlameAction_label" style="push"> - <visibleWhen - checkEnabled="false"> - <with - variable="activeEditorInput"> - <adapt - type="org.eclipse.core.resources.IFile"> - <test - property="GitResource.isShared" /> - </adapt> - </with> + <visibleWhen checkEnabled="false"> + <and> + <with variable="activeEditorInput"> + <or> + <adapt type="org.eclipse.core.resources.IFile"> + <test property="GitResource.isShared" /> + </adapt> + <adapt type="org.eclipse.team.core.history.IFileRevision"> + <instanceof value="org.eclipse.egit.core.internal.storage.CommitFileRevision" /> + </adapt> + </or> + </with> + <with variable="activeEditor"> + <test property="org.eclipse.egit.ui.EditorProperty.canShowRevisions" args="notAlready" /> + </with> + </and> </visibleWhen> </command> </menuContribution> <menuContribution - locationURI="popup:#AbstractTextEditorRulerContext?after=rulers"> - <command - commandId="org.eclipse.egit.ui.team.ShowBlame" - label="%ShowBlameAction_label" - style="push"> - <visibleWhen - checkEnabled="false"> - <with - variable="activeEditorInput"> - <adapt - type="org.eclipse.team.core.history.IFileRevision"> - <instanceof - value="org.eclipse.egit.core.internal.storage.CommitFileRevision"> - </instanceof> - </adapt> - </with> - </visibleWhen> - </command> - </menuContribution> - <menuContribution allPopups="false" locationURI="popup:team.main?after=group8"> <command @@ -7187,6 +7177,14 @@ properties="isBundleInstalled" type="java.util.Collection"> </propertyTester> + <propertyTester + class="org.eclipse.egit.ui.internal.expressions.EditorPropertyTester" + id="org.eclipse.egit.ui.EditorPropertyTester" + namespace="org.eclipse.egit.ui.EditorProperty" + properties="canShowRevisions" + type="org.eclipse.ui.IEditorPart"> + <!-- Type cannot be restricted to text editors because of multi-page editors. --> + </propertyTester> </extension> <extension id="changeSetModel" @@ -7941,40 +7939,6 @@ </variablePresentation> </extension> <extension - point="org.eclipse.mylyn.tasks.bugs.support"> - <product - description="%support.egit.description" - id="org.eclipse.egit" - name="%support.egit.name" - icon="icons/egit.png" - providerId="org.eclipse" - url="https://www.eclipse.org/egit"/> - <mapping namespace="org.eclipse.egit.ui" productId="org.eclipse.egit"> - <property name="product" value="EGit"/> - <property name="component" value="UI"/> - </mapping> - <mapping namespace="org.eclipse.egit.core" productId="org.eclipse.egit"> - <property name="product" value="EGit"/> - <property name="component" value="Core"/> - </mapping> - <mapping namespace="org.eclipse.egit.mylyn" productId="org.eclipse.egit"> - <property name="product" value="EGit"/> - <property name="component" value="Mylyn"/> - </mapping> - <mapping namespace="org.eclipse.egit.github" productId="org.eclipse.egit"> - <property name="product" value="EGit"/> - <property name="component" value="GitHub"/> - </mapping> - <mapping namespace="org.eclipse.egit.mylyn.internal.github" productId="org.eclipse.egit"> - <property name="product" value="EGit"/> - <property name="component" value="GitHub"/> - </mapping> - <mapping namespace="org.eclipse.egit.gitflow" productId="org.eclipse.egit"> - <property name="product" value="EGit"/> - <property name="component" value="Gitflow"/> - </mapping> - </extension> - <extension point="org.eclipse.egit.ui.cloneSourceProvider"> <source hasFixLocation="true" diff --git a/org.eclipse.egit.ui/pom.xml b/org.eclipse.egit.ui/pom.xml index d39bdfe5a3..988483f364 100644 --- a/org.eclipse.egit.ui/pom.xml +++ b/org.eclipse.egit.ui/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> + <version>6.8.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit.ui</artifactId> diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java index 3c1e171237..3c1e171237 100755..100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/Activator.java diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java index 77c4f4a671..dcb33ba43f 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIUtils.java @@ -838,13 +838,8 @@ public class UIUtils { Event event) { try { service.executeCommand(id, event); - } catch (ExecutionException e) { - Activator.handleError(e.getMessage(), e, false); - } catch (NotDefinedException e) { - Activator.handleError(e.getMessage(), e, false); - } catch (NotEnabledException e) { - Activator.handleError(e.getMessage(), e, false); - } catch (NotHandledException e) { + } catch (ExecutionException | NotDefinedException | NotEnabledException + | NotHandledException e) { Activator.handleError(e.getMessage(), e, false); } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java index 3ce45a39bd..78301070b7 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/CompareUtils.java @@ -21,23 +21,33 @@ package org.eclipse.egit.ui.internal; import java.io.ByteArrayInputStream; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.file.Files; import java.time.Instant; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Objects; import java.util.Optional; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.eclipse.compare.CompareEditorInput; import org.eclipse.compare.CompareUI; import org.eclipse.compare.IContentChangeListener; import org.eclipse.compare.IContentChangeNotifier; import org.eclipse.compare.ITypedElement; +import org.eclipse.compare.internal.CompareAction; import org.eclipse.compare.internal.ComparePreferencePage; import org.eclipse.compare.internal.CompareUIPlugin; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; @@ -45,14 +55,17 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener; import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent; import org.eclipse.core.runtime.preferences.InstanceScope; +import org.eclipse.egit.core.EclipseGitProgressTransformer; import org.eclipse.egit.core.attributes.Filtering; import org.eclipse.egit.core.internal.CompareCoreUtils; +import org.eclipse.egit.core.internal.efs.HiddenResources; import org.eclipse.egit.core.internal.storage.GitFileRevision; import org.eclipse.egit.core.internal.storage.WorkingTreeFileRevision; import org.eclipse.egit.core.internal.storage.WorkspaceFileRevision; @@ -71,8 +84,17 @@ import org.eclipse.egit.ui.internal.synchronize.GitSynchronizer; import org.eclipse.egit.ui.internal.synchronize.ModelAwareGitSynchronizer; import org.eclipse.egit.ui.internal.synchronize.compare.LocalNonWorkspaceTypedElement; import org.eclipse.jface.action.Action; +import org.eclipse.jface.action.IAction; import org.eclipse.jface.util.OpenStrategy; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.api.errors.CanceledException; +import org.eclipse.jgit.diff.DiffConfig; +import org.eclipse.jgit.diff.DiffEntry; +import org.eclipse.jgit.diff.DiffEntry.ChangeType; +import org.eclipse.jgit.diff.RenameDetector; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheCheckout.CheckoutMetadata; import org.eclipse.jgit.dircache.DirCacheEditor; @@ -84,6 +106,7 @@ import org.eclipse.jgit.internal.diffmergetool.FileElement.Type; import org.eclipse.jgit.internal.diffmergetool.PromptContinueHandler; import org.eclipse.jgit.internal.diffmergetool.ToolException; import org.eclipse.jgit.internal.diffmergetool.UserDefinedDiffTool; +import org.eclipse.jgit.lib.AbbreviatedObjectId; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.CoreConfig.AutoCRLF; import org.eclipse.jgit.lib.CoreConfig.EolStreamType; @@ -95,6 +118,7 @@ import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.internal.BooleanTriState; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.treewalk.AbstractTreeIterator; import org.eclipse.jgit.treewalk.FileTreeIterator; import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.treewalk.TreeWalk.OperationType; @@ -114,10 +138,13 @@ import org.eclipse.team.ui.synchronize.SaveableCompareEditorInput; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorReference; +import org.eclipse.ui.IPartListener; import org.eclipse.ui.IReusableEditor; import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction; +import org.eclipse.ui.part.EditorPart; /** * A collection of helper methods useful for comparing content @@ -465,15 +492,14 @@ public class CompareUtils { }); } } catch (ToolException e) { - ToolsUtils.informUserAboutError( - UIText.CompareUtils_ExternalDiffToolDied - + changedFilePath, - e.getMessage()); + return Activator.createErrorStatus( + NLS.bind(UIText.CompareUtils_ExternalDiffToolDied, + changedFilePath), + e); } catch (CoreException e) { - ToolsUtils.informUserAboutError( - UIText.CompareUtils_DiffToolExecutionFailed - + changedFilePath, - e.getMessage()); + return Activator.createErrorStatus(NLS.bind( + UIText.CompareUtils_DiffToolExecutionFailed, + changedFilePath), e); } return Status.OK_STATUS; } @@ -595,7 +621,11 @@ public class CompareUtils { RepositoryMapping mapping = RepositoryMapping.getMapping(file); if (mapping == null) { Activator.error(NLS.bind(UIText.GitHistoryPage_errorLookingUpPath, - file.getLocation(), repository), null); + file.getLocation(), repository), + new IOException(NLS.bind( + UIText.CompareUtils_errorNotShared, + file.getFullPath(), + file.getProject().getName()))); return; } String path = mapping.getRepoRelativePath( @@ -658,7 +688,11 @@ public class CompareUtils { if (mapping == null) { return Activator.createErrorStatus( NLS.bind(UIText.GitHistoryPage_errorLookingUpPath, - location, repository)); + location, repository), + new IOException( + NLS.bind(UIText.CompareUtils_errorNotShared, + file.getFullPath(), + file.getProject().getName()))); } final ITypedElement base; @@ -671,7 +705,7 @@ public class CompareUtils { } else { return Activator.createErrorStatus( NLS.bind(UIText.CompareUtils_wrongResourceArgument, - location, file)); + file)); } final String gitPath = mapping.getRepoRelativePath(file); @@ -967,7 +1001,172 @@ public class CompareUtils { */ public static void compareBetween(Repository repository, String gitPath, String leftRev, String rightRev, IWorkbenchPage page) { - compareBetween(repository, gitPath, gitPath, leftRev, rightRev, page); + compareBetween(repository, gitPath, null, leftRev, rightRev, page); + } + + private static class DeleteView extends DiffEntry { + + private static final AbbreviatedObjectId A_ZERO = AbbreviatedObjectId + .fromObjectId(ObjectId.zeroId()); + + public DeleteView(DiffEntry modify) { + this.changeType = ChangeType.DELETE; + this.diffAttribute = modify.getDiffAttribute(); + this.newId = A_ZERO; + this.newPath = DiffEntry.DEV_NULL; + this.newMode = FileMode.MISSING; + this.oldId = modify.getOldId(); + this.oldPath = modify.getOldPath(); + this.oldMode = modify.getOldMode(); + } + } + + /** + * Finds the name of {@code gitPath} in {@code oldRev}. If {@code oldRev} is + * a direct parent of {@code newRev}, runs a rename detection for the single + * path {@code gitPath} to discover the name. If no name can be determined, + * or if {@code gitPath} exists in the old revision, or {@code oldRev} is + * not a direct parent of {@code newRev}, returns {@code gitPath}. + * + * @param repository + * {@link Repository} to work in + * @param newRev + * new revision, may be {@link GitFileRevision#INDEX} to denote + * the index + * @param oldRev + * new revision, may be {@link GitFileRevision#INDEX} to denote + * the index + * @param gitPath + * git path in {@code newRev} to find a path for in + * {@code oldRev} + * @param progress + * for progress reporting and cancellation, may be {@code null} + * @return a path corresponding to {@code gitPath} in {@code oldRev} + */ + private static String findRename(Repository repository, String newRev, + String oldRev, String gitPath, IProgressMonitor progress) { + try { + AbstractTreeIterator newTree = null; + RevCommit newCommit = null; + DirCache index = null; + if (GitFileRevision.INDEX.equals(newRev)) { + index = repository.readDirCache(); + newTree = new DirCacheIterator(index); + } else { + ObjectId newOid = repository.resolve(newRev); + if (newOid == null) { + return gitPath; + } + newCommit = repository.parseCommit(newOid); + } + AbstractTreeIterator oldTree = null; + RevCommit oldCommit = null; + if (GitFileRevision.INDEX.equals(oldRev)) { + if (index == null) { + index = repository.readDirCache(); + } + oldTree = new DirCacheIterator(index); + } else { + ObjectId oldId = repository.resolve(oldRev); + if (oldId == null) { + return gitPath; + } + oldCommit = repository.parseCommit(oldId); + } + // Only for INDEX vs. HEAD, or if oldRev turns out to be a direct + // parent of newRev + if ((GitFileRevision.INDEX.equals(newRev) + && Constants.HEAD.equals(oldRev)) + || isParent(oldCommit, newCommit)) { + try (TreeWalk walk = new TreeWalk(repository)) { + walk.setFilter(PathFilterGroup.createFromStrings(gitPath)); + walk.setRecursive(true); + if (oldCommit != null) { + walk.addTree(oldCommit.getTree()); + } else { + walk.addTree(oldTree); + } + if (walk.next()) { + // gitPath exists in the old revision. + return gitPath; + } + // gitPath not in old revision. Run rename detection for + // additions. + walk.reset(); + walk.setFilter(TreeFilter.ANY_DIFF); + if (oldCommit != null) { + walk.addTree(oldCommit.getTree()); + } else { + walk.addTree(oldTree); + } + if (newCommit != null) { + walk.addTree(newCommit.getTree()); + } else { + walk.addTree(newTree); + } + walk.setRecursive(true); + List<DiffEntry> diffs = DiffEntry.scan(walk); + RenameDetector renameDetector = new RenameDetector( + walk.getObjectReader(), + repository.getConfig().get(DiffConfig.KEY)); + // We're only interested in one particular path, and it's an + // addition. Changing MODIFY to DELETE means doing copy + // detection, too. (The standard way inside the rename + // detector would split MODIFY into a DELETE and an ADD, but + // we don't want these extra ADDs.) + List<DiffEntry> filtered = diffs.stream() + .map(d -> { + switch (d.getChangeType()) { + case ADD: + if (d.getNewPath().equals(gitPath)) { + return d; + } + // We're not interested in any other + // additions. + break; + case DELETE: + return d; + case MODIFY: + return new DeleteView(d); + default: + break; + } + return null; + }).filter(Objects::nonNull) + .collect(Collectors.toList()); + renameDetector.reset(); + renameDetector.addAll(filtered); + EclipseGitProgressTransformer monitor = new EclipseGitProgressTransformer( + progress); + List<DiffEntry> renamed = renameDetector.compute(monitor); + for (DiffEntry ent : renamed) { + if (isRename(ent) + && ent.getNewPath().equals(gitPath)) { + return ent.getOldPath(); + } + } + } + } + } catch (CanceledException e) { + // From the RenameDetector; ignore + } catch (IOException e) { + Activator.logError( + NLS.bind(UIText.CompareUtils_errorRenameDetection, gitPath), + e); + } + return gitPath; + } + + private static boolean isParent(RevCommit old, RevCommit newCommit) { + if (old == null || newCommit == null) { + return false; + } + return Stream.of(newCommit.getParents()).anyMatch(p -> p.equals(old)); + } + + private static boolean isRename(DiffEntry ent) { + return ChangeType.RENAME.equals(ent.getChangeType()) + || ChangeType.COPY.equals(ent.getChangeType()); } /** @@ -980,7 +1179,9 @@ public class CompareUtils { * The repository relative path to be used for the left revision. * @param rightGitPath * The repository relative path to be used for the right - * revision. + * revision. If {@code null}, a rename detection may be run to + * try to determine it; if none found, {@code leftGitPath} is + * used. * @param leftRev * Left revision of the comparison (usually the local or "new" * revision). Won't be used if <code>includeLocal</code> is @@ -988,13 +1189,12 @@ public class CompareUtils { * @param rightRev * Right revision of the comparison (usually the "old" revision). * @param page - * If not {@null} try to re-use a compare editor on this - * page if any is available. Otherwise open a new one. + * If not {@null} try to re-use a compare editor on this page if + * any is available. Otherwise open a new one. */ - public static void compareBetween(final Repository repository, - final String leftGitPath, final String rightGitPath, - final String leftRev, final String rightRev, - final IWorkbenchPage page) { + public static void compareBetween(Repository repository, String leftGitPath, + String rightGitPath, String leftRev, String rightRev, + IWorkbenchPage page) { Job job = new Job(UIText.CompareUtils_jobName) { @@ -1003,12 +1203,22 @@ public class CompareUtils { if (monitor.isCanceled()) { return Status.CANCEL_STATUS; } + String rightPath = rightGitPath; + if (rightGitPath == null) { + // Run a Diff with rename detection for the path to + // determine the path in the right rev. + rightPath = findRename(repository, leftRev, rightRev, + leftGitPath, monitor); + if (monitor.isCanceled()) { + return Status.CANCEL_STATUS; + } + } + final ITypedElement left; final ITypedElement right; try { left = getTypedElementFor(repository, leftGitPath, leftRev); - right = getTypedElementFor(repository, rightGitPath, - rightRev); + right = getTypedElementFor(repository, rightPath, rightRev); } catch (IOException e) { return Activator.createErrorStatus( UIText.CompareWithRefAction_errorOnSynchronize, e); @@ -1018,7 +1228,7 @@ public class CompareUtils { && !GitFileRevision.INDEX.equals(leftRev) && !GitFileRevision.INDEX.equals(rightRev)) { commonAncestor = getTypedElementForCommonAncestor( - repository, rightGitPath, leftRev, rightRev); + repository, rightPath, leftRev, rightRev); } else { commonAncestor = null; } @@ -1038,6 +1248,181 @@ public class CompareUtils { job.schedule(); } + /** + * Compares two arbitrary files in a git working tree. + * + * @param aFile + * first {@link IFile} to compare, may be {@code null} if the + * file is not in the Eclipse workspace + * @param bFile + * second {@link IFile} to compare, may be {@code null} if the + * file is not in the Eclipse workspace + * @param a + * {@link File} corresponding to the first file; used if + * {@code aFile == null} + * @param b + * {@link File} corresponding to the second file; used if + * {@code bFile == null} + * @param sourcePart + * {@link IWorkbenchPart} the comparison is initiated in + */ + public static void compareFiles(IFile aFile, IFile bFile, File a, File b, + IWorkbenchPart sourcePart) { + // This is a gruesome hack, but unfortunately org.eclipse.compare + // has _no_ public method or other way to compare two resources. + // It also has no command to do so, only an action that is implemented + // in an internal class and that uses a CompareEditorInput that is + // package-visible only. + // + // Looks like a major oversight. So we use that internal action class + // that does what we want, and configure it so it works. + List<IFile> toDelete = new ArrayList<>(); + // Hidden resources are exactly the mechanism used by + // org.eclipse.compare.internal.CompareWithOtherResourceHandler. But + // that command is also internal, and it always opens a dialog that we + // neither need nor want. + IFile aTmp = aFile; + IFile bTmp = bFile; + try { + if (aTmp == null) { + aTmp = HiddenResources.INSTANCE.createFile(a.toURI(), + a.getName(), null, null); + toDelete.add(aTmp); + } + if (bTmp == null) { + bTmp = HiddenResources.INSTANCE.createFile(b.toURI(), + b.getName(), null, null); + toDelete.add(bTmp); + } + } catch (CoreException e) { + Activator.logError(UIText.CompareUtils_errorHiddenResourceCreate, + e); + cleanHiddenResources(toDelete); + return; + } + @SuppressWarnings("restriction") + class CompareWithEachOther extends CompareAction { + + @Override + public void run(ISelection selection) { + if (isEnabled(selection)) { + if (!toDelete.isEmpty()) { + CompareEditorInput input = fInput; + fWorkbenchPage.addPartListener(new IPartListener() { + + private final IWorkbenchPage page = fWorkbenchPage; + + private IWorkbenchPart compareEditor; + + @Override + public void partActivated(IWorkbenchPart part) { + if ((part instanceof EditorPart) + && ((EditorPart) part) + .getEditorInput() == input) { + compareEditor = part; + } + } + + @Override + public void partBroughtToTop(IWorkbenchPart part) { + // Nothing + } + + @Override + public void partClosed(IWorkbenchPart part) { + if (part != null && part == compareEditor) { + cleanHiddenResources(toDelete); + page.removePartListener(this); + } + } + + @Override + public void partDeactivated(IWorkbenchPart part) { + // Nothing + } + + @Override + public void partOpened(IWorkbenchPart part) { + // Nothing + } + + }); + } + super.run(selection); + } else { + cleanHiddenResources(toDelete); + } + } + + @Override + public void setActivePart(IAction action, + IWorkbenchPart targetPart) { + super.setActivePart(action, targetPart); + } + } + CompareWithEachOther compare = new CompareWithEachOther(); + compare.setActivePart(null, sourcePart); + IStructuredSelection selection = new StructuredSelection( + List.of(aTmp, bTmp)); + compare.run(selection); + } + + /** + * Removes hidden resources. + * + * @param toClean + * hidden {@link IFile}s to remove + */ + public static void cleanHiddenResources(Collection<IFile> toClean) { + if (toClean == null || toClean.isEmpty()) { + return; + } + // Don't clean up if the workbench is shutting down; we would exit with + // unsaved workspace changes. Instead, EGit core cleans the project on + // start. + Job job = new Job(UIText.CompareUtils_ResourceCleanupJobName) { + + @Override + public boolean shouldSchedule() { + return super.shouldSchedule() + && !PlatformUI.getWorkbench().isClosing(); + } + + @Override + public boolean shouldRun() { + return super.shouldRun() + && !PlatformUI.getWorkbench().isClosing(); + } + + @Override + protected IStatus run(IProgressMonitor monitor) { + IWorkspaceRunnable remove = m -> { + SubMonitor progress = SubMonitor.convert(m, toClean.size()); + for (IFile tmp : toClean) { + if (PlatformUI.getWorkbench().isClosing()) { + return; + } + try { + tmp.delete(true, progress.newChild(1)); + } catch (CoreException e) { + // Ignore + } + } + }; + try { + ResourcesPlugin.getWorkspace().run(remove, null, + IWorkspace.AVOID_UPDATE, monitor); + } catch (CoreException e) { + return e.getStatus(); + } + return Status.OK_STATUS; + } + }; + job.setSystem(true); + job.setUser(false); + job.schedule(); + } + private static String getRepoRelativePath(@NonNull IPath location, @NonNull Repository repository) { IPath repoRoot = new Path(repository.getWorkTree().getPath()); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/SecureStoreUtils.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/SecureStoreUtils.java index 536aa26a87..89ba06f83d 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/SecureStoreUtils.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/SecureStoreUtils.java @@ -37,12 +37,7 @@ public class SecureStoreUtils { try { org.eclipse.egit.core.Activator.getDefault() .getCredentialsStore().putCredentials(uri, credentials); - } catch (StorageException e) { - Activator.handleError(MessageFormat.format( - UIText.SecureStoreUtils_writingCredentialsFailed, uri), - e, true); - return false; - } catch (IOException e) { + } catch (StorageException | IOException e) { Activator.handleError(MessageFormat.format( UIText.SecureStoreUtils_writingCredentialsFailed, uri), e, true); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/ToolsUtils.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/ToolsUtils.java index 54d73dc3b4..378639709a 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/ToolsUtils.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/ToolsUtils.java @@ -45,10 +45,6 @@ package org.eclipse.egit.ui.internal; import java.util.concurrent.atomic.AtomicInteger; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.egit.core.Activator; -import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; @@ -85,22 +81,6 @@ public class ToolsUtils { } /** - * @param textHeader - * @param message - */ - public static void informUserAboutError(String textHeader, String message) { - IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, - message); - Runnable runnable = () -> ErrorDialog.openError(null, textHeader, - null, status); - if (Display.getCurrent() == null) { - PlatformUI.getWorkbench().getDisplay().asyncExec(runnable); - } else { - runnable.run(); - } - } - - /** * Inform the user about something * * @param textHeader diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java index 0043861698..bd36b8d684 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java @@ -1207,6 +1207,9 @@ public class UIText extends NLS { public static String RepositoryPropertySource_SystemConfigurationMenu; /** */ + public static String RepositoryPropertySource_XdgConfigurationMenu; + + /** */ public static String RepositoryPropertySource_SelectModeTooltip; /** */ @@ -1447,18 +1450,6 @@ public class UIText extends NLS { public static String CompareTreeView_CompareModeTooltip; /** */ - public static String CompareUtils_DiffToolExecutionFailed; - - /** */ - public static String CompareUtils_errorGettingEncoding; - - /** */ - public static String CompareUtils_errorGettingHeadCommit; - - /** */ - public static String CompareUtils_wrongResourceArgument; - - /** */ public static String MergeHandler_MergeBranchDialogButton; /** */ @@ -2365,6 +2356,12 @@ public class UIText extends NLS { public static String PushBranchWizard_pushButton; /** */ + public static String PushCommitHandler_pushBranchLabel; + + /** */ + public static String PushCommitHandler_pushCommitLabel; + + /** */ public static String PushCommitHandler_pushCommitTitle; /** */ @@ -2695,6 +2692,9 @@ public class UIText extends NLS { public static String GlobalConfigurationPreferencePage_systemSettingTabTitle; /** */ + public static String GlobalConfigurationPreferencePage_userSettingLabel; + + /** */ public static String GlobalConfigurationPreferencePage_userSettingTabTitle; /** */ @@ -2785,12 +2785,30 @@ public class UIText extends NLS { public static String CompareWithPreviousActionHandler_TitleRevisionNotFound; /** */ - public static String CompareUtils_jobName; + public static String CompareUtils_DiffToolExecutionFailed; /** */ public static String CompareUtils_errorCommonAncestor; /** */ + public static String CompareUtils_errorGettingEncoding; + + /** */ + public static String CompareUtils_errorGettingHeadCommit; + + /** */ + public static String CompareUtils_errorHiddenResourceCreate; + + /** */ + public static String CompareUtils_errorHiddenResourceDelete; + + /** */ + public static String CompareUtils_errorNotShared; + + /** */ + public static String CompareUtils_errorRenameDetection; + + /** */ public static String CompareUtils_ExecutingExtDiffTool; /** */ @@ -2800,12 +2818,21 @@ public class UIText extends NLS { public static String CompareUtils_GitConfigurationErrorText; /** */ + public static String CompareUtils_jobName; + + /** */ public static String CompareUtils_NoDiffToolsDefined; /** */ public static String CompareUtils_NoDiffToolSpecified; /** */ + public static String CompareUtils_ResourceCleanupJobName; + + /** */ + public static String CompareUtils_wrongResourceArgument; + + /** */ public static String MergeToolActionHandler_openExternalMergeToolJobName; /** */ @@ -2992,6 +3019,9 @@ public class UIText extends NLS { public static String PushResultTable_MessageText; /** */ + public static String PushResultTable_PrePushHookOutput; + + /** */ public static String PushResultTable_repository; /** */ @@ -5753,9 +5783,6 @@ public class UIText extends NLS { public static String GitMergeEditorInput_MergeEditorTitle; /** */ - public static String GitMergeEditorInput_ResourceCleanupJobName; - - /** */ public static String GitMergeEditorInput_ToggleCurrentChangesLabel; /** */ @@ -5972,6 +5999,9 @@ public class UIText extends NLS { public static String PushSettings_Title; /** */ + public static String StagingView_CompareWithEachOtherLabel; + + /** */ public static String StagingView_CompareWithHeadMenuLabel; /** */ @@ -6062,6 +6092,9 @@ public class UIText extends NLS { public static String StagingView_Assume_Unchanged; /** */ + public static String StagingView_CommentChar; + + /** */ public static String StagingView_Commit; /** */ diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RepositoryAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RepositoryAction.java index c0c3dc3702..6e12d66d6a 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RepositoryAction.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/RepositoryAction.java @@ -148,13 +148,8 @@ public abstract class RepositoryAction extends AbstractHandler implements Command command = srv.getCommand(commandId); try { return command.executeWithChecks(event); - } catch (ExecutionException e) { - Activator.handleError(e.getMessage(), e, true); - } catch (NotDefinedException e) { - Activator.handleError(e.getMessage(), e, true); - } catch (NotEnabledException e) { - Activator.handleError(e.getMessage(), e, true); - } catch (NotHandledException e) { + } catch (ExecutionException | NotDefinedException | NotEnabledException + | NotHandledException e) { Activator.handleError(e.getMessage(), e, true); } return null; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SynchronizeWorkspaceActionHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SynchronizeWorkspaceActionHandler.java index 7cd46126c0..f1421f5a4a 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SynchronizeWorkspaceActionHandler.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SynchronizeWorkspaceActionHandler.java @@ -89,7 +89,7 @@ public class SynchronizeWorkspaceActionHandler extends RepositoryActionHandler { if (rm == null) continue; // Linked resources may not be in a repo if (resource instanceof IProject) - result.put(rm.getRepository(), new HashSet<IResource>()); + result.put(rm.getRepository(), new HashSet<>()); else if (resource instanceof IContainer) { Set<IResource> containers = result.get(rm.getRepository()); if (containers == null) { diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/branch/DebugUIPluginFacade.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/branch/DebugUIPluginFacade.java index af9b6ce63c..75bc52dd95 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/branch/DebugUIPluginFacade.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/branch/DebugUIPluginFacade.java @@ -77,9 +77,7 @@ class DebugUIPluginFacade implements IDebugUIPluginFacade { ModalContext.run(operation, true, progress, PlatformUI.getWorkbench().getDisplay()); } - } catch (InvocationTargetException e) { - // ignore - } catch (InterruptedException e) { + } catch (InvocationTargetException | InterruptedException e) { // ignore } return result[0]; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/RebaseCurrentRefCommand.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/RebaseCurrentRefCommand.java index c65bf118cb..29b23f0da1 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/RebaseCurrentRefCommand.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commands/shared/RebaseCurrentRefCommand.java @@ -113,7 +113,7 @@ public class RebaseCurrentRefCommand extends AbstractRebaseCommandHandler { BranchRebaseMode rebase = cfg.getEnum(BranchRebaseMode.values(), ConfigConstants.CONFIG_BRANCH_SECTION, branchName, ConfigConstants.CONFIG_KEY_REBASE, BranchRebaseMode.NONE); - preserveMerges = rebase == BranchRebaseMode.PRESERVE; + preserveMerges = rebase == BranchRebaseMode.MERGES; interactive = rebase == BranchRebaseMode.INTERACTIVE; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitHelper.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitHelper.java index 12ada8ef72..dd4ef32754 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitHelper.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitHelper.java @@ -6,6 +6,7 @@ * Copyright (C) 2008, Shawn O. Pearce <spearce@spearce.org> * Copyright (C) 2010, Stefan Lay <stefan.lay@sap.com> * Copyright (C) 2011, Jens Baumgart <jens.baumgart@sap.com> + * Copyright (C) 2023, Thomas Wolf <twolf@apache.org> and others * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -43,19 +44,19 @@ public class CommitHelper { final private Repository repository; - boolean canCommit; + private boolean canCommit; - String cannotCommitMessage; + private String cannotCommitMessage; private RevCommit previousCommit; - String author; + private String author; - String committer; + private String committer; - boolean isMergedResolved; + private boolean isMergedResolved; - boolean isCherryPickResolved; + private boolean isCherryPickResolved; private String commitMessage; @@ -72,7 +73,6 @@ public class CommitHelper { } private void calculateCommitInfo() { - Repository mergeRepository = null; commentChar = '\0'; isMergedResolved = false; isCherryPickResolved = false; @@ -83,12 +83,16 @@ public class CommitHelper { state.getDescription()); return; } - if (state.equals(RepositoryState.MERGING_RESOLVED)) { + switch (state) { + case MERGING_RESOLVED: + case REVERTING_RESOLVED: isMergedResolved = true; - mergeRepository = repository; - } else if (state.equals(RepositoryState.CHERRY_PICKING_RESOLVED)) { + break; + case CHERRY_PICKING_RESOLVED: isCherryPickResolved = true; - mergeRepository = repository; + break; + default: + break; } previousCommit = getHeadCommit(repository); final UserConfig config = repository.getConfig().get(UserConfig.KEY); @@ -101,14 +105,13 @@ public class CommitHelper { committer = committer + " <" + committerEmail + ">"; //$NON-NLS-1$ //$NON-NLS-2$ if (isMergedResolved || isCherryPickResolved) { - commitMessage = getMergeResolveMessage(mergeRepository); + commitMessage = getMergeResolveMessage(repository); commentChar = Utils.commentCharFromMergeMessage(commitMessage); } if (isCherryPickResolved) { - author = getCherryPickOriginalAuthor(mergeRepository); + author = getCherryPickOriginalAuthor(repository); } - } /** @@ -262,7 +265,16 @@ public class CommitHelper { if (repository == null) { return false; } - RepositoryState state = repository.getRepositoryState(); + return isCommitWithoutFilesAllowed(repository.getRepositoryState()); + } + + /** + * @param state + * RepositoryState to check + * @return true if an empty commit without files is allowed in the current + * state + */ + public static boolean isCommitWithoutFilesAllowed(RepositoryState state) { return state == RepositoryState.MERGING_RESOLVED; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitSelectionDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitSelectionDialog.java index 7ef2fc2901..31f980049d 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitSelectionDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitSelectionDialog.java @@ -211,9 +211,7 @@ public class CommitSelectionDialog extends FilteredItemsSelectionDialog { itemsFilter); } } - } catch (RevisionSyntaxException ignored) { - // Ignore and advance - } catch (IOException ignored) { + } catch (RevisionSyntaxException | IOException ignored) { // Ignore and advance } progress.worked(1); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitUI.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitUI.java index 2ea7b1f0c1..dbfec04fa4 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitUI.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitUI.java @@ -7,7 +7,7 @@ * Copyright (C) 2010, Stefan Lay <stefan.lay@sap.com> * Copyright (C) 2011, Jens Baumgart <jens.baumgart@sap.com> * Copyright (C) 2012, Robin Stocker <robin@nibor.org> - * Copyright (C) 2016, Thomas Wolf <thomas.wolf@paranor.ch> + * Copyright (C) 2016, 2023 Thomas Wolf <thomas.wolf@paranor.ch> * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -185,7 +185,8 @@ public class CommitUI { commitDialog.setPreselectAll(preselectAll); commitDialog.setAuthor(commitHelper.getAuthor()); commitDialog.setCommitter(commitHelper.getCommitter()); - commitDialog.setAllowToChangeSelection(!commitHelper.isMergedResolved && !commitHelper.isCherryPickResolved); + commitDialog.setAllowToChangeSelection(!commitHelper.isMergedResolved() + && !commitHelper.isCherryPickResolved()); String initialMessage; char commentChar; if (commitHelper.shouldUseCommitTemplate()) { @@ -221,8 +222,8 @@ public class CommitUI { commitOperation.setSign(commitDialog.isSignCommit()); commitOperation.setComputeChangeId(commitDialog.getCreateChangeId()); - commitOperation.setCommitAll(commitHelper.isMergedResolved); - if (commitHelper.isMergedResolved) + commitOperation.setCommitAll(commitHelper.isMergedResolved()); + if (commitHelper.isMergedResolved()) commitOperation.setRepository(repo); Job commitJob = new CommitJob(repo, commitOperation) .setPushUpstream(commitDialog.getPushMode()) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/BranchRebaseModeCombo.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/BranchRebaseModeCombo.java index 53743b543a..f3f57a208c 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/BranchRebaseModeCombo.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/BranchRebaseModeCombo.java @@ -48,7 +48,7 @@ public class BranchRebaseModeCombo { public String getText(Object element) { if (element == BranchRebaseMode.REBASE) { return UIText.BranchRebaseMode_Rebase; - } else if (element == BranchRebaseMode.PRESERVE) { + } else if (element == BranchRebaseMode.MERGES) { return UIText.BranchRebaseMode_Preserve; } else if (element == BranchRebaseMode.INTERACTIVE) { return UIText.BranchRebaseMode_Interactive; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/AbstractConfigureRemoteDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/AbstractConfigureRemoteDialog.java index 591511213b..6673769b0d 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/AbstractConfigureRemoteDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/AbstractConfigureRemoteDialog.java @@ -222,7 +222,7 @@ public abstract class AbstractConfigureRemoteDialog @Override protected Control createDialogArea(Composite parent) { final Composite main = new Composite(parent, SWT.NONE); - GridLayoutFactory.fillDefaults().applyTo(main); + GridLayoutFactory.swtDefaults().applyTo(main); GridDataFactory.fillDefaults().grab(true, true) .minSize(SWT.DEFAULT, SWT.DEFAULT).applyTo(main); @@ -254,7 +254,7 @@ public abstract class AbstractConfigureRemoteDialog } final Composite sameUriDetails = new Composite(main, SWT.NONE); - GridLayoutFactory.fillDefaults().numColumns(4).equalWidth(false) + GridLayoutFactory.swtDefaults().numColumns(4).equalWidth(false) .applyTo(sameUriDetails); GridDataFactory.fillDefaults().grab(true, false) .applyTo(sameUriDetails); @@ -314,7 +314,7 @@ public abstract class AbstractConfigureRemoteDialog GridDataFactory.fillDefaults().grab(true, true) .minSize(SWT.DEFAULT, SWT.DEFAULT).applyTo(refSpecGroup); refSpecGroup.setText(UIText.AbstractConfigureRemoteDialog_RefMappingGroup); - GridLayoutFactory.fillDefaults().numColumns(2).applyTo(refSpecGroup); + GridLayoutFactory.swtDefaults().numColumns(2).applyTo(refSpecGroup); specViewer = new TableViewer(refSpecGroup, SWT.BORDER | SWT.MULTI); specViewer.setContentProvider(ArrayContentProvider.getInstance()); @@ -361,7 +361,7 @@ public abstract class AbstractConfigureRemoteDialog }); Composite buttonArea = new Composite(refSpecGroup, SWT.NONE); - GridLayoutFactory.fillDefaults().applyTo(buttonArea); + GridLayoutFactory.swtDefaults().applyTo(buttonArea); GridDataFactory.fillDefaults().grab(false, true) .minSize(SWT.DEFAULT, SWT.DEFAULT).applyTo(buttonArea); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BasicConfigurationDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BasicConfigurationDialog.java index 61d210a415..a393146305 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BasicConfigurationDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BasicConfigurationDialog.java @@ -102,9 +102,7 @@ public class BasicConfigurationDialog extends TitleAreaDialog { FS.DETECTED); try { c.load(); - } catch (IOException e) { - Activator.handleError(e.getMessage(), e, true); - } catch (ConfigInvalidException e) { + } catch (IOException | ConfigInvalidException e) { Activator.handleError(e.getMessage(), e, true); } return c; @@ -114,9 +112,7 @@ public class BasicConfigurationDialog extends TitleAreaDialog { StoredConfig c = repo.getConfig(); try { c.load(); - } catch (IOException e) { - Activator.handleError(e.getMessage(), e, true); - } catch (ConfigInvalidException e) { + } catch (IOException | ConfigInvalidException e) { Activator.handleError(e.getMessage(), e, true); } return c; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java index 542c88b348..7995b2d6bd 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CreateTagDialog.java @@ -828,9 +828,7 @@ public class CreateTagDialog extends TitleAreaDialog { return; } } - } catch (IOException e) { - // ignore - } catch (RevisionSyntaxException e) { + } catch (IOException | RevisionSyntaxException e) { // ignore } setNoExistingTag(); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RebaseTargetSelectionDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RebaseTargetSelectionDialog.java index ab15ad45c1..09b62bda09 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RebaseTargetSelectionDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/RebaseTargetSelectionDialog.java @@ -141,7 +141,7 @@ public class RebaseTargetSelectionDialog extends AbstractBranchSelectionDialog { ConfigConstants.CONFIG_BRANCH_SECTION, branchName, ConfigConstants.CONFIG_KEY_REBASE, BranchRebaseMode.NONE); switch (rebase) { - case PRESERVE: + case MERGES: preserveMergesButton.setSelection(true); preserveMerges = true; break; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/SpellcheckableMessageArea.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/SpellcheckableMessageArea.java index bdd0d1b1f1..1f8022843a 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/SpellcheckableMessageArea.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/SpellcheckableMessageArea.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.function.Supplier; import java.util.regex.Pattern; @@ -131,10 +132,12 @@ public class SpellcheckableMessageArea extends Composite { private Token commentColoring; - private CleanupMode cleanupMode = CleanupMode.STRIP; + private @NonNull CleanupMode cleanupMode = CleanupMode.STRIP; private char commentChar = '#'; + private CopyOnWriteArrayList<Runnable> cleanupChangeListeners = new CopyOnWriteArrayList<>(); + /** * Creates an editable {@link SpellcheckableMessageArea}. * @@ -347,6 +350,7 @@ public class SpellcheckableMessageArea extends Composite { @Override public void widgetDisposed(DisposeEvent disposeEvent) { support.uninstall(); + cleanupChangeListeners.clear(); Activator.getDefault().getPreferenceStore().removePropertyChangeListener(propertyChangeListener); PlatformUI.getWorkbench().getThemeManager() .removePropertyChangeListener(themeListener); @@ -631,6 +635,29 @@ public class SpellcheckableMessageArea extends Composite { } /** + * Adds a {@link Runnable} that will be invoked whenever + * {@link #setCleanupMode(CleanupMode, char)} changes either the + * {@link CleanupMode} or the comment character. + * + * @param listener + * to add + */ + public void addCleanupChangeListener(Runnable listener) { + cleanupChangeListeners.addIfAbsent(listener); + } + + /** + * Removes a previously installed cleanup mode or comment character change + * listener. + * + * @param listener + * to remove + */ + public void removeCleanupChangeListener(Runnable listener) { + cleanupChangeListeners.remove(listener); + } + + /** * @return widget */ public StyledText getTextWidget() { @@ -684,10 +711,7 @@ public class SpellcheckableMessageArea extends Composite { if (text == null) { return ""; //$NON-NLS-1$ } - CleanupMode mode = cleanupMode; - if (mode != null) { - text = CommitConfig.cleanText(text, mode, commentChar); - } + text = CommitConfig.cleanText(text, cleanupMode, commentChar); if (shouldHardWrap()) { text = wrapCommitMessage(text, commentChar); } @@ -802,6 +826,25 @@ public class SpellcheckableMessageArea extends Composite { } /** + * Retrieves the currently set {@link CleanupMode}. + * + * @return the {@link CleanupMode}, never {@code null} + */ + @NonNull + public CleanupMode getCleanupMode() { + return cleanupMode; + } + + /** + * Retrieves the currently set comment character. + * + * @return the comment character + */ + public char getCommentChar() { + return commentChar; + } + + /** * Sets the clean-up mode; has no effect on a read-only * {@link SpellcheckableMessageArea}. * @@ -820,8 +863,13 @@ public class SpellcheckableMessageArea extends Composite { throw new IllegalArgumentException( "Clean-up mode must not be " + mode); //$NON-NLS-1$ } + boolean changed = this.cleanupMode != mode + || this.commentChar != commentChar; this.cleanupMode = mode; this.commentChar = commentChar; + if (changed) { + cleanupChangeListeners.forEach(Runnable::run); + } } /** diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/expressions/EditorPropertyTester.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/expressions/EditorPropertyTester.java new file mode 100644 index 0000000000..a9797ef9fd --- /dev/null +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/expressions/EditorPropertyTester.java @@ -0,0 +1,65 @@ +/******************************************************************************* + * Copyright (C) 2022 Thomas Wolf <twolf@apache.org> and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ +package org.eclipse.egit.ui.internal.expressions; + +import org.eclipse.jface.text.revisions.IRevisionRulerColumn; +import org.eclipse.jface.text.source.LineNumberChangeRulerColumn; +import org.eclipse.ui.part.MultiPageEditorPart; +import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor; + +/** + * Property tester for the active editor, if any. + * <p> + * Supports one property test "canShowRevisions", which is {@code true} if the + * active editor is a text editor with a line number column capable of showing + * revision information. The property test takes an optional argument + * "notAlready", in which case the test is only {@code true} if the ruler column + * additionally does not already show revision information. + * </p> + */ +public class EditorPropertyTester extends AbstractPropertyTester { + + @Override + public boolean test(Object receiver, String property, Object[] args, + Object expectedValue) { + return computeResult(expectedValue, + internalTest(receiver, property, args)); + } + + private boolean internalTest(Object receiver, String property, + Object[] args) { + if ("canShowRevisions".equals(property)) { //$NON-NLS-1$ + Object editor = receiver; + if (editor instanceof MultiPageEditorPart) { + editor = ((MultiPageEditorPart) editor).getSelectedPage(); + } + if (!(editor instanceof AbstractDecoratedTextEditor)) { + return false; + } + AbstractDecoratedTextEditor activeEditor = (AbstractDecoratedTextEditor) editor; + IRevisionRulerColumn column = activeEditor + .getAdapter(IRevisionRulerColumn.class); + if (column == null) { + return false; + } + if (args != null && args.length == 1 + && "notAlready".equals(args[0].toString()) //$NON-NLS-1$ + && (column instanceof LineNumberChangeRulerColumn) + && ((LineNumberChangeRulerColumn) column) + .isShowingRevisionInformation()) { + return false; + } + return true; + } + return false; + } + +} diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchSourcePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchSourcePage.java index 44b4bf7e5c..11fbeb98a1 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchSourcePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchSourcePage.java @@ -158,11 +158,8 @@ public class FetchSourcePage extends WizardPage { Collections.sort(proposals, CommonUtils.REF_ASCENDING_COMPARATOR); this.remoteRefs = proposals; - } catch (IllegalStateException e) { - setErrorMessage(e.getMessage()); - } catch (InvocationTargetException e) { - setErrorMessage(e.getMessage()); - } catch (InterruptedException e) { + } catch (IllegalStateException | InvocationTargetException + | InterruptedException e) { setErrorMessage(e.getMessage()); } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitAndDiffComponent.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitAndDiffComponent.java index e6c9f12dfb..681ca2ddd5 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitAndDiffComponent.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitAndDiffComponent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (C) 2019 Thomas Wolf <thomas.wolf@paranor.ch> + * Copyright (C) 2019, 2022 Thomas Wolf <twolf@apache.org> * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -409,26 +409,20 @@ public class CommitAndDiffComponent { start = System.currentTimeMillis(); } - Point oldSize = commentAndDiffComposite.getSize(); - Rectangle minSize = commentAndDiffScrolledComposite.getClientArea(); Point size; StyledText text = commentViewer.getTextWidget(); if (text == null) { size = new Point(0, 0); } else if (text.getWordWrap()) { + Rectangle minSize = commentAndDiffScrolledComposite.getClientArea(); size = commentAndDiffComposite.computeSize(minSize.width, SWT.DEFAULT); } else { size = commentAndDiffComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT); } - size.x = Math.max(minSize.width, size.x); - size.y = Math.max(minSize.height, size.y); - if (!size.equals(oldSize)) { - commentAndDiffComposite.setSize(size); - commentAndDiffComposite.layout(); - } - + commentAndDiffComposite.setSize(size); + commentAndDiffComposite.layout(); if (trace) { long stop = System.currentTimeMillis(); long time = stop - start; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitFileDiffViewer.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitFileDiffViewer.java index b72f056b3d..00911853e7 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitFileDiffViewer.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/CommitFileDiffViewer.java @@ -842,9 +842,8 @@ public class CommitFileDiffViewer extends TableViewer { if (loadJob.getInput().isSelectMarked()) { setSelection(new StructuredSelection(interesting), true); - } else { - reveal(interesting); } + reveal(interesting); } } finally { control.setRedraw(true); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitCreatePatchWizard.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitCreatePatchWizard.java index c4c74ed407..b36899e3d1 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitCreatePatchWizard.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/GitCreatePatchWizard.java @@ -188,9 +188,7 @@ public class GitCreatePatchWizard extends Wizard { } else { copyToClipboard(content); } - } catch (IOException e) { - throw new InvocationTargetException(e); - } catch (CoreException e) { + } catch (IOException | CoreException e) { throw new InvocationTargetException(e); } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/PushCommitHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/PushCommitHandler.java index 8921c185aa..ee85b4f194 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/PushCommitHandler.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/command/PushCommitHandler.java @@ -10,24 +10,30 @@ *******************************************************************************/ package org.eclipse.egit.ui.internal.history.command; +import java.util.Map; + import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.egit.ui.Activator; +import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.history.GitHistoryPage; -import org.eclipse.egit.ui.internal.push.PushWizardDialog; import org.eclipse.egit.ui.internal.push.PushBranchWizard; +import org.eclipse.egit.ui.internal.push.PushWizardDialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revplot.PlotCommit; import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.ui.commands.IElementUpdater; import org.eclipse.ui.handlers.HandlerUtil; +import org.eclipse.ui.menus.UIElement; /** * Command handler to enable pushing commits from the Git History View */ -public class PushCommitHandler extends AbstractHistoryCommandHandler { +public class PushCommitHandler extends AbstractHistoryCommandHandler + implements IElementUpdater { @Override public Object execute(ExecutionEvent event) throws ExecutionException { PlotCommit commit = (PlotCommit) getSelection(event).getFirstElement(); @@ -35,17 +41,12 @@ public class PushCommitHandler extends AbstractHistoryCommandHandler { try { PushBranchWizard wizard = null; - Ref localBranch = null; - for (int i = 0; i < commit.getRefCount(); i++) { - Ref currentRef = commit.getRef(i); - if (localBranch == null - && currentRef.getName().startsWith(Constants.R_HEADS)) - localBranch = currentRef; - } - if (localBranch == null) + Ref localBranch = findLocalBranch(commit); + if (localBranch == null) { wizard = new PushBranchWizard(repo, commit.getId()); - else + } else { wizard = new PushBranchWizard(repo, localBranch); + } PushWizardDialog dlg = new PushWizardDialog( HandlerUtil.getActiveShellChecked(event), wizard); @@ -58,6 +59,16 @@ public class PushCommitHandler extends AbstractHistoryCommandHandler { return null; } + private Ref findLocalBranch(PlotCommit commit) { + for (int i = 0; i < commit.getRefCount(); i++) { + Ref currentRef = commit.getRef(i); + if (currentRef.getName().startsWith(Constants.R_HEADS)) { + return currentRef; + } + } + return null; + } + @Override public boolean isEnabled() { GitHistoryPage page = getPage(); @@ -66,4 +77,23 @@ public class PushCommitHandler extends AbstractHistoryCommandHandler { IStructuredSelection sel = getSelection(page); return sel.size() == 1 && sel.getFirstElement() instanceof RevCommit; } + + @Override + public void updateElement(UIElement element, Map parameters) { + GitHistoryPage page = getPage(); + if (page == null) { + return; + } + IStructuredSelection sel = getSelection(page); + Object item = (sel.size() == 1) ? sel.getFirstElement() : null; + Ref ref = null; + if (item instanceof PlotCommit) { + ref = findLocalBranch((PlotCommit) item); + } + if (ref != null) { + element.setText(UIText.PushCommitHandler_pushBranchLabel); + } else { + element.setText(UIText.PushCommitHandler_pushCommitLabel); + } + } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/AbstractGitCompareEditorInput.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/AbstractGitCompareEditorInput.java index 62cee019de..e0ddde66d8 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/AbstractGitCompareEditorInput.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/AbstractGitCompareEditorInput.java @@ -42,24 +42,18 @@ import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.resources.IWorkspaceRunnable; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Adapters; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.core.runtime.jobs.Job; import org.eclipse.egit.core.info.GitInfo; import org.eclipse.egit.core.internal.efs.HiddenResources; import org.eclipse.egit.core.internal.indexdiff.IndexDiffCache; import org.eclipse.egit.core.internal.indexdiff.IndexDiffCacheEntry; import org.eclipse.egit.core.internal.util.ResourceUtil; import org.eclipse.egit.ui.Activator; +import org.eclipse.egit.ui.internal.CompareUtils; import org.eclipse.egit.ui.internal.UIIcons; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.jface.action.ActionContributionItem; @@ -455,55 +449,9 @@ public abstract class AbstractGitCompareEditorInput extends CompareEditorInput { } private void cleanUp() { - if (toDelete == null || toDelete.isEmpty()) { - return; - } List<IFile> toClean = toDelete; toDelete = null; - // Don't clean up if the workbench is shutting down; we would exit with - // unsaved workspace changes. Instead, EGit core cleans the project on - // start. - Job job = new Job(UIText.GitMergeEditorInput_ResourceCleanupJobName) { - - @Override - public boolean shouldSchedule() { - return super.shouldSchedule() - && !PlatformUI.getWorkbench().isClosing(); - } - - @Override - public boolean shouldRun() { - return super.shouldRun() - && !PlatformUI.getWorkbench().isClosing(); - } - - @Override - protected IStatus run(IProgressMonitor monitor) { - IWorkspaceRunnable remove = m -> { - SubMonitor progress = SubMonitor.convert(m, toClean.size()); - for (IFile tmp : toClean) { - if (PlatformUI.getWorkbench().isClosing()) { - return; - } - try { - tmp.delete(true, progress.newChild(1)); - } catch (CoreException e) { - // Ignore - } - } - }; - try { - ResourcesPlugin.getWorkspace().run(remove, null, - IWorkspace.AVOID_UPDATE, monitor); - } catch (CoreException e) { - return e.getStatus(); - } - return Status.OK_STATUS; - } - }; - job.setSystem(true); - job.setUser(false); - job.schedule(); + CompareUtils.cleanHiddenResources(toClean); } private static boolean isUIThread() { diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitMergeEditorInput.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitMergeEditorInput.java index a0b708aacb..357faaa1d6 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitMergeEditorInput.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/GitMergeEditorInput.java @@ -18,6 +18,7 @@ import java.lang.reflect.InvocationTargetException; import java.net.URI; import java.net.URISyntaxException; import java.nio.charset.Charset; +import java.nio.file.Files; import java.text.MessageFormat; import java.time.Instant; import java.util.ArrayList; @@ -58,6 +59,7 @@ import org.eclipse.egit.ui.internal.revision.EditableRevision; import org.eclipse.egit.ui.internal.revision.FileRevisionTypedElement; import org.eclipse.egit.ui.internal.revision.GitCompareFileRevisionEditorInput.EmptyTypedElement; import org.eclipse.egit.ui.internal.revision.ResourceEditableRevision; +import org.eclipse.egit.ui.internal.revision.SymlinkEditableRevision; import org.eclipse.egit.ui.internal.synchronize.compare.LocalNonWorkspaceTypedElement; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.jface.operation.IRunnableContext; @@ -438,17 +440,23 @@ public class GitMergeEditorInput extends AbstractGitCompareEditorInput { assert location != null; IFile file = ResourceUtil.getFileForLocation(location, false); boolean useWorkingTree = !conflicting || useWorkspace; - boolean stage2FromWorkingTree = false; + boolean useCustomLabel = false; if (!useWorkingTree && conflicting && dirCacheEntry != null) { // Normal conflict stages have a zero timestamp. If it's not // zero, we marked it below when the content was saved to // the working tree file in an earlier merge editor. useWorkingTree = !Instant.EPOCH .equals(dirCacheEntry.getLastModifiedInstant()); - stage2FromWorkingTree = useWorkingTree; + useCustomLabel = useWorkingTree; } + boolean isSymLink = Files + .isSymbolicLink(location.toFile().toPath()); if (useWorkingTree) { boolean useOursFilter = conflicting && useOurs; + if (isSymLink && useOursFilter) { + useOursFilter = false; + useCustomLabel = true; + } int conflictMarkerSize = 7; // Git default if (useOursFilter) { Attributes attributes = tw.getAttributes(); @@ -513,21 +521,27 @@ public class GitMergeEditorInput extends AbstractGitCompareEditorInput { new LocalResourceSaver(item)); } } else { - if (file != null) { + if (!isSymLink && file != null) { item = new LocalResourceTypedElement(file); } else { item = new LocalNonWorkspaceTypedElement(repository, location); + if (isSymLink) { + item.addContentChangeListener(source -> { + try { + item.commit(null); + } catch (CoreException e) { + Activator.handleStatus(e.getStatus(), + true); + } + }); + } } item.setSharedDocumentListener( new LocalResourceSaver(item)); } left = item; } else { - IFile rsc = file != null ? file - : createHiddenResource(location.toFile().toURI(), - tw.getNameString(), null); - assert rsc != null; // Stage 2 from index with backing IResource rev = GitFileRevision.inIndex(repository, gitPath, DirCacheEntry.STAGE_2); @@ -537,8 +551,18 @@ public class GitMergeEditorInput extends AbstractGitCompareEditorInput { .getProgressService(); assert runnableContext != null; } - left = new ResourceEditableRevision(rev, rsc, - runnableContext); + if (isSymLink) { + left = new SymlinkEditableRevision(rev, location, + runnableContext); + } else { + IFile rsc = file != null ? file + : createHiddenResource( + location.toFile().toURI(), + tw.getNameString(), null); + assert rsc != null; + left = new ResourceEditableRevision(rev, rsc, + runnableContext); + } // 'left' saves to the working tree. Update the index entry // with the current time. Normal conflict stages have a // timestamp of zero, so this is a non-invasive fully @@ -585,7 +609,7 @@ public class GitMergeEditorInput extends AbstractGitCompareEditorInput { // create the node as child DiffNode node = new MergeDiffNode(fileParent, kind, ancestor, left, right); - if (stage2FromWorkingTree) { + if (useCustomLabel) { customLabels.put(node, tw.getNameString()); } else if (left instanceof EditableRevision) { String name = tw.getNameString(); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/operations/GitScopeUtil.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/operations/GitScopeUtil.java index a25de67a0f..dcae835a18 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/operations/GitScopeUtil.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/operations/GitScopeUtil.java @@ -144,15 +144,9 @@ public class GitScopeUtil { @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - try { - monitor.beginTask( - UIText.CommitActionHandler_lookingForChanges, 100); - List<IResource> collectedResources = collectRelatedChanges( - selectedResources, part, monitor); - relatedChanges.addAll(collectedResources); - } finally { - monitor.done(); - } + List<IResource> collectedResources = collectRelatedChanges( + selectedResources, part, monitor); + relatedChanges.addAll(collectedResources); } }; @@ -169,15 +163,20 @@ public class GitScopeUtil { IProgressMonitor monitor) throws InterruptedException, InvocationTargetException { - SubMonitor progress = SubMonitor.convert(monitor, 2); - SubscriberScopeManager manager = GitScopeUtil.createScopeManager( - selectedResources, progress.newChild(1)); - GitScopeOperation buildScopeOperation = GitScopeOperationFactory - .getFactory().createGitScopeOperation(part, manager); + try { + SubMonitor progress = SubMonitor.convert(monitor, + UIText.CommitActionHandler_lookingForChanges, 2); + SubscriberScopeManager manager = GitScopeUtil.createScopeManager( + selectedResources, progress.newChild(1)); + GitScopeOperation buildScopeOperation = GitScopeOperationFactory + .getFactory().createGitScopeOperation(part, manager); - buildScopeOperation.run(progress.newChild(1)); + buildScopeOperation.run(progress.newChild(1)); - return buildScopeOperation.getRelevantResources(); + return buildScopeOperation.getRelevantResources(); + } finally { + monitor.done(); + } } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/ConfigurationEditorComponent.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/ConfigurationEditorComponent.java index 7f8e552b1b..0ea83a1247 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/ConfigurationEditorComponent.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/ConfigurationEditorComponent.java @@ -466,9 +466,7 @@ public class ConfigurationEditorComponent { editable = false; } } - } catch (IOException e) { - Activator.handleError(e.getMessage(), e, true); - } catch (ConfigInvalidException e) { + } catch (IOException | ConfigInvalidException e) { Activator.handleError(e.getMessage(), e, true); } tv.expandAll(); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/DiffPreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/DiffPreferencePage.java index c1660e8f17..89565bbe74 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/DiffPreferencePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/DiffPreferencePage.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; import org.eclipse.egit.ui.Activator; import org.eclipse.egit.ui.UIPreferences; @@ -36,12 +35,9 @@ import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jgit.util.StringUtils; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; @@ -175,64 +171,6 @@ public class DiffPreferencePage extends FieldEditorPreferencePage } }); - // Third radio + combo - - Button useExternal = new Button(diffGroup, SWT.RADIO); - useExternal.setText(UIText.DiffPreferencePage_UseExternal); - if (prefsManager.isActiveMode(DiffToolMode.EXTERNAL)) { - useExternal.setSelection(true); - } - - diffControls.put(useExternal, DiffToolMode.EXTERNAL); - - // Custom diff tool combo - - Composite diffToolCustomCont = new Composite(diffGroup, SWT.None); - diffToolCustomCont.setLayout(createGridWithLeftMergins()); - - Combo customDiffCombo = new Combo(diffToolCustomCont, SWT.READ_ONLY); - Set<String> diffToolsList = DiffMergeSettings.getAvailableDiffTools(); - - for (String tool : diffToolsList) { - customDiffCombo.add(tool); - } - - useExternal.addListener(SWT.Selection, event -> { - if (useExternal.getSelection()) { - prefsManager.setActiveMode(DiffToolMode.EXTERNAL); - useExternalForType.setEnabled(false); - prefsManager.setCustomTool(DIFF_TOOL_CUSTOM, - customDiffCombo.getText()); - } - }); - - IPreferenceStore store = getPreferenceStore(); - String defaultCustomDiffTool = store.getString(DIFF_TOOL_CUSTOM); - if (diffToolsList.contains(defaultCustomDiffTool)) { - customDiffCombo.setText(defaultCustomDiffTool); - } else { - customDiffCombo - .setText(diffToolsList.stream().findFirst().orElse("")); //$NON-NLS-1$ - } - customDiffCombo - .setEnabled(prefsManager.isActiveMode(DiffToolMode.EXTERNAL)); - - customDiffCombo.addListener(SWT.Selection, event -> { - prefsManager.setCustomTool(DIFF_TOOL_CUSTOM, - customDiffCombo.getText()); - }); - - useExternal.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - customDiffCombo.setEnabled(useExternal.getSelection()); - } - }); - prefsManager.addControlWithCustomReset(customDiffCombo, () -> { - customDiffCombo.setEnabled(false); - customDiffCombo.setText(store.getString(DIFF_TOOL_CUSTOM)); - }); - prefsManager.bindButtons(diffControls); updateMargins(diffGroup); @@ -356,60 +294,6 @@ public class DiffPreferencePage extends FieldEditorPreferencePage } }); - // Third radio with combo selection - - Button mergeUseExternalTool = new Button(toolToUseSection, SWT.RADIO); - mergeUseExternalTool.setText(UIText.DiffPreferencePage_UseExternal); - if (prefsManager.isActiveMode(MergeToolMode.EXTERNAL)) { - mergeUseExternalTool.setSelection(true); - } - mergeControls.put(mergeUseExternalTool, MergeToolMode.EXTERNAL); - - Composite mergeToolCustomCont = new Composite(toolToUseSection, SWT.None); - mergeToolCustomCont.setLayout(new GridLayout()); - - Combo customMergeCombo = new Combo(mergeToolCustomCont, SWT.READ_ONLY); - Set<String> mergeTools = DiffMergeSettings.getAvailableMergeTools(); - for (String tool : mergeTools) { - customMergeCombo.add(tool); - } - - mergeUseExternalTool.addListener(SWT.Selection, event -> { - prefsManager.setActiveMode(MergeToolMode.EXTERNAL); - prefsManager.setCustomTool(MERGE_TOOL_CUSTOM, - customMergeCombo.getText()); - }); - - IPreferenceStore store = getPreferenceStore(); - String defaultCustomMergeTool = store.getString(MERGE_TOOL_CUSTOM); - if (mergeTools.contains(defaultCustomMergeTool)) { - customMergeCombo.setText(defaultCustomMergeTool); - } else { - customMergeCombo - .setText(mergeTools.stream().findFirst().orElse("")); //$NON-NLS-1$ - } - if (prefsManager.isActiveMode(MergeToolMode.INTERNAL)) { - customMergeCombo.setEnabled(false); - } else { - customMergeCombo.setEnabled(true); - } - mergeUseExternalTool.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - customMergeCombo.setEnabled(mergeUseExternalTool.getSelection()); - useExternalForType.setEnabled(false); - } - }); - customMergeCombo.addListener(SWT.Selection, event -> { - prefsManager.setCustomTool(MERGE_TOOL_CUSTOM, - customMergeCombo.getText()); - }); - - prefsManager.addControlWithCustomReset(customMergeCombo, () -> { - customMergeCombo.setEnabled(false); - customMergeCombo.setText(store.getString(MERGE_TOOL_CUSTOM)); - }); - addField(new BooleanFieldEditor( UIPreferences.MERGE_TOOL_AUTO_ADD_TO_INDEX, UIText.DiffPreferencePage_MergeAddExternalMergedFile, @@ -435,15 +319,11 @@ public class DiffPreferencePage extends FieldEditorPreferencePage /** Key is the mode, value is selection */ private Map<String, Integer> modeSelections; - /** Key is the tool key, value is tool selection */ - private Map<String, String> toolSelections; - public DiffMergePreferencesManager(IPreferenceStore store) { this.store = store; buttons = new LinkedHashMap<>(); customResetControls = new LinkedHashMap<>(); modeSelections = new LinkedHashMap<>(); - toolSelections = new LinkedHashMap<>(); } /** @@ -493,9 +373,6 @@ public class DiffPreferencePage extends FieldEditorPreferencePage for (Entry<String, Integer> entry : modeSelections.entrySet()) { store.setValue(entry.getKey(), entry.getValue().intValue()); } - for (Entry<String, String> entry : toolSelections.entrySet()) { - store.setValue(entry.getKey(), entry.getValue()); - } } /** @@ -546,21 +423,6 @@ public class DiffPreferencePage extends FieldEditorPreferencePage } /** - * Sets selected custom external diff/merge tool. - * - * @param toolId - * either {@link #DIFF_TOOL_CUSTOM} or - * {@link #MERGE_TOOL_CUSTOM} - * - * @param selection - * tool to be set - * - */ - private void setCustomTool(String toolId, String selection) { - toolSelections.put(toolId, selection); - } - - /** * Sets corresponding working mode for external diff/merge * functionality. * diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java index d1ce429807..d6d17e9569 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java @@ -324,7 +324,7 @@ public class GitDecoratorPreferencePage extends PreferencePage implements * When controls in the tab change it will emit update() to any registered * observers. This is currently used for updating the decoration preview. */ - private abstract class Tab { + private abstract static class Tab { private Preview toUpdate; @@ -827,7 +827,7 @@ public class GitDecoratorPreferencePage extends PreferencePage implements super.dispose(); } - private abstract class Preview { + private abstract static class Preview { protected PreferenceStore store = new PreferenceStore(); protected final TreeViewer fViewer; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GlobalConfigurationPreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GlobalConfigurationPreferencePage.java index 9336c65cd1..40c22500d9 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GlobalConfigurationPreferencePage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GlobalConfigurationPreferencePage.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, SAP AG. + * Copyright (c) 2010, 2023 SAP AG and others * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -34,9 +34,12 @@ import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jgit.events.ConfigChangedEvent; import org.eclipse.jgit.events.ConfigChangedListener; +import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.storage.file.FileBasedConfig; +import org.eclipse.jgit.storage.file.UserConfigFile; import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.SystemReader; import org.eclipse.swt.SWT; @@ -65,10 +68,14 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements private FileBasedConfig userConfig; + private FileBasedConfig xdgConfig; + private FileBasedConfig sysConfig; private StackLayout repoConfigStackLayout; + private StackLayout userConfigStackLayout; + private List<Repository> repositories; private Map<Repository, ConfigurationEditorComponent> repoConfigEditors = new HashMap<>(); @@ -77,14 +84,20 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements private boolean userIsDirty; + private boolean xdgIsDirty; + private boolean sysIsDirty; private ConfigurationEditorComponent userConfigEditor; + private ConfigurationEditorComponent xdgConfigEditor; + private ConfigurationEditorComponent sysConfigEditor; private Composite repoConfigComposite; + private Composite userConfigComposite; + @Override protected Control createContents(Composite parent) { @@ -92,19 +105,97 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements SWTUtils.MARGINS_NONE); TabFolder tabFolder = new TabFolder(composite, SWT.NONE); tabFolder.setLayoutData(SWTUtils.createHVFillGridData()); - userConfigEditor = new ConfigurationEditorComponent(tabFolder, - userConfig, true, 5) { - @Override - protected void setErrorMessage(String message) { - GlobalConfigurationPreferencePage.this.setErrorMessage(message); - } + Control userTabControl; + if (xdgConfig != null) { + Composite userTab = new Composite(tabFolder, SWT.NONE); + String variable = SystemReader.getInstance().isWindows() + ? '%' + Constants.XDG_CONFIG_HOME + '%' + : '$' + Constants.XDG_CONFIG_HOME; + String[] items = { "~" + File.separatorChar + ".gitconfig", //$NON-NLS-1$ //$NON-NLS-2$ + variable + File.separatorChar + "git" //$NON-NLS-1$ + + File.separatorChar + Constants.CONFIG }; + Combo userCombo = insertCombo(userTab, + UIText.GlobalConfigurationPreferencePage_userSettingLabel, + items); + userCombo.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + Combo combo = (Combo) e.widget; + switch (combo.getSelectionIndex()) { + case 0: + userConfigStackLayout.topControl = userConfigEditor + .getContents(); + break; + case 1: + userConfigStackLayout.topControl = xdgConfigEditor + .getContents(); + break; + default: + return; + } + userConfigComposite.layout(); + } + }); - @Override - protected void setDirty(boolean dirty) { - userIsDirty = dirty; - updateApplyButton(); - } - }; + userConfigComposite = new Composite(userTab, SWT.NONE); + GridDataFactory.fillDefaults().grab(true, true) + .applyTo(userConfigComposite); + userConfigStackLayout = new StackLayout(); + userConfigComposite.setLayout(userConfigStackLayout); + userConfigEditor = new ConfigurationEditorComponent( + userConfigComposite, userConfig, true, 5) { + @Override + protected void setErrorMessage(String message) { + GlobalConfigurationPreferencePage.this + .setErrorMessage(message); + } + + @Override + protected void setDirty(boolean dirty) { + userIsDirty = dirty; + updateApplyButton(); + } + }; + Control control = userConfigEditor.createContents(); + Dialog.applyDialogFont(control); + userConfigStackLayout.topControl = control; + + xdgConfigEditor = new ConfigurationEditorComponent( + userConfigComposite, + xdgConfig, true, 5) { + @Override + protected void setErrorMessage(String message) { + GlobalConfigurationPreferencePage.this + .setErrorMessage(message); + } + + @Override + protected void setDirty(boolean dirty) { + xdgIsDirty = dirty; + updateApplyButton(); + } + }; + control = xdgConfigEditor.createContents(); + Dialog.applyDialogFont(control); + userTabControl = userTab; + } else { + userConfigEditor = new ConfigurationEditorComponent(tabFolder, + userConfig, true, 5) { + @Override + protected void setErrorMessage(String message) { + GlobalConfigurationPreferencePage.this + .setErrorMessage(message); + } + + @Override + protected void setDirty(boolean dirty) { + userIsDirty = dirty; + updateApplyButton(); + } + }; + userTabControl = userConfigEditor.createContents(); + Dialog.applyDialogFont(userTabControl); + } sysConfigEditor = new ConfigurationEditorComponent(tabFolder, sysConfig, true, 5) { @Override @@ -120,17 +211,9 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements }; Composite repoTab = new Composite(tabFolder, SWT.NONE); - GridLayoutFactory.swtDefaults().margins(0, 0).applyTo(repoTab); - GridDataFactory.fillDefaults().grab(true, true).applyTo(repoTab); - Composite repositoryComposite = new Composite(repoTab, SWT.NONE); - repositoryComposite.setLayout(new GridLayout(2, false)); - GridDataFactory.fillDefaults().grab(true, false).applyTo( - repositoryComposite); - Label repoLabel = new Label(repositoryComposite, SWT.NONE); - repoLabel - .setText(UIText.GlobalConfigurationPreferencePage_repositorySettingRepositoryLabel); - - Combo repoCombo = new Combo(repositoryComposite, SWT.READ_ONLY); + Combo repoCombo = insertCombo(repoTab, + UIText.GlobalConfigurationPreferencePage_repositorySettingRepositoryLabel, + getRepositoryComboItems()); repoCombo.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { @@ -138,7 +221,6 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements showRepositoryConfiguration(combo.getSelectionIndex()); } }); - repoCombo.setItems(getRepositoryComboItems()); repoConfigComposite = new Composite(repoTab, SWT.NONE); GridDataFactory.fillDefaults().grab(true, true).applyTo(repoConfigComposite); @@ -158,14 +240,12 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements repoCombo.setEnabled(false); } - Control result = userConfigEditor.createContents(); - Dialog.applyDialogFont(result); TabItem userTabItem = new TabItem(tabFolder, SWT.FILL); - userTabItem.setControl(result); + userTabItem.setControl(userTabControl); userTabItem.setText( UIText.GlobalConfigurationPreferencePage_userSettingTabTitle); - result = sysConfigEditor.createContents(); + Control result = sysConfigEditor.createContents(); Dialog.applyDialogFont(result); TabItem sysTabItem = new TabItem(tabFolder, SWT.FILL); sysTabItem.setControl(result); @@ -187,7 +267,8 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements @Override protected void updateApplyButton() { if (getApplyButton() != null) - getApplyButton().setEnabled(userIsDirty || sysIsDirty || !dirtyRepositories.isEmpty()); + getApplyButton().setEnabled(userIsDirty || xdgIsDirty || sysIsDirty + || !dirtyRepositories.isEmpty()); } @Override @@ -201,6 +282,14 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements ok = false; } } + if (xdgIsDirty) { + try { + xdgConfigEditor.save(); + } catch (IOException e) { + Activator.handleError(e.getMessage(), e, true); + ok = false; + } + } if (sysIsDirty) { try { sysConfigEditor.save(); @@ -229,6 +318,9 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements protected void performDefaults() { try { userConfigEditor.restore(); + if (xdgConfigEditor != null) { + xdgConfigEditor.restore(); + } sysConfigEditor.restore(); for (ConfigurationEditorComponent editor : repoConfigEditors.values()) { editor.restore(); @@ -244,8 +336,26 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements public void init(IWorkbench workbench) { if (sysConfig == null) sysConfig = SystemReader.getInstance().openSystemConfig(null, FS.DETECTED); - if (userConfig == null) - userConfig = SystemReader.getInstance().openUserConfig(null, FS.DETECTED); // no inherit here! + if (userConfig == null) { + FileBasedConfig userCfg = SystemReader.getInstance() + .openUserConfig(null, FS.DETECTED); + FileBasedConfig xdgCfg = null; + + if (userCfg instanceof UserConfigFile) { + Config base = userCfg.getBaseConfig(); + if (base instanceof FileBasedConfig) { + xdgCfg = (FileBasedConfig) base; + userCfg = new FileBasedConfig(null, userCfg.getFile(), + FS.DETECTED); + if (xdgCfg.getFile() == null + || !xdgCfg.getFile().isFile()) { + xdgCfg = null; + } + } + } + userConfig = userCfg; + xdgConfig = xdgCfg; + } if (repositories == null) { repositories = new ArrayList<>(); List<String> repoPaths = RepositoryUtil.INSTANCE @@ -274,6 +384,22 @@ public class GlobalConfigurationPreferencePage extends PreferencePage implements String.CASE_INSENSITIVE_ORDER)); } + private Combo insertCombo(Composite parent, String label, String[] items) { + GridLayoutFactory.swtDefaults().margins(0, 0).applyTo(parent); + GridDataFactory.fillDefaults().grab(true, true).applyTo(parent); + Composite comboComposite = new Composite(parent, SWT.NONE); + comboComposite.setLayout(new GridLayout(2, false)); + GridDataFactory.fillDefaults().grab(true, false) + .applyTo(comboComposite); + Label l = new Label(comboComposite, SWT.NONE); + l.setText(label); + + Combo combo = new Combo(comboComposite, SWT.READ_ONLY); + combo.setItems(items); + combo.select(0); + return combo; + } + private String[] getRepositoryComboItems() { List<String> items = new ArrayList<>(); for (Repository repository : repositories) { diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullOperationUI.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullOperationUI.java index 3ce8a217e4..462f4805d6 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullOperationUI.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullOperationUI.java @@ -71,7 +71,7 @@ public class PullOperationUI extends JobChangeAdapter { /** pull results per repository */ protected final Map<Repository, Object> results = Collections - .synchronizedMap(new LinkedHashMap<Repository, Object>()); + .synchronizedMap(new LinkedHashMap<>()); private final PullOperation pullOperation; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizardPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizardPage.java index 119c83ebcc..aceda6ad32 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizardPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizardPage.java @@ -279,9 +279,7 @@ public class PullWizardPage extends WizardPage { setSelectedRemote(current); } } - } catch (URISyntaxException ex) { - Activator.logError(ex.getMessage(), ex); - } catch (IOException ex) { + } catch (URISyntaxException | IOException ex) { Activator.logError(ex.getMessage(), ex); } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushBranchWizard.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushBranchWizard.java index eeb31caaba..6e435ebe35 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushBranchWizard.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushBranchWizard.java @@ -166,10 +166,7 @@ public class PushBranchWizard extends Wizard { configureUpstream(); } startPush(); - } catch (IOException e) { - showError(e.getMessage()); - return false; - } catch (URISyntaxException e) { + } catch (IOException | URISyntaxException e) { showError(e.getMessage()); return false; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushOperationUI.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushOperationUI.java index 9708a954f4..7f1d323dd8 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushOperationUI.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushOperationUI.java @@ -45,7 +45,6 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.Wizard; import org.eclipse.jgit.annotations.NonNull; -import org.eclipse.jgit.errors.NotSupportedException; import org.eclipse.jgit.lib.BranchConfig; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Constants; @@ -282,9 +281,6 @@ public class PushOperationUI { try { spec = PushOperationSpecification.create(repository, config, pushRefSpecs); - } catch (NotSupportedException e) { - throw new CoreException( - Activator.createErrorStatus(e.getMessage(), e)); } catch (IOException e) { throw new CoreException( Activator.createErrorStatus(e.getMessage(), e)); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java index 4c29d83859..57f0e59b5b 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultTable.java @@ -1,5 +1,6 @@ /******************************************************************************* - * Copyright (C) 2008, 2015 Marek Zawirski <marek.zawirski@gmail.com> and others. + * Copyright (C) 2008, 2022 Marek Zawirski <marek.zawirski@gmail.com> and others. + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -9,8 +10,11 @@ *******************************************************************************/ package org.eclipse.egit.ui.internal.push; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.eclipse.egit.core.op.PushOperationResult; import org.eclipse.egit.ui.UIUtils; @@ -75,6 +79,8 @@ class PushResultTable { private Repository repo; + private String hookResult; + PushResultTable(final Composite parent) { this(parent, null); } @@ -216,8 +222,13 @@ class PushResultTable { return; } Object selected = structuredSelection.getFirstElement(); - if (selected instanceof RefUpdateElement) - text.setText(getResult((RefUpdateElement) selected)); + if (selected instanceof RefUpdateElement) { + String toShow = getResult((RefUpdateElement) selected); + if (!hookResult.isEmpty()) { + toShow = hookResult + toShow; + } + text.setText(toShow); + } } }); @@ -299,6 +310,28 @@ class PushResultTable { sashForm.setWeights(defaultValues); } + private String formatHookOutput(String hookOutput, String hookError) { + String out = hookOutput.strip(); + String err = hookError.strip(); + if (out.isEmpty() && err.isEmpty()) { + return ""; //$NON-NLS-1$ + } + if (!out.isEmpty()) { + out = prefixLines("stdout: ", out); //$NON-NLS-1$ + } + if (!err.isEmpty()) { + err = prefixLines("stderr: ", err); //$NON-NLS-1$ + } + return MessageFormat.format(UIText.PushResultTable_PrePushHookOutput, + out, err); + } + + private String prefixLines(String prefix, String text) { + return Stream.of(text.split("\n")) //$NON-NLS-1$ + .map(s -> prefix + s.stripTrailing()) + .collect(Collectors.joining("\n", "", "\n")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } + void setData(final Repository localDb, final PushOperationResult result) { reader = localDb.newObjectReader(); repo = localDb; @@ -311,22 +344,27 @@ class PushResultTable { return; } + hookResult = formatHookOutput(result.getHookStdOut(), + result.getHookStdErr()).replaceAll("\n", Text.DELIMITER); //$NON-NLS-1$ final List<RefUpdateElement> results = new ArrayList<>(); - for (URIish uri : result.getURIs()) - if (result.isSuccessfulConnection(uri)) + for (URIish uri : result.getURIs()) { + if (result.isSuccessfulConnection(uri)) { for (RemoteRefUpdate update : result.getPushResult(uri) - .getRemoteUpdates()) + .getRemoteUpdates()) { results.add(new RefUpdateElement(result, update, uri, reader, repo)); - + } + } + } treeViewer.setInput(results.toArray()); // select the first row of table to get the details of the first // push result shown in the Text control Tree table = treeViewer.getTree(); - if (table.getItemCount() > 0) + if (table.getItemCount() > 0) { treeViewer.setSelection(new StructuredSelection(table.getItem(0) .getData())); + } root.layout(); } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchWizard.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchWizard.java index 786db8c1c3..c4ef087cc3 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchWizard.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchWizard.java @@ -97,9 +97,7 @@ public class CreateBranchWizard extends Wizard { try { cp.createBranch(newBranchName, checkoutNewBranch, monitor); - } catch (CoreException ce) { - throw new InvocationTargetException(ce); - } catch (IOException ioe) { + } catch (CoreException | IOException ioe) { throw new InvocationTargetException(ioe); } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/NewRepositoryWizard.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/NewRepositoryWizard.java index cb0431d8c8..a9c548b905 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/NewRepositoryWizard.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/NewRepositoryWizard.java @@ -104,9 +104,7 @@ public class NewRepositoryWizard extends Wizard implements INewWizard { return true; autoShareProjects(repository, projects); } - } catch (GitAPIException e) { - org.eclipse.egit.ui.Activator.handleError(e.getMessage(), e, false); - } catch (IOException e) { + } catch (GitAPIException | IOException e) { org.eclipse.egit.ui.Activator.handleError(e.getMessage(), e, false); } return true; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java index 5bd86f53e0..b8c6cbad8b 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoriesView.java @@ -851,6 +851,9 @@ public class RepositoriesView extends CommonNavigator implements IShowInSource, private void executeOpenCommandWithConfirmation(RepositoryTreeNode element, String refName) { + if (targetIsCurrentBranch(element, refName)) { + return; + } if (!BranchOperationUI.checkoutWillShowQuestionDialog(refName)) { IPreferenceStore store = Activator.getDefault() .getPreferenceStore(); @@ -888,6 +891,17 @@ public class RepositoriesView extends CommonNavigator implements IShowInSource, executeOpenCommand(element); } + private boolean targetIsCurrentBranch(RepositoryTreeNode element, + String refName) { + try { + Repository repository = element.getRepository(); + return refName.equals(repository.getFullBranch()); + } catch (IOException e) { + // ignore and just execute the checkout operation + return false; + } + } + private void executeOpenCommand(RepositoryTreeNode element) { CommonUtils.runCommand("org.eclipse.egit.ui.RepositoriesViewOpen", //$NON-NLS-1$ new StructuredSelection(element)); @@ -1135,8 +1149,12 @@ public class RepositoriesView extends CommonNavigator implements IShowInSource, return Status.CANCEL_STATUS; } - tv.refresh(true); - + tv.getControl().setRedraw(false); + try { + tv.refresh(true); + } finally { + tv.getControl().setRedraw(true); + } if (monitor.isCanceled()) { return Status.CANCEL_STATUS; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertySource.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertySource.java index 330b3b6c3a..7619be63c2 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertySource.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositoryPropertySource.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 SAP AG. + * Copyright (c) 2010, 2023 SAP AG and others * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -37,6 +37,7 @@ import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.storage.file.FileBasedConfig; +import org.eclipse.jgit.storage.file.UserConfigFile; import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.SystemReader; import org.eclipse.osgi.util.NLS; @@ -69,6 +70,8 @@ public class RepositoryPropertySource implements IPropertySource { private static final String SYSTEM_ID_PREFIX = "system"; //$NON-NLS-1$ + private static final String XDG_ID_PREFIX = "xdg"; //$NON-NLS-1$ + private static final String USER_ID_PREFIX = "user"; //$NON-NLS-1$ private static final String REPO_ID_PREFIX = "repo"; //$NON-NLS-1$ @@ -106,6 +109,9 @@ public class RepositoryPropertySource implements IPropertySource { case SYSTEM: config = source.systemConfig; break; + case XDG: + config = source.xdgConfig; + break; case USER: config = source.userHomeConfig; break; @@ -134,6 +140,8 @@ public class RepositoryPropertySource implements IPropertySource { private final FileBasedConfig userHomeConfig; + private final FileBasedConfig xdgConfig; + private final StoredConfig repositoryConfig; private final StoredConfig effectiveConfig; @@ -156,7 +164,20 @@ public class RepositoryPropertySource implements IPropertySource { effectiveConfig = repository.getConfig(); systemConfig = SystemReader.getInstance().openSystemConfig(null, FS.DETECTED); - userHomeConfig = SystemReader.getInstance().openUserConfig(null, FS.DETECTED); + FileBasedConfig userConfig = SystemReader.getInstance() + .openUserConfig(null, FS.DETECTED); + FileBasedConfig xdgCfg = null; + + if (userConfig instanceof UserConfigFile) { + Config base = userConfig.getBaseConfig(); + if (base instanceof FileBasedConfig) { + xdgCfg = (FileBasedConfig) base; + userConfig = new FileBasedConfig(null, userConfig.getFile(), + FS.DETECTED); + } + } + userHomeConfig = userConfig; + xdgConfig = xdgCfg; if (effectiveConfig instanceof FileBasedConfig) { File configFile = ((FileBasedConfig) effectiveConfig).getFile(); @@ -199,6 +220,12 @@ public class RepositoryPropertySource implements IPropertySource { final Menu ctxMenu = mgr.createContextMenu(control); for (final DisplayMode aMode : DisplayMode.values()) { + if (DisplayMode.XDG.equals(aMode) + && (xdgConfig == null + || xdgConfig.getFile() == null + || !xdgConfig.getFile().isFile())) { + continue; + } mgr.add(new Action(aMode.getText()) { @Override public void run() { @@ -214,6 +241,11 @@ public class RepositoryPropertySource implements IPropertySource { case EFFECTIVE: enabled = false; break; + case XDG: + enabled = xdgConfig != null + && xdgConfig.getFile() != null + && xdgConfig.getFile().canWrite(); + break; case SYSTEM: enabled = systemConfig.getFile() != null && systemConfig.getFile() @@ -224,14 +256,17 @@ public class RepositoryPropertySource implements IPropertySource { break; } editAction.getAction().setEnabled(enabled); + // We change the action text, so force an update + // to get proper re-layout. + myPage.getSite().getActionBars() + .updateActionBars(); myPage.refresh(); } @Override public boolean isEnabled() { return aMode != DisplayMode.SYSTEM - || systemConfig - .getFile() != null; + || systemConfig.getFile() != null; } @Override @@ -353,12 +388,13 @@ public class RepositoryPropertySource implements IPropertySource { public IPropertyDescriptor[] getPropertyDescriptors() { try { systemConfig.load(); + if (xdgConfig != null) { + xdgConfig.load(); + } userHomeConfig.load(); repositoryConfig.load(); effectiveConfig.load(); - } catch (IOException e) { - showExceptionMessage(e); - } catch (ConfigInvalidException e) { + } catch (IOException | ConfigInvalidException e) { showExceptionMessage(e); } @@ -389,6 +425,18 @@ public class RepositoryPropertySource implements IPropertySource { config = repositoryConfig; break; } + case XDG: { + if (xdgConfig == null) { + return new IPropertyDescriptor[0]; + } + prefix = XDG_ID_PREFIX; + String location = xdgConfig.getFile().getAbsolutePath(); + category = NLS.bind( + UIText.RepositoryPropertySource_GlobalConfigurationCategory, + location); + config = xdgConfig; + break; + } case USER: { prefix = USER_ID_PREFIX; String location = userHomeConfig.getFile().getAbsolutePath(); @@ -442,6 +490,9 @@ public class RepositoryPropertySource implements IPropertySource { if (actId.startsWith(SYSTEM_ID_PREFIX)) { value = getValueFromConfig(systemConfig, actId.substring(SYSTEM_ID_PREFIX.length())); + } else if (actId.startsWith(XDG_ID_PREFIX)) { + value = getValueFromConfig(xdgConfig, + actId.substring(XDG_ID_PREFIX.length())); } else if (actId.startsWith(USER_ID_PREFIX)) { value = getValueFromConfig(userHomeConfig, actId.substring(USER_ID_PREFIX.length())); @@ -484,7 +535,9 @@ public class RepositoryPropertySource implements IPropertySource { EFFECTIVE(UIText.RepositoryPropertySource_EffectiveConfigurationAction), /* System wide configuration */ SYSTEM(UIText.RepositoryPropertySource_SystemConfigurationMenu), - /* The user specific configuration */ + /* The configuration at $XDG_CONFIG_HOME/git/config */ + XDG(UIText.RepositoryPropertySource_XdgConfigurationMenu), + /* The configuration in the user's home directory */ USER(UIText.RepositoryPropertySource_GlobalConfigurationMenu), /* The repository specific configuration */ REPO(UIText.RepositoryPropertySource_RepositoryConfigurationButton); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositorySearchDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositorySearchDialog.java index c73a747e13..1b303914e8 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositorySearchDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositorySearchDialog.java @@ -36,8 +36,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.InstanceScope; -import org.eclipse.egit.core.Activator; import org.eclipse.egit.core.RepositoryUtil; +import org.eclipse.egit.ui.Activator; import org.eclipse.egit.ui.UIUtils; import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.UIIcons; @@ -612,17 +612,22 @@ public class RepositorySearchDialog extends WizardPage { @Override public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - monitor.beginTask( - UIText.RepositorySearchDialog_ScanningForRepositories_message, - IProgressMonitor.UNKNOWN); try { - summary[0] = findGitDirsRecursive(file, directories, monitor, - lookForNested, skipHidden); - } catch (Exception ex) { - throw new InvocationTargetException(ex); - } - if (monitor.isCanceled()) { - throw new InterruptedException(); + SubMonitor progress = SubMonitor.convert(monitor, + UIText.RepositorySearchDialog_ScanningForRepositories_message, + 1); + try { + summary[0] = findGitDirsRecursive(file, directories, + progress.newChild(1), lookForNested, + skipHidden); + } catch (Exception ex) { + throw new InvocationTargetException(ex); + } + if (progress.isCanceled()) { + throw new InterruptedException(); + } + } finally { + monitor.done(); } } }; diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoryTreeNode.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoryTreeNode.java index a445545b2f..08428870e7 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoryTreeNode.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/RepositoryTreeNode.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2019 SAP AG and others. + * Copyright (c) 2010, 2023 SAP AG and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -37,6 +37,8 @@ public abstract class RepositoryTreeNode<T> extends PlatformObject private T myObject; + private int hashCode; + private final RepositoryTreeNodeType myType; private final RepositoryTreeNode myParent; @@ -111,6 +113,7 @@ public abstract class RepositoryTreeNode<T> extends PlatformObject public void clear() { myRepository = null; myObject = null; + hashCode = 0; } /** @@ -170,6 +173,9 @@ public abstract class RepositoryTreeNode<T> extends PlatformObject @Override public int hashCode() { + if (this.hashCode != 0) { + return hashCode; + } final int prime = 31; int result = 1; switch (myType) { @@ -224,6 +230,7 @@ public abstract class RepositoryTreeNode<T> extends PlatformObject + ((myRepository == null) ? 0 : myRepository.getDirectory() .hashCode()); result = prime * result + myType.hashCode(); + this.hashCode = result; return result; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/revision/SymlinkEditableRevision.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/revision/SymlinkEditableRevision.java new file mode 100644 index 0000000000..7595710b39 --- /dev/null +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/revision/SymlinkEditableRevision.java @@ -0,0 +1,158 @@ +/******************************************************************************* + * Copyright (C) 2013, 2022 Robin Stocker <robin@nibor.org> and others + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ +package org.eclipse.egit.ui.internal.revision; + +import java.io.File; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.Objects; + +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.resources.WorkspaceJob; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.ISchedulingRule; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.egit.core.internal.util.ResourceUtil; +import org.eclipse.egit.ui.Activator; +import org.eclipse.jface.operation.IRunnableContext; +import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.util.FileUtils; +import org.eclipse.jgit.util.RawParseUtils; +import org.eclipse.team.core.history.IFileRevision; + +/** + * Editable revision backed by a symlink (inside or outside the workspace). Used + * for conflict resolutions with stage 2 (previous HEAD) as input; updating the + * working tree file (which is supposed to be a symlink). + * <p> + * If you have a backing {@link IFile}, use {@link ResourceEditableRevision}. + * </p> + * <p> + * Git always places a file in the working tree in link/file or file/link + * conflicts. Only in link/link conflicts, we will have a symlink in the working + * tree. + * </p> + */ +public class SymlinkEditableRevision extends EditableRevision { + + private final IPath location; + + private final IRunnableContext runnableContext; + + /** + * @param fileRevision + * @param location + * @param runnableContext + */ + public SymlinkEditableRevision(IFileRevision fileRevision, + @NonNull IPath location, + @NonNull IRunnableContext runnableContext) { + super(fileRevision, null); + this.location = location; + this.runnableContext = runnableContext; + } + + @Override + public void setContent(final byte[] newContent) { + try { + // Don't fork: if we are called from a thread which locked + // workspace our *forked* operation will never complete because it + // requires file lock which cannot be acquired from another thread + ISchedulingRule rule = Job.getJobManager().currentRule(); + boolean fork = true; + if (rule instanceof IResource) { + IFile ourFile = ResourcesPlugin.getWorkspace().getRoot() + .getFile(location); + if (ourFile.exists() + && ((IResource) rule).isConflicting(ourFile)) + fork = false; + } + runnableContext.run(fork, false, monitor -> { + int eol = RawParseUtils.nextLF(newContent, 0); + String target = new String(newContent, 0, eol, + StandardCharsets.UTF_8).trim(); + try { + File linkFile = location.toFile(); + boolean wasBrokenLink = !linkFile.exists(); + java.nio.file.Path link = FileUtils.createSymLink(linkFile, + target); + updateLinkResource(wasBrokenLink, link); + } catch (IOException e) { + throw new InvocationTargetException(e); + } + }); + fireContentChanged(); + } catch (InvocationTargetException e) { + Activator.handleError(e.getTargetException().getMessage(), + e.getTargetException(), true); + } catch (InterruptedException e) { + // ignore here + } + } + + private void updateLinkResource(boolean wasBroken, + java.nio.file.Path link) { + boolean brokenNow = !Files.exists(link); + if (brokenNow == wasBroken) { + // If the state doesn't change, we don't care, either Eclipse + // doesn's see broken link and we can't do anything or it is not + // broken and Eclipse handles the change + return; + } + // refresh the parent if either the link was broken before or broken + // just now + IPath parentPath = location.removeLastSegments(1); + @SuppressWarnings("null") + final IContainer parent = ResourceUtil + .getContainerForLocation(parentPath, true); + if (parent != null) { + WorkspaceJob job = new WorkspaceJob("Refreshing " + parentPath) { //$NON-NLS-1$ + + @Override + public IStatus runInWorkspace(IProgressMonitor m) + throws CoreException { + parent.refreshLocal(IResource.DEPTH_ONE, m); + return Status.OK_STATUS; + } + }; + job.setSystem(true); + job.schedule(); + } + } + + @Override + public int hashCode() { + return 31 * super.hashCode() + Objects.hash(location, runnableContext); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null || !super.equals(obj) || getClass() != obj.getClass()) { + return false; + } + SymlinkEditableRevision other = (SymlinkEditableRevision) obj; + return Objects.equals(location, other.location) + && Objects.equals(runnableContext, other.runnableContext); + } + +} diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/search/CommitSearchQuery.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/search/CommitSearchQuery.java index df19f94468..4ddc394231 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/search/CommitSearchQuery.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/search/CommitSearchQuery.java @@ -44,7 +44,7 @@ import org.eclipse.search.ui.ISearchResult; */ public class CommitSearchQuery implements ISearchQuery { - private abstract class SearchMatcher { + private abstract static class SearchMatcher { abstract boolean matches(Pattern pattern, RevCommit commit); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java index c76cc2e870..1960341f16 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/sharing/ExistingOrNewPage.java @@ -51,6 +51,8 @@ import org.eclipse.jface.viewers.ViewerComparator; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; @@ -58,7 +60,6 @@ import org.eclipse.jgit.lib.RepositoryBuilder; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevTree; import org.eclipse.jgit.revwalk.RevWalk; -import org.eclipse.jgit.storage.file.FileRepositoryBuilder; import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; @@ -394,12 +395,11 @@ class ExistingOrNewPage extends WizardPage { createRepo.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - File gitDir = new File(repositoryToCreate.getText(), - Constants.DOT_GIT); + File workingDir = new File(repositoryToCreate.getText()); + File gitDir = new File(workingDir, Constants.DOT_GIT); try { - try (Repository repository = FileRepositoryBuilder - .create(gitDir)) { - repository.create(); + try (Git git = Git.init().setDirectory(workingDir).call()) { + // And close it. } for (IProject project : getProjects(false).keySet()) { // If we don't refresh the project directories right @@ -416,7 +416,7 @@ class ExistingOrNewPage extends WizardPage { new NullProgressMonitor()); } RepositoryUtil.INSTANCE.addConfiguredRepository(gitDir); - } catch (IOException e1) { + } catch (GitAPIException e1) { String msg = NLS .bind(UIText.ExistingOrNewPage_ErrorFailedToCreateRepository, gitDir.toString()); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/LazyRepositoryState.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/LazyRepositoryState.java new file mode 100644 index 0000000000..9fde859299 --- /dev/null +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/LazyRepositoryState.java @@ -0,0 +1,39 @@ +/******************************************************************************* + * Copyright (C) 2023 SSI (Joerg Kubitz) and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ +package org.eclipse.egit.ui.internal.staging; + +import java.util.function.Supplier; + +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.RepositoryState; + +/** Used to cache result. This implementation is not thread-safe. **/ +class LazyRepositoryState implements Supplier<RepositoryState> { + private final Repository repo; + + private RepositoryState state; + + LazyRepositoryState(Repository repo) { + this.repo = repo; + } + + @Override + public RepositoryState get() { + if (state == null) { + state = repo == null ? null : repo.getRepositoryState(); + } + return state; + } + + Repository getRepository() { + return repo; + } +}
\ No newline at end of file diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingEntry.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingEntry.java index b5d3bbab66..69e19e8177 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingEntry.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingEntry.java @@ -241,6 +241,9 @@ public class StagingEntry extends PlatformObject fileLoaded = true; file = fileProvider.apply(this); } + if (file != null && !file.getProject().isAccessible()) { + return null; + } return file; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java index 173236ea85..5c0bd1a7c7 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingView.java @@ -24,6 +24,8 @@ import static org.eclipse.egit.ui.internal.CommonUtils.runCommand; import java.io.File; import java.io.IOException; import java.net.URISyntaxException; +import java.nio.file.Files; +import java.nio.file.LinkOption; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; @@ -75,6 +77,7 @@ import org.eclipse.egit.core.internal.indexdiff.IndexDiffData; import org.eclipse.egit.core.internal.job.JobUtil; import org.eclipse.egit.core.internal.job.RuleUtil; import org.eclipse.egit.core.internal.signing.GpgSetup; +import org.eclipse.egit.core.internal.storage.GitFileRevision; import org.eclipse.egit.core.op.AssumeUnchangedOperation; import org.eclipse.egit.core.op.CommitOperation; import org.eclipse.egit.core.op.DiscardChangesOperation; @@ -86,6 +89,7 @@ import org.eclipse.egit.ui.UIPreferences; import org.eclipse.egit.ui.UIUtils; import org.eclipse.egit.ui.internal.ActionUtils; import org.eclipse.egit.ui.internal.CommonUtils; +import org.eclipse.egit.ui.internal.CompareUtils; import org.eclipse.egit.ui.internal.UIIcons; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.actions.ActionCommands; @@ -683,7 +687,7 @@ public class StagingView extends ViewPart if (!RepositoryUtil.PREFS_DIRECTORIES_REL.equals(event.getKey())) { return; } - final Repository repo = currentRepository; + Repository repo = currentRepository; if (repo == null || RepositoryUtil.INSTANCE.contains(repo)) { return; } @@ -1005,6 +1009,7 @@ public class StagingView extends ViewPart previewLayout.topControl = commitMessagePreview; commitMessageSection.setText( UIText.StagingView_CommitMessagePreview); + setCommentCharTooltip(); previewer .setText(commitMessageComponent.getRepository(), commitMessageComponent.getCommitMessage()); @@ -1012,6 +1017,7 @@ public class StagingView extends ViewPart previewLayout.topControl = commitMessageText; commitMessageSection .setText(UIText.StagingView_CommitMessage); + setCommentCharTooltip(); } previewLayout.topControl.getParent().layout(true, true); commitMessageSection.redraw(); @@ -1232,7 +1238,7 @@ public class StagingView extends ViewPart commitAndPushButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - if (canPushHeadOnly()) { + if (canPushHeadOnly(new LazyRepositoryState(currentRepository))) { pushHead(currentRepository); } else { commit(true); @@ -1346,6 +1352,8 @@ public class StagingView extends ViewPart stagedSection.setToolTipText(UIText.StagingView_StagedChangesTooltip); unstagedSection .setToolTipText(UIText.StagingView_UnstagedChangesTooltip); + setCommentCharTooltip(); + commitMessageText.addCleanupChangeListener(this::setCommentCharTooltip); updateToolbar(); enableCommitWidgets(false); refreshAction.setEnabled(false); @@ -1474,6 +1482,24 @@ public class StagingView extends ViewPart } } + private void setCommentCharTooltip() { + if (previewLayout.topControl != commitMessageText) { + commitMessageSection.setToolTipText(null); + return; + } + switch (commitMessageText.getCleanupMode()) { + case STRIP: + case SCISSORS: + commitMessageSection.setToolTipText(MessageFormat.format( + UIText.StagingView_CommentChar, + String.valueOf(commitMessageText.getCommentChar()))); + break; + default: + commitMessageSection.setToolTipText(null); + break; + } + } + /** * On Windows some SWT bug avoids repainting the non selected elements * correctly, see bugzilla 533555. @@ -1522,17 +1548,17 @@ public class StagingView extends ViewPart boolean indexDiffAvailable = indexDiffAvailable(indexDiff); boolean noConflicts = noConflicts(indexDiff); UnitOfWork.execute(currentRepository, () -> { - + Repository repo = currentRepository; + LazyRepositoryState stateCache = new LazyRepositoryState(repo); boolean commitEnabled = noConflicts && indexDiffAvailable - && isCommitPossible() && !isCommitBlocked(); + && isCommitPossible(stateCache) && !isCommitBlocked(); commitButton.setEnabled(commitEnabled); - final Repository repo = currentRepository; - pushesHeadOnly = canPushHeadOnly(); + pushesHeadOnly = canPushHeadOnly(stateCache); commitAndPushButton .setEnabled( repo != null && (commitEnabled || pushesHeadOnly) - && !repo.getRepositoryState().isRebasing()); + && !stateCache.get().isRebasing()); updateCommitAndPush(repo); }); } @@ -3212,6 +3238,11 @@ public class StagingView extends ViewPart }; menuMgr.add(compareWithHead); } + if (stagingEntryList.size() == 2) { + menuMgr.add( + compareWithEachOther(stagingEntryList.get(0), + stagingEntryList.get(1))); + } } Set<StagingEntry.Action> availableActions = getAvailableActions(fileSelection); @@ -3328,6 +3359,34 @@ public class StagingView extends ViewPart } + private IAction compareWithEachOther(StagingEntry left, + StagingEntry right) { + if (left.isStaged()) { + return new Action(UIText.StagingView_CompareWithEachOtherLabel, + UIIcons.ELCL16_COMPARE_VIEW) { + + @Override + public void run() { + CompareUtils.compareBetween(currentRepository, + left.getPath(), right.getPath(), + GitFileRevision.INDEX, GitFileRevision.INDEX, + StagingView.this.getViewSite().getPage()); + } + }; + } + // Unstaged. + return new Action(UIText.StagingView_CompareWithEachOtherLabel, + UIIcons.ELCL16_COMPARE_VIEW) { + + @Override + public void run() { + CompareUtils.compareFiles(left.getFile(), right.getFile(), + left.getLocation().toFile(), + right.getLocation().toFile(), StagingView.this); + } + }; + } + private boolean anyElementIsExistingFile(IStructuredSelection s) { for (Object element : s.toList()) { if (element instanceof StagingEntry) { @@ -3874,7 +3933,8 @@ public class StagingView extends ViewPart // tree. If it has been deleted, the user resolved the conflict in // favour of the deletion. In other conflicts, if the user removes // the file, we also should remove it from the index. - if (!entry.getLocation().toFile().exists()) { + if (!Files.exists(entry.getLocation().toFile().toPath(), + LinkOption.NOFOLLOW_LINKS)) { rmPaths.add(entry.getPath()); } else { addPaths.add(entry.getPath()); @@ -4226,18 +4286,18 @@ public class StagingView extends ViewPart unstagedViewer.setSelection(unstagedViewer.getSelection()); refreshAction.setEnabled(true); - updateRebaseButtonVisibility( - repository.getRepositoryState().isRebasing()); + RepositoryState repositoryState = repository.getRepositoryState(); + updateRebaseButtonVisibility(repositoryState.isRebasing()); updateIgnoreErrorsButtonVisibility(); boolean rebaseContinueEnabled = indexDiffAvailable - && repository.getRepositoryState().isRebasing() + && repositoryState.isRebasing() && noConflicts; rebaseContinueButton.setEnabled(rebaseContinueEnabled); isUnbornHead = false; - if (repository.getRepositoryState() == RepositoryState.SAFE) { + if (repositoryState == RepositoryState.SAFE) { try { Ref head = repository.exactRef(Constants.HEAD); if (head != null && head.isSymbolic() @@ -4746,7 +4806,7 @@ public class StagingView extends ViewPart * @return whether a job was scheduled */ private boolean internalCommit(boolean pushUpstream, Runnable afterJob) { - if (!isCommitPossible()) { + if (!isCommitPossible(new LazyRepositoryState(currentRepository))) { MessageDialog md = new MessageDialog(getSite().getShell(), UIText.StagingView_committingNotPossible, null, UIText.StagingView_noStagedFiles, MessageDialog.ERROR, @@ -4859,10 +4919,11 @@ public class StagingView extends ViewPart job.schedule(); } - private boolean isCommitPossible() { - return stagedViewer.getTree().getItemCount() > 0 + private boolean isCommitPossible(LazyRepositoryState stateSupplier) { + return stateSupplier.getRepository() != null + && stagedViewer.getTree().getItemCount() > 0 || amendPreviousCommitAction.isChecked() - || CommitHelper.isCommitWithoutFilesAllowed(currentRepository); + || CommitHelper.isCommitWithoutFilesAllowed(stateSupplier.get()); } @Override @@ -5148,11 +5209,11 @@ public class StagingView extends ViewPart } } - private boolean canPushHeadOnly() { - Repository repo = currentRepository; + private boolean canPushHeadOnly(LazyRepositoryState stateSupplier) { + Repository repo = stateSupplier.getRepository(); try { return repo != null && repo.resolve(Constants.HEAD) != null - && !isCommitPossible(); + && !isCommitPossible(stateSupplier); } catch (IOException e) { return false; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingViewContentProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingViewContentProvider.java index 050ee5b1c6..94e30d9dfd 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingViewContentProvider.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/staging/StagingViewContentProvider.java @@ -39,10 +39,10 @@ import java.util.stream.Stream; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.egit.core.internal.indexdiff.IndexDiffData; +import org.eclipse.egit.core.internal.util.ResourceUtil; import org.eclipse.egit.ui.internal.staging.StagingView.Presentation; import org.eclipse.egit.ui.internal.staging.StagingView.StagingViewUpdate; import org.eclipse.jface.viewers.Viewer; @@ -130,8 +130,8 @@ public class StagingViewContentProvider extends WorkbenchContentProvider { if (repo != null) { IPath path = new Path( repository.getWorkTree().getAbsolutePath()); - rootContainer = ResourcesPlugin.getWorkspace().getRoot() - .getContainerForLocation(path); + rootContainer = ResourceUtil.getContainerForLocation(path, + false); if (rootContainer != null && rootContainer.getType() == IResource.ROOT) { // Files in the workspace root can't be accessed as diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/DefaultGitSynchronizer.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/DefaultGitSynchronizer.java index 0e93267a44..7fc6093d16 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/DefaultGitSynchronizer.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/DefaultGitSynchronizer.java @@ -102,9 +102,11 @@ public class DefaultGitSynchronizer implements GitSynchronizer { if (mapping == null) { Activator.error( NLS.bind(UIText.GitHistoryPage_errorLookingUpPath, - file.getLocation(), - repository), - null); + file.getLocation(), repository), + new IOException(NLS.bind( + UIText.CompareUtils_errorNotShared, + file.getFullPath(), + file.getProject().getName()))); return; } final String gitPath = mapping.getRepoRelativePath(file); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/compare/LocalNonWorkspaceTypedElement.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/compare/LocalNonWorkspaceTypedElement.java index 4d01b47d59..87fb0a83d6 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/compare/LocalNonWorkspaceTypedElement.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/compare/LocalNonWorkspaceTypedElement.java @@ -21,10 +21,12 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.nio.file.Files; +import java.nio.file.LinkOption; +import java.nio.file.attribute.FileTime; import java.util.Collections; +import java.util.Objects; import org.eclipse.compare.ISharedDocumentAdapter; -import org.eclipse.compare.internal.Utilities; import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.resources.IContainer; @@ -85,7 +87,7 @@ public class LocalNonWorkspaceTypedElement extends LocalResourceTypedElement private boolean fDirty; - private long timestamp; + private FileTime timestamp; private boolean useSharedDocument = true; @@ -118,7 +120,16 @@ public class LocalNonWorkspaceTypedElement extends LocalResourceTypedElement isFile = file.isFile(); exists = isFile || isSymlink || file.exists(); if (exists) { - timestamp = file.lastModified(); + timestamp = getTimestamp(file); + } + } + + private FileTime getTimestamp(File file) { + try { + return Files.getLastModifiedTime(file.toPath(), + LinkOption.NOFOLLOW_LINKS); + } catch (IOException e) { + return null; } } @@ -140,11 +151,13 @@ public class LocalNonWorkspaceTypedElement extends LocalResourceTypedElement @Override public byte[] getContent() { if (modifiedContent == null) { - try { - InputStream is = createStream(); - modifiedContent = Utilities.readBytes(is); + try (InputStream is = createStream()) { + modifiedContent = is.readAllBytes(); } catch (CoreException e) { Activator.handleStatus(e.getStatus(), false); + } catch (IOException e) { + Activator.handleStatus( + Activator.createErrorStatus(e.getMessage(), e), false); } } return modifiedContent; @@ -164,7 +177,7 @@ public class LocalNonWorkspaceTypedElement extends LocalResourceTypedElement if (exists) { try { File file = path.toFile(); - timestamp = file.lastModified(); + timestamp = getTimestamp(file); if (isSymlink) { String symLink = FileUtils.readSymLink(file); return new ByteArrayInputStream(Constants.encode(symLink)); @@ -219,18 +232,19 @@ public class LocalNonWorkspaceTypedElement extends LocalResourceTypedElement @Override public long getModificationDate() { - return timestamp; + return timestamp != null ? timestamp.toMillis() : 0; } @Override public boolean isSynchronized() { - return path.toFile().lastModified() == timestamp; + return Objects.equals(getTimestamp(path.toFile()), timestamp); } /** {@inheritDoc} */ @Override public void update() { - exists = path.toFile().exists(); + exists = Files.exists(path.toFile().toPath(), + LinkOption.NOFOLLOW_LINKS); } /** {@inheritDoc} */ @@ -252,7 +266,7 @@ public class LocalNonWorkspaceTypedElement extends LocalResourceTypedElement } private void refreshTimestamp() { - timestamp = path.toFile().lastModified(); + timestamp = getTimestamp(path.toFile()); } /** {@inheritDoc} */ diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index bfb6a18ff8..8c5305496b 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2005, 2019, 2020 Shawn Pearce and others. +# Copyright (c) 2005, 2023 Shawn Pearce and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 @@ -369,11 +369,6 @@ CompareTreeView_NoInputText=No input CompareTreeView_RepositoryRootName=Repository root CompareTreeView_WorkspaceVersionText=Workspace CompareTreeView_CompareModeTooltip=Compare mode -CompareUtils_DiffToolExecutionFailed=Diff tool execution failed:\t -CompareUtils_jobName=Git Compare... -CompareUtils_errorGettingEncoding=Getting encoding failed -CompareUtils_errorGettingHeadCommit=Getting HEAD commit failed -CompareUtils_wrongResourceArgument=Given argument is neither a file nor a link: {1} RebaseCurrentRefCommand_RebaseCanceledMessage=The rebase operation was canceled. RebaseCurrentRefCommand_RebasingCurrentJobName=Rebasing Branch {0} on {1} @@ -499,6 +494,7 @@ RepositoryPropertySource_SelectModeTooltip=Select a configuration to display RepositoryPropertySource_SingleValueButton=Single Value RepositoryPropertySource_SuppressMultipleValueTooltip=Suppress display of multiple values RepositoryPropertySource_SystemConfigurationMenu=System Configuration +RepositoryPropertySource_XdgConfigurationMenu=XDG_CONFIG_HOME Configuration RepositoryRemotePropertySource_ErrorHeader=Error RepositoryRemotePropertySource_FetchLabel=Remote Fetch Specification @@ -827,6 +823,8 @@ dialog supports operations such as pushing multiple refspecs and deleting remote PushBranchWizard_WindowTitle=Push Branch {0} PushBranchWizard_previewButton=Pre&view > PushBranchWizard_pushButton=&Push +PushCommitHandler_pushBranchLabel=&Push Branch... +PushCommitHandler_pushCommitLabel=&Push Commit... PushCommitHandler_pushCommitTitle=Push Commit PushOperationUI_MultiRepositoriesDestinationString={0} repositories PushOperationUI_PushJobName=Push to {0} @@ -946,12 +944,22 @@ CompareWithPreviousActionHandler_MessageRevisionNotFound=No previous revision of CompareWithPreviousActionHandler_TitleRevisionNotFound=Previous revision not found CompareWithRefAction_errorOnSynchronize=Error reading from repository while preparing input for compare operation. +CompareUtils_DiffToolExecutionFailed=Diff tool execution failed at {0} CompareUtils_errorCommonAncestor=Error finding common ancestor for {0} and {1} +CompareUtils_errorGettingEncoding=Getting encoding failed +CompareUtils_errorGettingHeadCommit=Getting HEAD commit failed +CompareUtils_errorHiddenResourceCreate=Cannot create hidden resources for files outside the Eclipse workspace +CompareUtils_errorHiddenResourceDelete=Problems removing hidden resources for files outside the Eclipse workspace +CompareUtils_errorNotShared={0}: project ''{1}'' is not shared with EGit; metadata is missing +CompareUtils_errorRenameDetection=Cannot determine whether {0} was renamed CompareUtils_ExecutingExtDiffTool=Running external diff tool... -CompareUtils_ExternalDiffToolDied=External diff tool died, stopping at\t +CompareUtils_ExternalDiffToolDied=External diff tool died at {0} CompareUtils_GitConfigurationErrorText=Git configuration can not be retrieved. +CompareUtils_jobName=Git Compare... CompareUtils_NoDiffToolsDefined=No tool configured. CompareUtils_NoDiffToolSpecified=No difftool is set. Will try a preconfigured one now. To configure one open the git config settings. +CompareUtils_ResourceCleanupJobName=Cleaning Hidden Resources +CompareUtils_wrongResourceArgument={0} is neither a file nor a link MergeToolActionHandler_openExternalMergeToolJobName=Prepare file list for external merge tools MergeToolActionHandler_openExternalMergeToolWaitInterrupted=Interrupted while computing merge contents. MergeToolActionHandler_externalMergeToolRunFailed=Failed to run external merge tool. @@ -1013,6 +1021,7 @@ PushResultDialog_label=Pushed to {0} PushResultDialog_label_failed=Failed pushing to {0} PushResultDialog_ConfigureButton=C&onfigure... PushResultTable_MessageText=Message Details +PushResultTable_PrePushHookOutput=Output from the ''pre-push'' hook:\n{0}{1}--------\n PushResultTable_repository=Repository PushResultTable_statusRemoteRejected=[remote rejected] PushResultTable_statusRejected=[rejected] @@ -1648,6 +1657,7 @@ ContinueRebaseCommand_JobName=Continuing Rebase MixedResetToRevisionAction_mixedReset=Mixed Reset GlobalConfigurationPreferencePage_systemSettingTabTitle=&System Settings +GlobalConfigurationPreferencePage_userSettingLabel=Con&figuration: GlobalConfigurationPreferencePage_userSettingTabTitle=&User Settings GlobalConfigurationPreferencePage_repositorySettingTabTitle=Repository Sett&ings GlobalConfigurationPreferencePage_repositorySettingRepositoryLabel=Reposi&tory: @@ -1826,6 +1836,7 @@ CommitFileDiffViewer_OpenInEditorMenuWithCommitLabel=Open &This Version (Commit CommitFileDiffViewer_OpenInEditorMenuTooltip=Commit message: {0} CommitFileDiffViewer_OpenPreviousInEditorMenuLabel=Open &Previous Version CommitFileDiffViewer_OpenWorkingTreeVersionInEditorMenuLabel=&Open Working Tree Version +StagingView_CompareWithEachOtherLabel=Compare with Each Other StagingView_CompareWithHeadMenuLabel=Compare with HEAD StagingView_CompareWithIndexMenuLabel=Compare with Index StagingView_Conflict_A_long=Conflicting file additions @@ -2057,7 +2068,6 @@ GitMergeEditorInput_CheckingResourcesTaskName=Checking resources GitMergeEditorInput_CompareWithEachOtherMenuLabel=&Compare with Each Other GitMergeEditorInput_ErrorUpdatingIndex=Merge editor could not update the git index for conflict path ''{0}'' GitMergeEditorInput_MergeEditorTitle=Repository ''{0}'': Merging ''{1}'' into ''{2}'' -GitMergeEditorInput_ResourceCleanupJobName=Cleaning Hidden Resources GitMergeEditorInput_ToggleCurrentChangesLabel=&Hide Changes Between Current and Ancestor GitMergeEditorInput_WorkspaceHeader=Working Tree Version GitMergeEditorInput_WorkspaceOursHeader=Pre-merged Local Version ('Ours') @@ -2125,6 +2135,7 @@ StagingView_Sign_Commit=Sign Commit StagingView_Sign_Not_Available=Signing support not installed StagingView_Assume_Unchanged=A&ssume Unchanged StagingView_cancelCommitAfterSaving=Cancel the commit to first handle (e.g. stage) the newly saved files? +StagingView_CommentChar=Lines starting with {0} are comments. StagingView_Commit=&Commit StagingView_CommitToolTip=Commit ({0}) StagingView_PushHEAD=&Push HEAD... diff --git a/org.eclipse.egit/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 2fca432276..0000000000 --- a/org.eclipse.egit/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description}\n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit/META-INF/MANIFEST.MF b/org.eclipse.egit/META-INF/MANIFEST.MF index f2c75d942d..a329d6852d 100644 --- a/org.eclipse.egit/META-INF/MANIFEST.MF +++ b/org.eclipse.egit/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.egit;singleton:=true -Bundle-Version: 6.3.0.qualifier +Bundle-Version: 6.8.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.egit/pom.xml b/org.eclipse.egit/pom.xml index 2cb4669485..a14a319322 100644 --- a/org.eclipse.egit/pom.xml +++ b/org.eclipse.egit/pom.xml @@ -18,7 +18,7 @@ <parent> <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> + <version>6.8.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.egit</artifactId> @@ -19,7 +19,7 @@ <groupId>org.eclipse.egit</groupId> <artifactId>egit-parent</artifactId> - <version>6.3.0-SNAPSHOT</version> + <version>6.8.0-SNAPSHOT</version> <packaging>pom</packaging> <name>EGit Parent</name> @@ -47,7 +47,8 @@ <licenses> <license> - <name>Eclipse Public License 2.0</name> + <name>EPL-2.0</name> + <url>https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt</url> <comments> All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 @@ -61,17 +62,16 @@ <properties> <maven-version-minimum>3.6.3</maven-version-minimum> - <egit-version>6.3.0-SNAPSHOT</egit-version> - <tycho-version>2.7.3</tycho-version> - <tycho-extras-version>${tycho-version}</tycho-extras-version> + <egit-version>6.8.0-SNAPSHOT</egit-version> + <tycho-version>4.0.2</tycho-version> <java-version>11</java-version> - <ecj-version>3.29.0</ecj-version> - <spotbugs-maven-plugin-version>4.4.1</spotbugs-maven-plugin-version> + <ecj-version>3.33.0</ecj-version> + <spotbugs-maven-plugin-version>4.7.3.4</spotbugs-maven-plugin-version> <jgit-site>file:/${basedir}/../../jgit/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/target/repository</jgit-site> <license-site>https://download.eclipse.org/cbi/updates/license</license-site> <signer-input-directory>/home/data/httpd/download-staging.priv/egit</signer-input-directory> <download-publish-path>/home/data/httpd/download.eclipse.org/egit/updates-nightly</download-publish-path> - <target-platform>egit-4.17</target-platform> + <target-platform>egit-4.26</target-platform> <tycho.scmUrl>scm:git:https://git.eclipse.org/r/egit/egit.git</tycho.scmUrl> <egit.test.tmpdir></egit.test.tmpdir> <test.vmparams></test.vmparams> @@ -79,6 +79,9 @@ <uitest.vmparams>-Degit.test.tmpdir=${egit.test.tmpdir} -Dorg.eclipse.swtbot.search.timeout=30000 -Dorg.eclipse.swtbot.screenshots.dir=target/screenshots -Xmx1024m</uitest.vmparams> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <!-- license check --> + <dash.fail>true</dash.fail> + <dash.projectId>technology.egit</dash.projectId> </properties> <profiles> @@ -104,9 +107,6 @@ <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>target-platform-configuration</artifactId> - <configuration> - <includePackedArtifacts>true</includePackedArtifacts> - </configuration> </plugin> <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> @@ -173,9 +173,6 @@ <module>org.eclipse.egit.core</module> <module>org.eclipse.egit.ui</module> - <module>org.eclipse.egit.mylyn.ui</module> - <module>org.eclipse.egit.mylyn-feature</module> - <module>org.eclipse.egit.doc</module> <module>org.eclipse.egit-feature</module> @@ -191,7 +188,6 @@ <module>org.eclipse.egit.core.junit</module> <module>org.eclipse.egit.core.test</module> <module>org.eclipse.egit.ui.test</module> - <module>org.eclipse.egit.mylyn.ui.test</module> </modules> <pluginRepositories> @@ -200,17 +196,9 @@ <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url> </pluginRepository> <pluginRepository> - <id>repo.eclipse.org.cbi-snapshots</id> - <url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</url> - </pluginRepository> - <pluginRepository> <id>repo.eclipse.org.dash-releases</id> <url>https://repo.eclipse.org/content/repositories/dash-licenses-releases/</url> </pluginRepository> - <pluginRepository> - <id>repo.eclipse.org.dash-snapshots</id> - <url>https://repo.eclipse.org/content/repositories/dash-licenses-snapshots/</url> - </pluginRepository> </pluginRepositories> <repositories> @@ -259,7 +247,7 @@ <target> <file>${project.basedir}/../org.eclipse.egit.target/${target-platform}.target</file> </target> - <resolver>p2</resolver> + <requireEagerResolve>true</requireEagerResolve> <pomDependencies>consider</pomDependencies> <environments> <environment> @@ -277,9 +265,30 @@ <ws>cocoa</ws> <arch>x86_64</arch> </environment> + <environment> + <os>macosx</os> + <ws>cocoa</ws> + <arch>aarch64</arch> + </environment> </environments> </configuration> </plugin> + <plugin> + <groupId>org.eclipse.dash</groupId> + <artifactId>license-tool-plugin</artifactId> + <version>1.0.2</version> + <executions> + <execution> + <id>license-check</id> + <goals> + <goal>license-check</goal> + </goals> + </execution> + </executions> + <configuration> + <excludeScope>test</excludeScope> + </configuration> + </plugin> </plugins> <pluginManagement> <plugins> @@ -333,7 +342,7 @@ <dependency> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-sourceref-jgit</artifactId> - <version>${tycho-extras-version}</version> + <version>${tycho-version}</version> </dependency> </dependencies> </plugin> @@ -371,16 +380,21 @@ <artifactId>tycho-p2-repository-plugin</artifactId> <version>${tycho-version}</version> </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-gpg-plugin</artifactId> + <version>${tycho-version}</version> + </plugin> <!-- other plugins --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>3.0.0-M3</version> + <version>3.3.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-antrun-plugin</artifactId> - <version>1.8</version> + <version>3.1.0</version> </plugin> <plugin> <groupId>com.github.spotbugs</groupId> @@ -402,9 +416,8 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>3.15.0</version> + <version>3.21.0</version> <configuration> - <sourceEncoding>utf-8</sourceEncoding> <minimumTokens>100</minimumTokens> <targetJdk>${java-version}</targetJdk> <format>xml</format> @@ -422,12 +435,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>3.2.0</version> + <version>3.5.0</version> </plugin> <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-jarsigner-plugin</artifactId> - <version>1.3.2</version> + <version>1.3.5</version> </plugin> </plugins> </pluginManagement> diff --git a/tools/egit-developer-tools.p2f b/tools/egit-developer-tools.p2f index 188a73dbcb..587e45c44b 100644 --- a/tools/egit-developer-tools.p2f +++ b/tools/egit-developer-tools.p2f @@ -102,11 +102,6 @@ <repository location='https://download.eclipse.org/egit/updates-nightly'/> </repositories> </iu> - <iu id='org.eclipse.egit.mylyn.feature.group' name='EGit Mylyn' version='0.0.0'> - <repositories size='1'> - <repository location='https://download.eclipse.org/egit/updates-nightly'/> - </repositories> - </iu> <iu id='org.eclipse.jgit.feature.group' name='Eclipse JGit' version='0.0.0'> <repositories size='1'> <repository location='https://download.eclipse.org/egit/updates-nightly'/> @@ -132,26 +127,6 @@ <repository location='https://spotbugs.github.io/eclipse/'/> </repositories> </iu> - <iu id='org.eclipse.mylyn_feature.feature.group' name='Mylyn' version='0.0.0'> - <repositories size='1'> - <repository location='https://download.eclipse.org/mylyn/snapshots/weekly'/> - </repositories> - </iu> - <iu id='org.eclipse.mylyn.bugzilla_feature.feature.group' name='Mylyn Tasks Connector: Bugzilla' version='0.0.0'> - <repositories size='1'> - <repository location='https://download.eclipse.org/mylyn/snapshots/weekly'/> - </repositories> - </iu> - <iu id='org.eclipse.mylyn.reviews.feature.feature.group' name='Mylyn Reviews' version='0.0.0'> - <repositories size='1'> - <repository location='https://download.eclipse.org/reviews/nightly'/> - </repositories> - </iu> - <iu id='org.eclipse.mylyn.gerrit.feature.feature.group' name='Mylyn Reviews Connector: Gerrit' version='0.0.0'> - <repositories size='1'> - <repository location='https://download.eclipse.org/reviews/nightly'/> - </repositories> - </iu> <iu id='org.eclipse.swtbot.forms.feature.group' name='SWTBot for Eclipse Forms Testing (incubation)' version='0.0.0'> <repositories size='1'> <repository location='https://download.eclipse.org/technology/swtbot/releases/latest/'/> diff --git a/tools/oomph/EGit.setup b/tools/oomph/EGit.setup index fecc8aba17..7d5787129c 100644 --- a/tools/oomph/EGit.setup +++ b/tools/oomph/EGit.setup @@ -50,8 +50,6 @@ <setupTask xsi:type="setup.p2:P2Task"> <requirement - name="org.eclipse.pde.api.tools.ee.feature.feature.group"/> - <requirement name="org.eclipse.swtbot.ide.feature.group"/> <requirement name="org.eclipse.swtbot.generator.feature.feature.group"/> @@ -69,7 +67,7 @@ <repository url="https://download.eclipse.org/technology/swtbot/releases/latest"/> <repository - url="https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT"/> + url="https://download.eclipse.org/cbi/updates/tpd/nightly/latest"/> <repository url="https://download.eclipse.org/modeling/tmf/xtext/updates/composite/latest/"/> <repository @@ -90,9 +88,22 @@ <setupTask xsi:type="setup:ResourceCreationTask" excludedTriggers="STARTUP MANUAL" - content="<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
	<section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart">
		<item value="true" key="group_libraries"/>
		<item value="false" key="linkWithEditor"/>
		<item value="2" key="layout"/>
		<item value="2" key="rootMode"/>
		<item value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#x0D;&#x0A;&lt;packageExplorer configured=&quot;true&quot; group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;2&quot; sortWorkingSets=&quot;false&quot; workingSetName=&quot;&quot;&gt;&#x0D;&#x0A;&lt;localWorkingSetManager&gt;&#x0D;&#x0A;&lt;workingSet editPageId=&quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1382792884467_1&quot; label=&quot;Other Projects&quot; name=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;/localWorkingSetManager&gt;&#x0D;&#x0A;&lt;activeWorkingSet workingSetName=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;allWorkingSets workingSetName=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;/packageExplorer&gt;" key="memento"/>
	</section>
</section>
" targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml" - encoding="UTF-8"/> + encoding="UTF-8"> + <content> + <?xml version="1.0" encoding="UTF-8"?> + <section name="Workbench"> + <section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart"> + <item value="true" key="group_libraries"/> + <item value="false" key="linkWithEditor"/> + <item value="2" key="layout"/> + <item value="2" key="rootMode"/> + <item value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#x0D;&#x0A;&lt;packageExplorer configured=&quot;true&quot; group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;2&quot; sortWorkingSets=&quot;false&quot; workingSetName=&quot;&quot;&gt;&#x0D;&#x0A;&lt;localWorkingSetManager&gt;&#x0D;&#x0A;&lt;workingSet editPageId=&quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1382792884467_1&quot; label=&quot;Other Projects&quot; name=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;/localWorkingSetManager&gt;&#x0D;&#x0A;&lt;activeWorkingSet workingSetName=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;allWorkingSets workingSetName=&quot;Other Projects&quot;/&gt;&#x0D;&#x0A;&lt;/packageExplorer&gt;" key="memento"/> + </section> + </section> + + </content> + </setupTask> <setupTask xsi:type="setup:VariableTask" name="eclipse.target.platform" @@ -103,59 +114,49 @@ <setupTask xsi:type="setup:VariableTask" name="egit.target.platform" - defaultValue="egit-4.18" + defaultValue="egit-4.26" storageURI="scope://Workspace" label="EGit Target Platform"> <choice - value="egit-4.17" - label="EGit 2020-09 (4.17) target"/> - <choice - value="egit-4.18" - label="EGit 2020-12 (4.18) target"/> + value="egit-4.26" + label="EGit 2022-12 (4.26) target"/> <choice - value="egit-4.19" - label="EGit 2021-03 (4.19) target"/> + value="egit-4.27" + label="EGit 2023-03 (4.27) target"/> <choice - value="egit-4.20" - label="EGit 2021-06 (4.20) target"/> + value="egit-4.28" + label="EGit 2023-06 (4.28) target"/> <choice - value="egit-4.21" - label="EGit 2021-09 (4.21) target"/> - <choice - value="egit-4.22" - label="EGit 2021-12 (4.22) target"/> - <choice - value="egit-4.23" - label="EGit 2022-03 (4.23) target"/> + value="egit-4.29" + label="EGit 2023-09 (4.29) target"/> <description>Default target platform for EGit development.</description> </setupTask> <setupTask xsi:type="pde:APIBaselineTask" name="EGit" activate="false" - version="6.0.0" - location="${workspace.location/../api.baseline/6.0.0}" - remoteURI="https://download.eclipse.org/egit/updates-6.0/org.eclipse.egit.repository-6.0.0.202111291000-r.zip"> - <description>EGit 6.0.0 API baseline; to be used with branch stable-6.1</description> + version="6.5.0" + location="${workspace.location/../api.baseline/6.5.0}" + remoteURI="https://download.eclipse.org/egit/updates-6.5/org.eclipse.egit.repository-6.5.0.202303070854-r.zip"> + <description>EGit 6.5.0 API baseline; to be used with branch stable-6.6</description> </setupTask> <setupTask xsi:type="pde:APIBaselineTask" name="EGit" activate="false" - version="6.1.0" - location="${workspace.location/../api.baseline/6.1.0}" - remoteURI="https://download.eclipse.org/egit/updates-6.1/org.eclipse.egit.repository-6.1.0.202203080745-r.zip"> - <description>EGit 6.1.0 API baseline; to be used with branch stable-6.2</description> + version="6.6.0" + location="${workspace.location/../api.baseline/6.6.0}" + remoteURI="https://download.eclipse.org/egit/updates-6.6/org.eclipse.egit.repository-6.6.0.202305301015-r.zip"> + <description>EGit 6.6.0 API baseline; to be used with branch stable-6.7</description> </setupTask> <setupTask xsi:type="pde:APIBaselineTask" name="EGit" - version="6.2.0" - location="${workspace.location/../api.baseline/6.2.0}" - remoteURI="https://download.eclipse.org/egit/updates-6.2/org.eclipse.egit.repository-6.2.0.202206071550-r.zip"> - <description>EGit 6.2.0 API baseline; to be used with branch master</description> + version="6.7.0" + location="${workspace.location/../api.baseline/6.7.0}" + remoteURI="https://download.eclipse.org/egit/updates-6.7/org.eclipse.egit.repository-6.7.0.202309050840-r.zip"> + <description>EGit 6.7.0 API baseline; to be used with branch master</description> </setupTask> - <stream name="master" label="Workspace setup for branch master"> <setupTask @@ -215,34 +216,6 @@ <description>EGit</description> </setupTask> <setupTask - xsi:type="git:GitCloneTask" - id="git.clone.egit-github" - remoteURI="egit/egit-github" - checkoutBranch="master"> - <annotation - source="http://www.eclipse.org/oomph/setup/InducedChoices"> - <detail - key="inherit"> - <value>eclipse.git.gerrit.remoteURIs</value> - </detail> - <detail - key="label"> - <value>EGit GitHub Connector Gerrit Repository</value> - </detail> - <detail - key="target"> - <value>remoteURI</value> - </detail> - </annotation> - <configSections - name="gerrit"> - <properties - key="createchangeid" - value="true"/> - </configSections> - <description>EGit GitHub Connector</description> - </setupTask> - <setupTask xsi:type="projects:ProjectsImportTask"> <sourceLocator rootFolder="${git.clone.jgit.location}" @@ -257,9 +230,6 @@ <sourceLocator rootFolder="${git.clone.egit.location}" locateNestedProjects="true"/> - <sourceLocator - rootFolder="${git.clone.egit-github.location}" - locateNestedProjects="true"/> <description>Import the EGit/JGit projects from the git clones into the workspace</description> </setupTask> <setupTask @@ -272,31 +242,6 @@ xsi:type="setup.workingsets:WorkingSetTask" id="egit.workingsets"> <workingSet - name="EGit GitHub Connector"> - <predicate - xsi:type="predicates:AndPredicate"> - <operand - xsi:type="predicates:RepositoryPredicate" - project="org.eclipse.mylyn.github.core"/> - <operand - xsi:type="workingsets:ExclusionPredicate" - excludedWorkingSet="//@streams[name='master']/@setupTasks.5/@workingSets.6 //@streams[name='master']/@setupTasks.5/@workingSets.1"/> - </predicate> - </workingSet> - <workingSet - name="EGit GitHub Connector Tests"> - <predicate - xsi:type="predicates:AndPredicate"> - <operand - xsi:type="predicates:RepositoryPredicate" - project="org.eclipse.mylyn.github.core"/> - <operand - xsi:type="predicates:FilePredicate" - filePattern="META-INF/MANIFEST.MF" - contentPattern="org\.junit"/> - </predicate> - </workingSet> - <workingSet name="EGit"> <predicate xsi:type="predicates:AndPredicate"> @@ -305,7 +250,7 @@ project="org.eclipse.egit.core"/> <operand xsi:type="workingsets:ExclusionPredicate" - excludedWorkingSet="//@streams[name='master']/@setupTasks.5/@workingSets.6 //@streams[name='master']/@setupTasks.5/@workingSets.3"/> + excludedWorkingSet="//'egit.workingsets'/@workingSets[name='Releng'] //'egit.workingsets'/@workingSets[name='EGit%20Tests']"/> </predicate> </workingSet> <workingSet @@ -330,7 +275,7 @@ project="org.eclipse.jgit"/> <operand xsi:type="workingsets:ExclusionPredicate" - excludedWorkingSet="//@streams[name='master']/@setupTasks.5/@workingSets.6 //@streams[name='master']/@setupTasks.5/@workingSets.5"/> + excludedWorkingSet="//'egit.workingsets'/@workingSets[name='Releng'] //'egit.workingsets'/@workingSets[name='JGit%20Tests']"/> </predicate> </workingSet> <workingSet diff --git a/tools/version.sh b/tools/version.sh index 8b65b0c6a0..6c38c9646c 100755 --- a/tools/version.sh +++ b/tools/version.sh @@ -177,22 +177,6 @@ perl -pi~ -e ' perl -pi~ -e ' if ($ARGV ne $old_argv) { $seen_version = 0; - $seen_version2 = 0; - $old_argv = $ARGV; - } - if (!$seen_version) { - $seen_version = 1 if - s{<(version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>}; - } - if ($seen_version2 < 3) { - $seen_version2++ if - s|(<version\>)([\.\d]*)(\</version\>)|${1}'$EGIT_V'${3}|; - } - ' org.eclipse.egit.mylyn.ui.test/pom.xml - -perl -pi~ -e ' - if ($ARGV ne $old_argv) { - $seen_version = 0; $old_argv = $ARGV; } if (!$seen_version) { |
