diff options
7 files changed, 59 insertions, 42 deletions
diff --git a/features/org.eclipse.emf.eef.codegen.ecore-feature/feature.xml b/features/org.eclipse.emf.eef.codegen.ecore-feature/feature.xml index 86e1f4215..b62caff9a 100644 --- a/features/org.eclipse.emf.eef.codegen.ecore-feature/feature.xml +++ b/features/org.eclipse.emf.eef.codegen.ecore-feature/feature.xml @@ -14,7 +14,9 @@ label="%featureName" version="1.3.0.qualifier" provider-name="%providerName" - plugin="org.eclipse.emf.eef.branding"> + plugin="org.eclipse.emf.eef.branding" + license-feature="org.eclipse.license" + license-feature-version="0.0.0"> <description> %description diff --git a/features/org.eclipse.emf.eef.collab.runtime-feature/feature.xml b/features/org.eclipse.emf.eef.collab.runtime-feature/feature.xml index ecacb1c27..b21508bdc 100644 --- a/features/org.eclipse.emf.eef.collab.runtime-feature/feature.xml +++ b/features/org.eclipse.emf.eef.collab.runtime-feature/feature.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?> <!-- Copyright (c) 2008, 2010 Obeo. All rights reserved. This program and the accompanying materials @@ -8,40 +8,42 @@ Contributors: Obeo - initial API and implementation - -->
-<feature
- id="org.eclipse.emf.eef.collab.runtime-feature"
- label="%featureName"
- version="1.3.0.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.emf.eef.branding">
-
- <description>
- %description
- </description>
-
- <copyright url="http://www.eclipse.org/legal/epl-v10.html">
+ --> +<feature + id="org.eclipse.emf.eef.collab.runtime-feature" + label="%featureName" + version="1.3.0.qualifier" + provider-name="%providerName" + plugin="org.eclipse.emf.eef.branding" + license-feature="org.eclipse.license" + license-feature-version="0.0.0"> + + <description> + %description + </description> + + <copyright url="http://www.eclipse.org/legal/epl-v10.html"> Copyright (c) 2008 - 2010 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
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%modelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
- <discovery label="%modelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/>
- </url>
-
- <plugin
- id="org.eclipse.emf.eef.cdo.runtime"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+http://www.eclipse.org/legal/epl-v10.html + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <url> + <update label="%modelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> + <discovery label="%modelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> + </url> + + <plugin + id="org.eclipse.emf.eef.cdo.runtime" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> diff --git a/features/org.eclipse.emf.eef.edt-feature/feature.xml b/features/org.eclipse.emf.eef.edt-feature/feature.xml index 580091a16..ad095c365 100644 --- a/features/org.eclipse.emf.eef.edt-feature/feature.xml +++ b/features/org.eclipse.emf.eef.edt-feature/feature.xml @@ -14,7 +14,9 @@ label="%featureName" version="1.3.0.qualifier" provider-name="%providerName" - plugin="org.eclipse.emf.eef.branding"> + plugin="org.eclipse.emf.eef.branding" + license-feature="org.eclipse.license" + license-feature-version="0.0.0"> <description> %description diff --git a/features/org.eclipse.emf.eef.extended-feature/feature.xml b/features/org.eclipse.emf.eef.extended-feature/feature.xml index 079c40984..2d0be3bd5 100644 --- a/features/org.eclipse.emf.eef.extended-feature/feature.xml +++ b/features/org.eclipse.emf.eef.extended-feature/feature.xml @@ -14,7 +14,9 @@ label="%featureName" version="1.3.0.qualifier" provider-name="%providerName" - plugin="org.eclipse.emf.eef.branding"> + plugin="org.eclipse.emf.eef.branding" + license-feature="org.eclipse.license" + license-feature-version="0.0.0"> <description> %description diff --git a/features/org.eclipse.emf.eef.runtime-feature/feature.xml b/features/org.eclipse.emf.eef.runtime-feature/feature.xml index 99679aa10..d1cb5e4bd 100644 --- a/features/org.eclipse.emf.eef.runtime-feature/feature.xml +++ b/features/org.eclipse.emf.eef.runtime-feature/feature.xml @@ -14,7 +14,9 @@ label="%featureName" version="1.3.0.qualifier" provider-name="%providerName" - plugin="org.eclipse.emf.eef.branding"> + plugin="org.eclipse.emf.eef.branding" + license-feature="org.eclipse.license" + license-feature-version="0.0.0"> <description> %description diff --git a/features/org.eclipse.emf.eef.sdk-feature/feature.xml b/features/org.eclipse.emf.eef.sdk-feature/feature.xml index e07e48f38..9ecc2b251 100644 --- a/features/org.eclipse.emf.eef.sdk-feature/feature.xml +++ b/features/org.eclipse.emf.eef.sdk-feature/feature.xml @@ -14,7 +14,9 @@ label="%featureName" version="1.3.0.qualifier" provider-name="%providerName" - plugin="org.eclipse.emf.eef.branding"> + plugin="org.eclipse.emf.eef.branding" + license-feature="org.eclipse.license" + license-feature-version="0.0.0"> <description> %description diff --git a/releng/org.eclipse.emf.eef.releng.parent/pom.xml b/releng/org.eclipse.emf.eef.releng.parent/pom.xml index 8c6770e63..260f34622 100644 --- a/releng/org.eclipse.emf.eef.releng.parent/pom.xml +++ b/releng/org.eclipse.emf.eef.releng.parent/pom.xml @@ -33,8 +33,8 @@ </licenses> <properties> - <tycho-version>0.14.1</tycho-version> - <tycho-extras-version>0.14.0</tycho-extras-version> + <tycho-version>0.18.1</tycho-version> + <tycho-extras-version>0.18.0</tycho-extras-version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> @@ -92,6 +92,11 @@ <profile> <id>juno3.8</id> <repositories> + <repository> + <id>cbi</id> + <layout>p2</layout> + <url>http://download.eclipse.org/cbi/updates/license</url> + </repository> <repository> <id>releasetrain</id> <layout>p2</layout> @@ -120,7 +125,7 @@ <repository> <id>acceleo</id> <layout>p2</layout> - <url>http://download.eclipse.org/modeling/m2t/acceleo/updates/milestones/3.3</url> + <url>http://download.eclipse.org/modeling/m2t/acceleo/updates/releases/3.3</url> </repository> <repository> <id>orbit</id> |