diff options
| author | Olivier Constant | 2018-09-07 08:56:53 +0000 |
|---|---|---|
| committer | Olivier Constant | 2018-09-07 14:02:16 +0000 |
| commit | f5683739559038156728caa0dfe5587a10b000f4 (patch) | |
| tree | 5071bfc7a9479498fd65ebf5fe045962aae6ea38 /plugins/org.eclipse.emf.diffmerge.connector.svn | |
| parent | f7462bf1d5a65c9c80ba884b2bce391a89b7a08d (diff) | |
| download | org.eclipse.emf.diffmerge.core-f5683739559038156728caa0dfe5587a10b000f4.tar.gz org.eclipse.emf.diffmerge.core-f5683739559038156728caa0dfe5587a10b000f4.tar.xz org.eclipse.emf.diffmerge.core-f5683739559038156728caa0dfe5587a10b000f4.zip | |
Bug 535213 - Switch to EPL-2.0
Change-Id: I3f390723a7e60d97e38cf74e5d0c6bfb03c0325c
Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'plugins/org.eclipse.emf.diffmerge.connector.svn')
12 files changed, 76 insertions, 66 deletions
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF index bd8e0cf4..d900be15 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF @@ -17,3 +17,4 @@ Require-Bundle: org.eclipse.team.core, org.eclipse.team.svn.ui Export-Package: org.eclipse.emf.diffmerge.connector.svn, org.eclipse.emf.diffmerge.connector.svn.ext +Automatic-Module-Name: org.eclipse.emf.diffmerge.connector.svn diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/about.html b/plugins/org.eclipse.emf.diffmerge.connector.svn/about.html index 7e766fe1..720a1d06 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.svn/about.html +++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/about.html @@ -1,26 +1,25 @@ -<!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>June 5, 2007</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 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</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="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file +<!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>August 17, 2018</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="http://www.eclipse.org/">http://www.eclipse.org</a>.</p> +</body> +</html>
\ No newline at end of file diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/build.properties b/plugins/org.eclipse.emf.diffmerge.connector.svn/build.properties index f9fd2458..e4f6a876 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.svn/build.properties +++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/build.properties @@ -1,9 +1,10 @@ ############################################################################### # Copyright (c) 2015-2017 Intel 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 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################### source.. = src/ output.. = bin/ diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.properties b/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.properties index f96bd214..f1ac7419 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.properties +++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.properties @@ -1,9 +1,10 @@ ############################################################################### # Copyright (c) 2015-2017 Intel 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 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################### pluginName = EMF Diff/Merge Subversion Connector Plug-In (Incubation) providerName = Eclipse Modeling Project diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.xml b/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.xml index 72b283a9..91e2483c 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.xml +++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/plugin.xml @@ -2,10 +2,11 @@ <?eclipse version="3.4"?> <!-- Copyright (c) 2015-2017 Intel 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 - which accompanies this distribution, and is available at - http://www.eclipse.org/legal/epl-v10.html + This program and the accompanying materials are made + available under the terms of the Eclipse Public License 2.0 + which is available at https://www.eclipse.org/legal/epl-2.0/ + + SPDX-License-Identifier: EPL-2.0 Contributors: Stephane Bouchet (Intel Corporation) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/EMFDiffMergeSVNConnectorPlugin.java b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/EMFDiffMergeSVNConnectorPlugin.java index 1597268b..79b99a02 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/EMFDiffMergeSVNConnectorPlugin.java +++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/EMFDiffMergeSVNConnectorPlugin.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2015-2017 Intel 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 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Stephane Bouchet (Intel Corporation) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/Messages.java b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/Messages.java index 73dbc37b..b02e49ef 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/Messages.java +++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/Messages.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2015-2017 Intel 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 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Stephane Bouchet (Intel Corporation) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNHistoryURIConverter.java b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNHistoryURIConverter.java index db7c401c..60b8122a 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNHistoryURIConverter.java +++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNHistoryURIConverter.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2015-2017 Intel 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 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Stephane Bouchet (Intel Corporation) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNLocalScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNLocalScopeDefinitionFactory.java index c2f04460..50b4f4dc 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNLocalScopeDefinitionFactory.java +++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNLocalScopeDefinitionFactory.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2015-2017 Intel 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 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Stephane Bouchet (Intel Corporation) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRemoteScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRemoteScopeDefinitionFactory.java index ba6bc9bc..c2bdb00a 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRemoteScopeDefinitionFactory.java +++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRemoteScopeDefinitionFactory.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2015-2017 Intel 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 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Stephane Bouchet (Intel Corporation) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRevisionScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRevisionScopeDefinitionFactory.java index 7de04c35..32d2a70e 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRevisionScopeDefinitionFactory.java +++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/ext/SVNRevisionScopeDefinitionFactory.java @@ -1,9 +1,10 @@ /******************************************************************************* * Copyright (c) 2015-2017 Intel 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 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 * * Contributors: * Stephane Bouchet (Intel Corporation) - initial API and implementation diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/messages.properties b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/messages.properties index 20c4c28e..49dc5224 100644 --- a/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/messages.properties +++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/src/org/eclipse/emf/diffmerge/connector/svn/messages.properties @@ -1,9 +1,10 @@ ############################################################################### # Copyright (c) 2015-2017 Intel 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 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 ############################################################################### SVNHistoryURIConverter_CannotLoad=Cannot load resource: %s SVNHistoryURIConverter_CannotLoad_Located=Cannot load resource at: %s |