diff options
| author | Igor Fedorenko | 2011-08-04 15:24:23 +0000 |
|---|---|---|
| committer | Igor Fedorenko | 2011-08-04 15:24:23 +0000 |
| commit | 093352787bc8b48dfebd094d2967760491550e3e (patch) | |
| tree | b850877905e0c25f594a43ef8bdcdfcb395a4b7d /org.eclipse.m2e.feature | |
| parent | c47e215285d7c562d2e8c98c52a80349abe070b6 (diff) | |
| parent | 55bb6dd084da70138e6fd4800a514ee94abdb743 (diff) | |
| download | m2e-core-093352787bc8b48dfebd094d2967760491550e3e.tar.gz m2e-core-093352787bc8b48dfebd094d2967760491550e3e.tar.xz m2e-core-093352787bc8b48dfebd094d2967760491550e3e.zip | |
Merge remote-tracking branch 'origin/master' into m2e-self-hosting
Conflicts:
com.ning.async-http-client/pom.xml
org.eclipse.m2e.archetype.common/META-INF/MANIFEST.MF
org.eclipse.m2e.archetype.common/pom.xml
org.eclipse.m2e.core.ui/pom.xml
org.eclipse.m2e.core/pom.xml
org.eclipse.m2e.discovery/pom.xml
org.eclipse.m2e.editor.xml/pom.xml
org.eclipse.m2e.editor/pom.xml
org.eclipse.m2e.feature/pom.xml
org.eclipse.m2e.integration.tests.common/pom.xml
org.eclipse.m2e.jdt/pom.xml
org.eclipse.m2e.launching/pom.xml
org.eclipse.m2e.lifecyclemapping.defaults/pom.xml
org.eclipse.m2e.logback.appender/pom.xml
org.eclipse.m2e.logback.configuration/pom.xml
org.eclipse.m2e.logback.feature/pom.xml
org.eclipse.m2e.maven.indexer/META-INF/MANIFEST.MF
org.eclipse.m2e.maven.indexer/pom.xml
org.eclipse.m2e.maven.runtime/META-INF/MANIFEST.MF
org.eclipse.m2e.maven.runtime/pom.xml
org.eclipse.m2e.model.edit/pom.xml
org.eclipse.m2e.refactoring/pom.xml
org.eclipse.m2e.scm/pom.xml
org.eclipse.m2e.sdk.feature/pom.xml
org.eclipse.m2e.site/pom.xml
org.eclipse.m2e.tests.common/pom.xml
org.eclipse.m2e.usagedata/pom.xml
org.jboss.netty/pom.xml
pom.xml
target-platform/pom.xml
Diffstat (limited to 'org.eclipse.m2e.feature')
| -rw-r--r-- | org.eclipse.m2e.feature/feature.xml | 8 | ||||
| -rw-r--r-- | org.eclipse.m2e.feature/pom.xml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.m2e.feature/feature.xml b/org.eclipse.m2e.feature/feature.xml index 6e211f6e..061eb27e 100644 --- a/org.eclipse.m2e.feature/feature.xml +++ b/org.eclipse.m2e.feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.m2e.feature" label="%featureName" - version="1.0.100.qualifier" + version="1.0.200.qualifier" provider-name="%providerName" plugin="org.eclipse.m2e.core"> <install-handler/> @@ -28,9 +28,9 @@ <import plugin="org.eclipse.wst.sse.core"/> <import plugin="org.eclipse.wst.xml.core"/> <import plugin="org.eclipse.jem.util"/> - <import feature="org.eclipse.platform" version="3.4.0" match="greaterOrEqual"/> - <import feature="org.eclipse.rcp" version="3.4.0" match="greaterOrEqual"/> - <import feature="org.eclipse.jdt" version="3.4.0" match="greaterOrEqual"/> + <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/> + <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/> + <import feature="org.eclipse.jdt" version="3.6.0" match="greaterOrEqual"/> </requires> <plugin diff --git a/org.eclipse.m2e.feature/pom.xml b/org.eclipse.m2e.feature/pom.xml index 22baac1c..4d6594d7 100644 --- a/org.eclipse.m2e.feature/pom.xml +++ b/org.eclipse.m2e.feature/pom.xml @@ -12,7 +12,7 @@ <parent> <groupId>org.eclipse.m2e</groupId> <artifactId>m2e-core</artifactId> - <version>1.0.100-SNAPSHOT</version> + <version>1.0.200-SNAPSHOT</version> </parent> <artifactId>org.eclipse.m2e.feature</artifactId> |