Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2018-08-20 09:59:57 +0000
committerLars Vogel2018-08-20 10:05:11 +0000
commitc3a1585120a21cab20981ee9bea1aabe9e6d7882 (patch)
tree05fa80b94ed00d2be61b54fb42c493564b618484
parent3a55028d1ca80ea58780dd5b88c40e572db1b773 (diff)
downloadrt.equinox.p2-I20180821-0800.tar.gz
rt.equinox.p2-I20180821-0800.tar.xz
rt.equinox.p2-I20180821-0800.zip
Bug 530393 - EPL 2.0 for exsd in equinox.p2I20180821-2000I20180821-0800
This updates the exsd definitions to EPL 2.0. Regex expression used below, manually fixed: bundles/org.eclipse.equinox.p2.artifact.repository/schema/artifactChecksums.exsd bundles/org.eclipse.equinox.p2.discovery.compatibility/schema/connectorDiscovery.exsd git checkout master git reset --hard origin/master git pull find . -type f -name "*.exsd" -exec sed -i -E 's/http:\/\/www.eclipse.org\/legal\/epl-v10.html\&quot;\&gt;http:\/\/www.eclipse.org\/legal\/epl-v10.html\&lt;\/a\&gt;/https:\/\/www.eclipse.org\/legal\/epl-2.0\&quot;\&gt;https:\/\/www.eclipse.org\/legal\/epl-v20.html\&lt;\/a\&gt;\/\n\nSPDX-License-Identifier: EPL-2.0/' {} + find . -type f -name "*.exsd" | xargs sed -i 's/Eclipse Public License v1.0/Eclipse Public License 2.0/g' find . -type f -name "*.exsd" -exec sed -i -E 's/([[:blank:]]*[^[:blank:]])*([[:blank:]]*)(All rights reserved. )/\1\n\1\2/' {} + Change-Id: I01eb54895c4bcbb7cc1988fc176b2da984944e09 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/schema/artifactChecksums.exsd10
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/schema/artifactRepositories.exsd9
-rw-r--r--bundles/org.eclipse.equinox.p2.artifact.repository/schema/processingSteps.exsd9
-rw-r--r--bundles/org.eclipse.equinox.p2.discovery.compatibility/schema/connectorDiscovery.exsd11
-rw-r--r--bundles/org.eclipse.equinox.p2.engine/schema/touchpoints.exsd9
-rw-r--r--bundles/org.eclipse.equinox.p2.garbagecollector/schema/GarbageCollector.exsd9
-rw-r--r--bundles/org.eclipse.equinox.p2.metadata.repository/schema/metadataRepositories.exsd9
7 files changed, 43 insertions, 23 deletions
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/schema/artifactChecksums.exsd b/bundles/org.eclipse.equinox.p2.artifact.repository/schema/artifactChecksums.exsd
index 2dc494040..daf3ff52c 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/schema/artifactChecksums.exsd
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/schema/artifactChecksums.exsd
@@ -129,10 +129,12 @@ public class Activator implements BundleActivator {
<documentation>
Copyright (c) 2015, 2018 Mykola Nikishov.
-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
+accompanies this distribution, and is available at
+&lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0&quot;&gt;https://www.eclipse.org/legal/epl-v20.html&lt;/a&gt;/
+
+SPDX-License-Identifier: EPL-2.0
</documentation>
</annotation>
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/schema/artifactRepositories.exsd b/bundles/org.eclipse.equinox.p2.artifact.repository/schema/artifactRepositories.exsd
index 36a7db0b5..8590be933 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/schema/artifactRepositories.exsd
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/schema/artifactRepositories.exsd
@@ -118,10 +118,13 @@
</appInfo>
<documentation>
Copyright (c) 2007, 2008 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which
+
+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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0&quot;&gt;https://www.eclipse.org/legal/epl-v20.html&lt;/a&gt;/
+
+SPDX-License-Identifier: EPL-2.0
</documentation>
</annotation>
diff --git a/bundles/org.eclipse.equinox.p2.artifact.repository/schema/processingSteps.exsd b/bundles/org.eclipse.equinox.p2.artifact.repository/schema/processingSteps.exsd
index 40786b891..039da2022 100644
--- a/bundles/org.eclipse.equinox.p2.artifact.repository/schema/processingSteps.exsd
+++ b/bundles/org.eclipse.equinox.p2.artifact.repository/schema/processingSteps.exsd
@@ -105,10 +105,13 @@ implementor of &lt;tt&gt;org.eclipse.equinox.internal.provisional.p2.artifact.re
</appinfo>
<documentation>
Copyright (c) 2007, 2008 compeople AG and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which
+
+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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0&quot;&gt;https://www.eclipse.org/legal/epl-v20.html&lt;/a&gt;/
+
+SPDX-License-Identifier: EPL-2.0
</documentation>
</annotation>
diff --git a/bundles/org.eclipse.equinox.p2.discovery.compatibility/schema/connectorDiscovery.exsd b/bundles/org.eclipse.equinox.p2.discovery.compatibility/schema/connectorDiscovery.exsd
index 73f19d087..576f2c829 100644
--- a/bundles/org.eclipse.equinox.p2.discovery.compatibility/schema/connectorDiscovery.exsd
+++ b/bundles/org.eclipse.equinox.p2.discovery.compatibility/schema/connectorDiscovery.exsd
@@ -424,10 +424,13 @@ Only the first 162 characters of the description are displayed in the UI and lin
</appinfo>
<documentation>
Copyright (c) 2009 Tasktop Technologies 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
+accompanies this distribution, and is available at
+&lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0&quot;&gt;https://www.eclipse.org/legal/epl-v20.html&lt;/a&gt;/
+
+SPDX-License-Identifier: EPL-2.0
</documentation>
</annotation>
diff --git a/bundles/org.eclipse.equinox.p2.engine/schema/touchpoints.exsd b/bundles/org.eclipse.equinox.p2.engine/schema/touchpoints.exsd
index 6635c9790..3aa7cae43 100644
--- a/bundles/org.eclipse.equinox.p2.engine/schema/touchpoints.exsd
+++ b/bundles/org.eclipse.equinox.p2.engine/schema/touchpoints.exsd
@@ -134,10 +134,13 @@
</appInfo>
<documentation>
Copyright (c) 2008, 2009 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which
+
+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
-&lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+&lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0&quot;&gt;https://www.eclipse.org/legal/epl-v20.html&lt;/a&gt;/
+
+SPDX-License-Identifier: EPL-2.0
</documentation>
</annotation>
diff --git a/bundles/org.eclipse.equinox.p2.garbagecollector/schema/GarbageCollector.exsd b/bundles/org.eclipse.equinox.p2.garbagecollector/schema/GarbageCollector.exsd
index 3c3fae073..d2674ba33 100644
--- a/bundles/org.eclipse.equinox.p2.garbagecollector/schema/GarbageCollector.exsd
+++ b/bundles/org.eclipse.equinox.p2.garbagecollector/schema/GarbageCollector.exsd
@@ -94,10 +94,13 @@
</appinfo>
<documentation>
Copyright (c) 2007, 2008 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which
+
+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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0&quot;&gt;https://www.eclipse.org/legal/epl-v20.html&lt;/a&gt;/
+
+SPDX-License-Identifier: EPL-2.0
</documentation>
</annotation>
diff --git a/bundles/org.eclipse.equinox.p2.metadata.repository/schema/metadataRepositories.exsd b/bundles/org.eclipse.equinox.p2.metadata.repository/schema/metadataRepositories.exsd
index 20624c4f2..0d971e06d 100644
--- a/bundles/org.eclipse.equinox.p2.metadata.repository/schema/metadataRepositories.exsd
+++ b/bundles/org.eclipse.equinox.p2.metadata.repository/schema/metadataRepositories.exsd
@@ -119,10 +119,13 @@ implementor of &lt;tt&gt;org.eclipse.equinox.internal.provisional.spi.p2.metadat
</appInfo>
<documentation>
Copyright (c) 2007, 2008 IBM Corporation and others.&lt;br&gt;
-All rights reserved. This program and the accompanying materials are made
-available under the terms of the Eclipse Public License v1.0 which
+
+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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
+href=&quot;https://www.eclipse.org/legal/epl-2.0&quot;&gt;https://www.eclipse.org/legal/epl-v20.html&lt;/a&gt;/
+
+SPDX-License-Identifier: EPL-2.0
</documentation>
</annotation>

Back to the top