diff options
| author | Matthias Sohn | 2018-05-29 23:47:09 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2018-05-29 23:47:30 +0000 |
| commit | 8a7768c6d9112fbf1258e755ce71b3a98cefa35f (patch) | |
| tree | a3586239f442345438dd247126a927f34e874933 /org.eclipse.egit.gitflow-feature | |
| parent | f8d69ebbfa7788f2e0b8ed416dac128aec3ed9dd (diff) | |
| parent | 4412ce46de90199a83086e5342a36c0acb581cfe (diff) | |
| download | egit-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.gitflow-feature')
| -rw-r--r-- | org.eclipse.egit.gitflow-feature/build.properties | 2 | ||||
| -rw-r--r-- | org.eclipse.egit.gitflow-feature/feature.properties | 12 | ||||
| -rw-r--r-- | org.eclipse.egit.gitflow-feature/feature.xml | 2 | ||||
| -rw-r--r-- | org.eclipse.egit.gitflow-feature/pom.xml | 6 |
4 files changed, 14 insertions, 8 deletions
diff --git a/org.eclipse.egit.gitflow-feature/build.properties b/org.eclipse.egit.gitflow-feature/build.properties index d02caa62da..5ffb7fdf31 100644 --- a/org.eclipse.egit.gitflow-feature/build.properties +++ b/org.eclipse.egit.gitflow-feature/build.properties @@ -1,2 +1,2 @@ bin.includes = feature.xml,\ - feature.properties
\ No newline at end of file + feature.properties diff --git a/org.eclipse.egit.gitflow-feature/feature.properties b/org.eclipse.egit.gitflow-feature/feature.properties index ce8ea4bb8b..c482e3c899 100644 --- a/org.eclipse.egit.gitflow-feature/feature.properties +++ b/org.eclipse.egit.gitflow-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 - Gitflow support @@ -19,7 +21,9 @@ description=GitFlow support for Git integration in Eclipse copyright=\ Copyright (c) 2015 Max Hohenegger.\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.gitflow-feature/feature.xml b/org.eclipse.egit.gitflow-feature/feature.xml index 772dc02359..1af7a9861b 100644 --- a/org.eclipse.egit.gitflow-feature/feature.xml +++ b/org.eclipse.egit.gitflow-feature/feature.xml @@ -6,7 +6,7 @@ provider-name="%providerName" plugin="org.eclipse.egit.gitflow" 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.gitflow-feature/pom.xml b/org.eclipse.egit.gitflow-feature/pom.xml index 2b97868d20..bac6b3c13c 100644 --- a/org.eclipse.egit.gitflow-feature/pom.xml +++ b/org.eclipse.egit.gitflow-feature/pom.xml @@ -3,9 +3,11 @@ Copyright (C) 2015, Max Hohenegger <eclipse@hohenegger.eu> 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" |