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 /pom.xml | |
| 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 'pom.xml')
| -rw-r--r-- | pom.xml | 18 |
1 files changed, 10 insertions, 8 deletions
@@ -5,9 +5,11 @@ Copyright (C) 2011-2012 Matthias Sohn <matthias.sohn@sap.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" @@ -45,14 +47,14 @@ <licenses> <license> - <name>Eclipse Public License v1.0</name> + <name>Eclipse Public License 2.0</name> <comments> - All rights reserved. + 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/ - This program and the accompanying materials are made - available under the terms of the Eclipse Public License v1.0 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.htm + SPDX-License-Identifier: EPL-2.0 </comments> </license> </licenses> |