Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2018-05-29 19:47:09 -0400
committerMatthias Sohn2018-05-29 19:47:30 -0400
commit8a7768c6d9112fbf1258e755ce71b3a98cefa35f (patch)
treea3586239f442345438dd247126a927f34e874933 /org.eclipse.egit.source-feature
parentf8d69ebbfa7788f2e0b8ed416dac128aec3ed9dd (diff)
parent4412ce46de90199a83086e5342a36c0acb581cfe (diff)
downloadegit-8a7768c6d9112fbf1258e755ce71b3a98cefa35f.tar.gz
egit-8a7768c6d9112fbf1258e755ce71b3a98cefa35f.tar.xz
egit-8a7768c6d9112fbf1258e755ce71b3a98cefa35f.zip
Merge branch 'stable-5.0'
* stable-5.0: Fix description property in org.eclipse.egit-feature/feature.properties Update license to EPL-2.0 Add tracing of low-level JSch log messages Change-Id: I2bd4012226097efc8826db3396cccd9e423a283d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.source-feature')
-rw-r--r--org.eclipse.egit.source-feature/feature.properties12
-rw-r--r--org.eclipse.egit.source-feature/feature.xml2
-rw-r--r--org.eclipse.egit.source-feature/pom.xml6
3 files changed, 13 insertions, 7 deletions
diff --git a/org.eclipse.egit.source-feature/feature.properties b/org.eclipse.egit.source-feature/feature.properties
index 3487ec1c1..0b66dbde2 100644
--- a/org.eclipse.egit.source-feature/feature.properties
+++ b/org.eclipse.egit.source-feature/feature.properties
@@ -1,9 +1,11 @@
###############################################################################
# Copyright (c) 2000, 2010 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
###############################################################################
featureName=Git integration for Eclipse - Source Code
@@ -22,7 +24,9 @@ Standalone: includes all the necessary bundles.
copyright=\
Copyright (c) 2005, 2009 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 v1.0\n\
+are made available under the terms of the Eclipse Public License 2.0\n\
which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\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.source-feature/feature.xml b/org.eclipse.egit.source-feature/feature.xml
index e6671e385..fb8c3258e 100644
--- a/org.eclipse.egit.source-feature/feature.xml
+++ b/org.eclipse.egit.source-feature/feature.xml
@@ -6,7 +6,7 @@
provider-name="%providerName"
plugin="org.eclipse.egit"
license-feature="org.eclipse.license"
- license-feature-version="0.0.0">
+ license-feature-version="2.0.0">
<description url="http://www.eclipse.org/egit/">
%description
diff --git a/org.eclipse.egit.source-feature/pom.xml b/org.eclipse.egit.source-feature/pom.xml
index 4bdc75c05..9809ea8b8 100644
--- a/org.eclipse.egit.source-feature/pom.xml
+++ b/org.eclipse.egit.source-feature/pom.xml
@@ -3,9 +3,11 @@
Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com>
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ are made available under the terms of the Eclipse Public License 2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"

Back to the top