diff options
-rw-r--r-- | build/org.eclipse.cdt.autotools.docs/pom.xml | 5 | ||||
-rw-r--r-- | build/org.eclipse.cdt.autotools.tests/pom.xml | 5 | ||||
-rw-r--r-- | build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml | 5 | ||||
-rw-r--r-- | core/org.eclipse.cdt.core.tests/pom.xml | 5 | ||||
-rw-r--r-- | core/org.eclipse.cdt.ui.tests/pom.xml | 5 | ||||
-rw-r--r-- | cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml | 4 | ||||
-rw-r--r-- | cross/org.eclipse.cdt.launch.remote-feature/feature.xml | 4 | ||||
-rw-r--r-- | cross/org.eclipse.cdt.launch.remote/build.properties | 1 | ||||
-rw-r--r-- | doc/org.eclipse.cdt.doc.isv/pom.xml | 5 | ||||
-rw-r--r-- | doc/org.eclipse.cdt.doc.user/pom.xml | 5 | ||||
-rw-r--r-- | jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml | 4 | ||||
-rw-r--r-- | memory/org.eclipse.cdt.debug.ui.memory.search/build.properties | 3 | ||||
-rw-r--r-- | pom.xml | 3 | ||||
-rw-r--r-- | testsrunner/org.eclipse.cdt.testsrunner.test/pom.xml | 14 | ||||
-rw-r--r-- | upc/org.eclipse.cdt.bupc-feature/feature.xml | 4 | ||||
-rw-r--r-- | windows/org.eclipse.cdt.msw-feature/feature.xml | 4 |
16 files changed, 38 insertions, 38 deletions
diff --git a/build/org.eclipse.cdt.autotools.docs/pom.xml b/build/org.eclipse.cdt.autotools.docs/pom.xml index 2653716ae0a..71e6d764e09 100644 --- a/build/org.eclipse.cdt.autotools.docs/pom.xml +++ b/build/org.eclipse.cdt.autotools.docs/pom.xml @@ -18,10 +18,9 @@ <build> <plugins> <plugin> - <!-- Change to groupId org.eclipse.tycho.extras after upgrade to Tycho 0.14 --> - <groupId>com.google.code.tycho-eclipserun-plugin</groupId> + <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-eclipserun-plugin</artifactId> - <version>${tycho-version}</version> + <version>${tycho-extras-version}</version> <configuration> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile build-index.xml build.index</appArgLine> <dependencies> diff --git a/build/org.eclipse.cdt.autotools.tests/pom.xml b/build/org.eclipse.cdt.autotools.tests/pom.xml index e924d725f96..2ee67c56a3c 100644 --- a/build/org.eclipse.cdt.autotools.tests/pom.xml +++ b/build/org.eclipse.cdt.autotools.tests/pom.xml @@ -15,13 +15,14 @@ <artifactId>org.eclipse.cdt.autotools.tests</artifactId> <packaging>eclipse-test-plugin</packaging> - <repositories> + <!-- Uncommenting this is useful when the repo is built first then you want to run tests on this plugin only --> + <!-- <repositories> <repository> <id>cdt.repo</id> <url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url> <layout>p2</layout> </repository> -</repositories> +</repositories>--> <build> <plugins> diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml index f95d8307726..eccbc93b640 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml @@ -15,13 +15,14 @@ <artifactId>org.eclipse.cdt.managedbuilder.core.tests</artifactId> <packaging>eclipse-test-plugin</packaging> - <repositories> + <!-- Uncommenting this is useful when the repo is built first then you want to run tests on this plugin only --> + <!-- <repositories> <repository> <id>cdt.repo</id> <url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url> <layout>p2</layout> </repository> - </repositories> + </repositories>--> <build> <plugins> diff --git a/core/org.eclipse.cdt.core.tests/pom.xml b/core/org.eclipse.cdt.core.tests/pom.xml index d8b56d0ea12..84bda2159b9 100644 --- a/core/org.eclipse.cdt.core.tests/pom.xml +++ b/core/org.eclipse.cdt.core.tests/pom.xml @@ -15,13 +15,14 @@ <artifactId>org.eclipse.cdt.core.tests</artifactId> <packaging>eclipse-test-plugin</packaging> - <repositories> + <!-- Uncommenting this is useful when the repo is built first then you want to run tests on this plugin only --> + <!-- <repositories> <repository> <id>cdt.repo</id> <url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url> <layout>p2</layout> </repository> - </repositories> + </repositories>--> <build> <plugins> diff --git a/core/org.eclipse.cdt.ui.tests/pom.xml b/core/org.eclipse.cdt.ui.tests/pom.xml index d382d72abe2..e062a80e1a1 100644 --- a/core/org.eclipse.cdt.ui.tests/pom.xml +++ b/core/org.eclipse.cdt.ui.tests/pom.xml @@ -15,13 +15,14 @@ <artifactId>org.eclipse.cdt.ui.tests</artifactId> <packaging>eclipse-test-plugin</packaging> - <repositories> + <!-- Uncommenting this is useful when the repo is built first then you want to run tests on this plugin only --> + <!-- <repositories> <repository> <id>cdt.repo</id> <url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url> <layout>p2</layout> </repository> - </repositories> + </repositories>--> <build> <plugins> diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml index cc479d50941..25986245970 100644 --- a/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml +++ b/cross/org.eclipse.cdt.build.crossgcc-feature/feature.xml @@ -4,9 +4,7 @@ label="%featureName" version="1.1.0.qualifier" provider-name="%providerName" - plugin="org.eclipse.cdt.build.crossgcc" - license-feature="org.eclipse.cdt.license" - license-feature-version="1.0.0.qualifier"> + plugin="org.eclipse.cdt.build.crossgcc"> <description> %description diff --git a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml index e350efe78e4..2f54b2e2064 100644 --- a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml +++ b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml @@ -3,9 +3,7 @@ id="org.eclipse.cdt.launch.remote" label="%featureName" version="6.0.0.qualifier" - provider-name="%providerName" - license-feature="org.eclipse.cdt.license" - license-feature-version="1.0.0.qualifier"> + provider-name="%providerName"> <description> %description diff --git a/cross/org.eclipse.cdt.launch.remote/build.properties b/cross/org.eclipse.cdt.launch.remote/build.properties index 2b8a8019ae9..4c7b6e43b98 100644 --- a/cross/org.eclipse.cdt.launch.remote/build.properties +++ b/cross/org.eclipse.cdt.launch.remote/build.properties @@ -18,7 +18,6 @@ bin.includes = META-INF/,\ about.ini,\ about.mappings,\ about.properties,\ - eclipse32.png,\ plugin.properties,\ plugin.xml,\ remotecdt.html,\ diff --git a/doc/org.eclipse.cdt.doc.isv/pom.xml b/doc/org.eclipse.cdt.doc.isv/pom.xml index 80815e0d4d1..84b693b24d9 100644 --- a/doc/org.eclipse.cdt.doc.isv/pom.xml +++ b/doc/org.eclipse.cdt.doc.isv/pom.xml @@ -32,10 +32,9 @@ </executions> </plugin> <plugin> - <!-- Change to groupId org.eclipse.tycho.extra after upgrade to Tycho 0.14 --> - <groupId>com.google.code.tycho-eclipserun-plugin</groupId> + <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-eclipserun-plugin</artifactId> - <version>${tycho-version}</version> + <version>${tycho-extras-version}</version> <configuration> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile buildDoc.xml</appArgLine> <dependencies> diff --git a/doc/org.eclipse.cdt.doc.user/pom.xml b/doc/org.eclipse.cdt.doc.user/pom.xml index 58ee57aef2e..b59afdb3a86 100644 --- a/doc/org.eclipse.cdt.doc.user/pom.xml +++ b/doc/org.eclipse.cdt.doc.user/pom.xml @@ -32,10 +32,9 @@ </executions> </plugin> <plugin> - <!-- Change to groupId org.eclipse.tycho.extra after upgrade to Tycho 0.14 --> - <groupId>com.google.code.tycho-eclipserun-plugin</groupId> + <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-eclipserun-plugin</artifactId> - <version>${tycho-version}</version> + <version>${tycho-extras-version}</version> <configuration> <appArgLine>-application org.eclipse.ant.core.antRunner -buildfile customBuildCallbacks.xml build.index</appArgLine> <dependencies> diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml index ee3fed7fba8..bdd58f8551f 100644 --- a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml +++ b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml @@ -4,9 +4,7 @@ label="%featureName" version="7.0.0.qualifier" provider-name="%providerName" - image="eclipse_update_120.jpg" - license-feature="org.eclipse.cdt.license" - license-feature-version="1.0.0.qualifier"> + image="eclipse_update_120.jpg"> <description> %description diff --git a/memory/org.eclipse.cdt.debug.ui.memory.search/build.properties b/memory/org.eclipse.cdt.debug.ui.memory.search/build.properties index 464efb7b44d..1e9c1d76b16 100644 --- a/memory/org.eclipse.cdt.debug.ui.memory.search/build.properties +++ b/memory/org.eclipse.cdt.debug.ui.memory.search/build.properties @@ -15,6 +15,5 @@ bin.includes = META-INF/,\ plugin.properties,\ .,\ plugin.xml,\ - about.html,\ - icons/ + about.html src.includes = about.html @@ -15,7 +15,8 @@ <name>CDT Parent</name> <properties> - <tycho-version>0.13.0</tycho-version> + <tycho-version>0.14.1</tycho-version> + <tycho-extras-version>0.14.0</tycho-extras-version> <platform-version>3.8milestones</platform-version> <platform-site>http://download.eclipse.org/eclipse/updates/${platform-version}</platform-site> <orbit-version>R20110523182458</orbit-version> diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/pom.xml b/testsrunner/org.eclipse.cdt.testsrunner.test/pom.xml index 0606be04322..34faa27f7fa 100644 --- a/testsrunner/org.eclipse.cdt.testsrunner.test/pom.xml +++ b/testsrunner/org.eclipse.cdt.testsrunner.test/pom.xml @@ -15,16 +15,26 @@ <artifactId>org.eclipse.cdt.testsrunner.test</artifactId> <packaging>eclipse-test-plugin</packaging> - <repositories> + <!-- Uncommenting this is useful when the repo is built first then you want to run tests on this plugin only --> + <!-- <repositories> <repository> <id>cdt.repo</id> <url>file:/${basedir}/../../releng/org.eclipse.cdt.repo/target/repository</url> <layout>p2</layout> </repository> -</repositories> +</repositories>--> <build> <plugins> + <!-- Not sure why but this is necessary since Tycho 0.14, perhaps this is a bug --> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> diff --git a/upc/org.eclipse.cdt.bupc-feature/feature.xml b/upc/org.eclipse.cdt.bupc-feature/feature.xml index 07c2c17270c..46059ab3eb4 100644 --- a/upc/org.eclipse.cdt.bupc-feature/feature.xml +++ b/upc/org.eclipse.cdt.bupc-feature/feature.xml @@ -4,9 +4,7 @@ label="%featureName" version="1.0.3.qualifier" provider-name="%providerName" - plugin="org.eclipse.cdt.managedbuilder.bupc.ui" - license-feature="org.eclipse.cdt.license" - license-feature-version="1.0.0.qualifier"> + plugin="org.eclipse.cdt.managedbuilder.bupc.ui"> <description> %description diff --git a/windows/org.eclipse.cdt.msw-feature/feature.xml b/windows/org.eclipse.cdt.msw-feature/feature.xml index 46a446dee07..2c613f7920b 100644 --- a/windows/org.eclipse.cdt.msw-feature/feature.xml +++ b/windows/org.eclipse.cdt.msw-feature/feature.xml @@ -3,9 +3,7 @@ id="org.eclipse.cdt.msw" label="CDT Visual C++ Support" version="1.0.0.qualifier" - provider-name="Eclipse CDT" - license-feature="org.eclipse.cdt.license" - license-feature-version="1.0.0.qualifier"> + provider-name="Eclipse CDT"> <description> %description |