diff options
| author | Pierre-Charles David | 2018-10-01 15:13:50 +0000 |
|---|---|---|
| committer | Pierre-Charles David | 2018-10-02 06:40:19 +0000 |
| commit | cf5344b3f75f01425e30a71463fd7feb34122a39 (patch) | |
| tree | adcdca765113cfdd4910acb3527782aeb6020653 | |
| parent | 48cd4ad41f5d0402ba43874d84fe089fedce4ea0 (diff) | |
| download | org.eclipse.sirius-cf5344b3f75f01425e30a71463fd7feb34122a39.tar.gz org.eclipse.sirius-cf5344b3f75f01425e30a71463fd7feb34122a39.tar.xz org.eclipse.sirius-cf5344b3f75f01425e30a71463fd7feb34122a39.zip | |
[527277] Update various remaining files
Change-Id: Idebdf65c4b0b212c972c5c7c6966b78bed9298c7
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
10 files changed, 52 insertions, 24 deletions
diff --git a/packaging/org.eclipse.sirius.parent/promote.sh b/packaging/org.eclipse.sirius.parent/promote.sh index df66449bdf..22ae58fd4f 100644 --- a/packaging/org.eclipse.sirius.parent/promote.sh +++ b/packaging/org.eclipse.sirius.parent/promote.sh @@ -2,12 +2,14 @@ # ==================================================================== # Copyright (c) 2007, 2015 THALES GLOBAL SERVICES # 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 # # Contributors: -# Obeo - initial API and implementation +# Obeo - Initial API and implementation # ==================================================================== # # Copy the result of the build into a stable location on the intranet diff --git a/packaging/org.eclipse.sirius.server.product/Dockerfile b/packaging/org.eclipse.sirius.server.product/Dockerfile index 9b2664d853..836766e991 100644 --- a/packaging/org.eclipse.sirius.server.product/Dockerfile +++ b/packaging/org.eclipse.sirius.server.product/Dockerfile @@ -1,9 +1,11 @@ # ==================================================================== # Copyright (c) 2018 Obeo # 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 # # Contributors: # Obeo - initial API and implementation @@ -36,4 +38,4 @@ RUN chown -R developer:developer "$SIRIUS_SERVER_HOME" USER developer RUN chmod +x /home/developer/sirius-server/sirius-server WORKDIR /home/developer/sirius-server -EXPOSE 8080
\ No newline at end of file +EXPOSE 8080 diff --git a/plugins/org.eclipse.sirius.doc/build-doc.xml b/plugins/org.eclipse.sirius.doc/build-doc.xml index 5823fafe41..ead8ad164c 100644 --- a/plugins/org.eclipse.sirius.doc/build-doc.xml +++ b/plugins/org.eclipse.sirius.doc/build-doc.xml @@ -2,9 +2,11 @@ <!-- Copyright (c) 2007, 2014 THALES GLOBAL SERVICES 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 Contributors: Obeo - Initial API and implementation diff --git a/plugins/org.eclipse.sirius.doc/doc/toc.xml b/plugins/org.eclipse.sirius.doc/doc/toc.xml index cdfc91d9c3..ec49b7c961 100644 --- a/plugins/org.eclipse.sirius.doc/doc/toc.xml +++ b/plugins/org.eclipse.sirius.doc/doc/toc.xml @@ -1,7 +1,16 @@ <?xml version='1.0' encoding='utf-8' ?> -<!-- Copyright (c) 2007, 2013 THALES GLOBAL SERVICES 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 Contributors: Obeo - - Initial API and implementation --> +<!-- + Copyright (c) 2007-2013 THALES GLOBAL SERVICES + 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/ + + SPDX-License-Identifier: EPL-2.0 + + Contributors: + Obeo - Initial API and implementation +--> <toc label="Sirius" topic="doc/index.html"> <topic href="doc/Release_Notes.html" label="Release Notes"> <topic href="doc/Release_Notes_Previous.html" label="Release Notes for Older Versions" /> diff --git a/plugins/org.eclipse.sirius.eef.adapters/build.xml b/plugins/org.eclipse.sirius.eef.adapters/build.xml index ca366a74b7..37eabb48f1 100644 --- a/plugins/org.eclipse.sirius.eef.adapters/build.xml +++ b/plugins/org.eclipse.sirius.eef.adapters/build.xml @@ -1,8 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright (c) 2013 THALES GLOBAL SERVICES - 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/ + + SPDX-License-Identifier: EPL-2.0 + Contributors: Obeo - Initial API and implementation --> diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/build.xml b/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/build.xml index 643ae1c3ab..7c8be213f0 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/build.xml +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/build.xml @@ -2,9 +2,11 @@ <!-- Copyright (c) 2010, 2014 THALES GLOBAL SERVICES 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 Contributors: Obeo - Initial API and implementation diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/project.xml b/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/project.xml index 61ef20e700..b6dd4125a2 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/project.xml +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/project.xml @@ -2,9 +2,11 @@ <!-- Copyright (c) 2007, 2013 THALES GLOBAL SERVICES 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 Contributors: Obeo - Initial API and implementation diff --git a/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/web.xml b/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/web.xml index 891bbbc318..6cd632dd4f 100644 --- a/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/web.xml +++ b/plugins/org.eclipse.sirius.tests.junit/data/unit/project/modeling/web.xml @@ -5,9 +5,11 @@ <!-- Copyright (c) 2007, 2013 THALES GLOBAL SERVICES 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 Contributors: Obeo - Initial API and implementation @@ -39,4 +41,4 @@ <res-auth>Application</res-auth> <res-sharing-scope>Shareable</res-sharing-scope> </resource-ref> -</web-app>
\ No newline at end of file +</web-app> diff --git a/plugins/org.eclipse.sirius.tests.sample.docbook.edit/models/docbook.eefgen b/plugins/org.eclipse.sirius.tests.sample.docbook.edit/models/docbook.eefgen index ba7efe55b3..525317ea4b 100644 --- a/plugins/org.eclipse.sirius.tests.sample.docbook.edit/models/docbook.eefgen +++ b/plugins/org.eclipse.sirius.tests.sample.docbook.edit/models/docbook.eefgen @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ASCII"?> -<eef-gen:EEFGenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:eef-gen="http://www.eclipse.org/emf/eef/generation/1.0.0" genDirectory="/org.eclipse.sirius.tests.sample.docbook.edit/src-gen" license="/**
 * Copyright (c) 2015 Obeo
 * 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
 *
 * Contributors:
 * Obeo - initial API and implementation
 *
 */"> +<eef-gen:EEFGenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:eef-gen="http://www.eclipse.org/emf/eef/generation/1.0.0" genDirectory="/org.eclipse.sirius.tests.sample.docbook.edit/src-gen" license="/**
 * Copyright (c) 2015 Obeo
 * 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/
 *
 * Contributors:
 * Obeo - initial API and implementation
 *
 */"> <editionContexts basePackage="org.eclipse.sirius.tests.sample" descriptorsGenericPropertiesViews="true" leafComponentsSuperClass="org.eclipse.sirius.eef.components.SiriusAwarePropertiesEditingComponent"> <PropertiesEditionContext href="docbook.components#_6u7x0PiOEeSjnZMs8ur7NQ"/> </editionContexts> diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/log4j.xml b/plugins/org.eclipse.sirius.tests.swtbot/src/log4j.xml index 0b1a29c19e..2d8c695f9e 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/src/log4j.xml +++ b/plugins/org.eclipse.sirius.tests.swtbot/src/log4j.xml @@ -3,9 +3,11 @@ <!-- Copyright (c) 2010, 2014 THALES GLOBAL SERVICES 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 Contributors: Obeo - Initial API and implementation @@ -70,4 +72,4 @@ <!-- <appender-ref ref="asyncAppender" /> --> </root> -</log4j:configuration>
\ No newline at end of file +</log4j:configuration> |