Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mvn/extensions.xml8
-rw-r--r--build/org.eclipse.cdt.autotools-feature/pom.xml18
-rw-r--r--build/org.eclipse.cdt.autotools.core/pom.xml17
-rw-r--r--build/org.eclipse.cdt.autotools.tests/pom.xml50
-rw-r--r--build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutomatedIntegrationSuite.java (renamed from build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AllAutotoolsTests.java)2
-rw-r--r--build/org.eclipse.cdt.autotools.tests/ui-test-plugin.properties1
-rw-r--r--build/org.eclipse.cdt.autotools.ui.tests/pom.xml51
-rw-r--r--build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AutomatedIntegrationSuite.java (renamed from build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AllTests.java)2
-rw-r--r--build/org.eclipse.cdt.autotools.ui.tests/swtbot-test-plugin.properties1
-rw-r--r--build/org.eclipse.cdt.autotools.ui/pom.xml17
-rw-r--r--build/org.eclipse.cdt.build.gcc.core/pom.xml17
-rw-r--r--build/org.eclipse.cdt.cmake-feature/pom.xml18
-rw-r--r--build/org.eclipse.cdt.cmake.core/pom.xml17
-rw-r--r--build/org.eclipse.cdt.cmake.ui/pom.xml17
-rw-r--r--build/org.eclipse.cdt.gnu.build-feature/pom.xml17
-rw-r--r--build/org.eclipse.cdt.make.core.tests/pom.xml35
-rw-r--r--build/org.eclipse.cdt.make.core/pom.xml17
-rw-r--r--build/org.eclipse.cdt.make.ui.tests/pom.xml41
-rw-r--r--build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/AutomatedIntegrationSuite.java (renamed from build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/AllMakeUITests.java)2
-rw-r--r--build/org.eclipse.cdt.make.ui.tests/ui-test-plugin.properties1
-rw-r--r--build/org.eclipse.cdt.make.ui/pom.xml17
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF3
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml65
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AutomatedIntegrationSuite.java (renamed from build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java)4
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/LanguageSettingsProvidersMBSTest.java1
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/ui-test-plugin.properties1
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/pom.xml17
-rw-r--r--build/org.eclipse.cdt.managedbuilder.gnu.ui/pom.xml17
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui.tests/pom.xml41
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/suite/AutomatedIntegrationSuite.java (renamed from build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/suite/AllManagedBuildUITests.java)4
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui.tests/ui-test-plugin.properties1
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/pom.xml17
-rw-r--r--build/pom.xml42
-rw-r--r--codan/org.eclipse.cdt.codan.checkers.ui.test/pom.xml39
-rw-r--r--codan/org.eclipse.cdt.codan.checkers.ui.tests/.classpath (renamed from codan/org.eclipse.cdt.codan.checkers.ui.test/.classpath)0
-rw-r--r--codan/org.eclipse.cdt.codan.checkers.ui.tests/.project (renamed from codan/org.eclipse.cdt.codan.checkers.ui.test/.project)2
-rw-r--r--codan/org.eclipse.cdt.codan.checkers.ui.tests/.settings/org.eclipse.jdt.core.prefs (renamed from codan/org.eclipse.cdt.codan.checkers.ui.test/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--codan/org.eclipse.cdt.codan.checkers.ui.tests/META-INF/MANIFEST.MF (renamed from codan/org.eclipse.cdt.codan.checkers.ui.test/META-INF/MANIFEST.MF)2
-rw-r--r--codan/org.eclipse.cdt.codan.checkers.ui.tests/OSGI-INF/l10n/bundle.properties (renamed from codan/org.eclipse.cdt.codan.checkers.ui.test/OSGI-INF/l10n/bundle.properties)0
-rw-r--r--codan/org.eclipse.cdt.codan.checkers.ui.tests/build.properties (renamed from codan/org.eclipse.cdt.codan.checkers.ui.test/build.properties)0
-rw-r--r--codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/Activator.java (renamed from codan/org.eclipse.cdt.codan.checkers.ui.test/src/org/eclipse/cdt/codan/checkers/ui/Activator.java)0
-rw-r--r--codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/quickfix/AutomatedIntegrationSuite.java19
-rw-r--r--codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixCreateNewClassTest.java (renamed from codan/org.eclipse.cdt.codan.checkers.ui.test/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixCreateNewClassTest.java)0
-rw-r--r--codan/org.eclipse.cdt.codan.checkers.ui.tests/ui-test-plugin.properties1
-rw-r--r--codan/org.eclipse.cdt.codan.checkers.ui/META-INF/MANIFEST.MF2
-rw-r--r--codan/org.eclipse.cdt.codan.checkers.ui/pom.xml17
-rw-r--r--codan/org.eclipse.cdt.codan.checkers/pom.xml17
-rw-r--r--codan/org.eclipse.cdt.codan.core.cxx/pom.xml17
-rw-r--r--codan/org.eclipse.cdt.codan.core.test/pom.xml42
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/.classpath (renamed from codan/org.eclipse.cdt.codan.core.test/.classpath)0
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/.project (renamed from codan/org.eclipse.cdt.codan.core.test/.project)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/.settings/org.eclipse.jdt.core.prefs (renamed from codan/org.eclipse.cdt.codan.core.test/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/.settings/org.eclipse.jdt.ui.prefs (renamed from codan/org.eclipse.cdt.codan.core.test/.settings/org.eclipse.jdt.ui.prefs)0
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/META-INF/MANIFEST.MF (renamed from codan/org.eclipse.cdt.codan.core.test/META-INF/MANIFEST.MF)6
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/OSGI-INF/l10n/bundle.properties (renamed from codan/org.eclipse.cdt.codan.core.test/OSGI-INF/l10n/bundle.properties)0
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/about.html (renamed from codan/org.eclipse.cdt.codan.core.test/about.html)0
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/build.properties (renamed from codan/org.eclipse.cdt.codan.core.test/build.properties)0
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/cfg/ControlFlowGraphTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cfg/ControlFlowGraphTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtilsTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtilsTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/cxx/externaltool/ArgsSeparatorTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cxx/externaltool/ArgsSeparatorTest.java)0
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/AbstractClassInstantiationCheckerTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/AbstractClassInstantiationCheckerTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/AssignmentInConditionCheckerTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/AssignmentInConditionCheckerTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/AssignmentToItselfCheckerTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/AssignmentToItselfCheckerTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/CaseBreakCheckerTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CaseBreakCheckerTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/CatchByReferenceTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CatchByReferenceTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/ClassMembersInitializationCheckerTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ClassMembersInitializationCheckerTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/CommentCheckerLineTests.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CommentCheckerLineTests.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/CommentCheckerNestedTests.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CommentCheckerNestedTests.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/FormatStringCheckerTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/FormatStringCheckerTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/NonVirtualDestructorCheckerTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/NonVirtualDestructorCheckerTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/ProblemBindingCheckerTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ProblemBindingCheckerTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnCheckerTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnCheckerTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnStyleCheckerTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnStyleCheckerTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/StatementHasNoEffectCheckerTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/StatementHasNoEffectCheckerTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/SuggestedParenthesisCheckerTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/SuggestedParenthesisCheckerTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/SuspiciousSemicolonCheckerTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/SuspiciousSemicolonCheckerTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/UnusedSymbolInFileScopeCheckerTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/UnusedSymbolInFileScopeCheckerTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/param/BasicProblemPreferenceTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/param/BasicProblemPreferenceTest.java)0
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/param/ListProblemPreferenceTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/param/ListProblemPreferenceTest.java)0
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/param/MapProblemPreferenceTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/param/MapProblemPreferenceTest.java)0
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/AutomatedIntegrationSuite.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/AutomatedIntegrationSuite.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CheckerTestCase.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CheckerTestCase.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanCoreTestActivator.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanCoreTestActivator.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastCxxAstTestCase.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanFastCxxAstTestCase.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastTestSuite.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanFastTestSuite.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanTestCase.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanTestCase.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/TestUtils.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/TestUtils.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/AssignmentInConditionQuickFixTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/AssignmentInConditionQuickFixTest.java)0
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixTest.java)0
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByReferenceQuickFixTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByReferenceQuickFixTest.java)0
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CreateLocalVariableQuickFixTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CreateLocalVariableQuickFixTest.java)0
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixTestCase.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixTestCase.java)4
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/SuggestedParenthesisQuickFixTest.java (renamed from codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/SuggestedParenthesisQuickFixTest.java)2
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/test.xml (renamed from codan/org.eclipse.cdt.codan.core.test/test.xml)0
-rw-r--r--codan/org.eclipse.cdt.codan.core.tests/ui-test-plugin.properties1
-rw-r--r--codan/org.eclipse.cdt.codan.core/pom.xml17
-rw-r--r--codan/org.eclipse.cdt.codan.ui.cxx/pom.xml17
-rw-r--r--codan/org.eclipse.cdt.codan.ui/pom.xml17
-rw-r--r--codan/pom.xml25
-rw-r--r--core/org.eclipse.cdt.core.tests/pom.xml9
-rw-r--r--core/org.eclipse.cdt.core/pom.xml17
-rw-r--r--core/org.eclipse.cdt.ui.tests/pom.xml1
-rw-r--r--core/org.eclipse.cdt.ui/pom.xml17
-rw-r--r--core/pom.xml34
-rw-r--r--cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml18
-rw-r--r--cross/org.eclipse.cdt.build.crossgcc/pom.xml17
-rw-r--r--cross/org.eclipse.cdt.launch.remote-feature/pom.xml18
-rw-r--r--cross/org.eclipse.cdt.launch.remote/pom.xml17
-rw-r--r--cross/pom.xml22
-rw-r--r--debug/org.eclipse.cdt.debug.application/pom.xml17
-rw-r--r--debug/org.eclipse.cdt.debug.core/pom.xml17
-rw-r--r--debug/org.eclipse.cdt.debug.standalone-feature/pom.xml18
-rw-r--r--debug/org.eclipse.cdt.debug.ui/pom.xml17
-rw-r--r--debug/org.eclipse.cdt.gdb-feature/pom.xml18
-rw-r--r--debug/org.eclipse.cdt.gdb.ui/pom.xml17
-rw-r--r--debug/org.eclipse.cdt.gdb/pom.xml17
-rw-r--r--debug/org.eclipse.cdt.gnu.debug-feature/pom.xml18
-rw-r--r--debug/pom.xml41
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/pom.xml66
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/ui/test/AutomatedIntegrationSuite.java (renamed from dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/ui/test/AllTests.java)2
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/ui-test-plugin.properties1
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/pom.xml17
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml66
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/gdb/tests/AutomatedIntegrationSuite.java (renamed from dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/gdb/tests/AllTests.java)2
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/ui-test-plugin.properties1
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/pom.xml17
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb/pom.xml17
-rw-r--r--dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/pom.xml17
-rw-r--r--dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/pom.xml18
-rw-r--r--dsf-gdb/org.eclipse.cdt.gnu.multicorevisualizer-feature/pom.xml18
-rw-r--r--dsf-gdb/pom.xml28
-rw-r--r--dsf/org.eclipse.cdt.dsf.ui/pom.xml17
-rw-r--r--dsf/org.eclipse.cdt.dsf/pom.xml17
-rw-r--r--dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml18
-rw-r--r--dsf/org.eclipse.cdt.examples.dsf.pda.ui/pom.xml17
-rw-r--r--dsf/org.eclipse.cdt.examples.dsf.pda/pom.xml17
-rw-r--r--dsf/org.eclipse.cdt.examples.dsf/pom.xml17
-rw-r--r--dsf/pom.xml23
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml18
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.core/pom.xml17
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag.ui/pom.xml17
-rw-r--r--jtag/org.eclipse.cdt.debug.gdbjtag/pom.xml37
-rw-r--r--jtag/pom.xml (renamed from core/org.eclipse.cdt.core.native/pom.xml)13
-rw-r--r--launch/org.eclipse.cdt.docker.launcher-feature/pom.xml18
-rw-r--r--launch/org.eclipse.cdt.docker.launcher/pom.xml17
-rw-r--r--launch/org.eclipse.cdt.launch/pom.xml17
-rw-r--r--launch/pom.xml21
-rw-r--r--llvm/org.eclipse.cdt.llvm.dsf.lldb-feature/pom.xml18
-rw-r--r--llvm/org.eclipse.cdt.llvm.dsf.lldb.core/pom.xml17
-rw-r--r--llvm/org.eclipse.cdt.llvm.dsf.lldb.ui/pom.xml17
-rw-r--r--llvm/org.eclipse.cdt.managedbuilder.llvm-feature/pom.xml18
-rw-r--r--llvm/org.eclipse.cdt.managedbuilder.llvm.ui/pom.xml17
-rw-r--r--llvm/pom.xml23
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser.feature/pom.xml17
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature-no-source.properties1
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/pom.xml34
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser.tests/pom.xml35
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/AutomatedIntegrationSuite.java (renamed from lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRParserTestSuite.java)2
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser/pom.xml17
-rw-r--r--lrparser/pom.xml24
-rw-r--r--memory/org.eclipse.cdt.debug.ui.memory-feature/pom.xml18
-rw-r--r--memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/pom.xml17
-rw-r--r--memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/pom.xml17
-rw-r--r--memory/org.eclipse.cdt.debug.ui.memory.search/pom.xml17
-rw-r--r--memory/org.eclipse.cdt.debug.ui.memory.traditional/pom.xml17
-rw-r--r--memory/org.eclipse.cdt.debug.ui.memory.transport/pom.xml17
-rw-r--r--memory/pom.xml24
-rw-r--r--native/org.eclipse.cdt.native.serial/pom.xml17
-rw-r--r--native/pom.xml18
-rw-r--r--pom.xml327
-rw-r--r--qt/org.eclipse.cdt.qt-feature/pom.xml18
-rw-r--r--qt/org.eclipse.cdt.qt.core.tests/pom.xml66
-rw-r--r--qt/org.eclipse.cdt.qt.core/pom.xml17
-rw-r--r--qt/org.eclipse.cdt.qt.ui.tests/pom.xml69
-rw-r--r--qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/AutomatedIntegrationSuite.java (renamed from qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/AllQtTests.java)2
-rw-r--r--qt/org.eclipse.cdt.qt.ui.tests/ui-test-plugin.properties1
-rw-r--r--qt/org.eclipse.cdt.qt.ui/pom.xml17
-rw-r--r--qt/pom.xml23
-rw-r--r--releng/org.eclipse.cdt.native-feature/pom.xml17
-rw-r--r--releng/org.eclipse.cdt.platform-feature/pom.xml17
-rw-r--r--releng/org.eclipse.cdt.sdk-feature/feature-no-source.properties1
-rw-r--r--releng/org.eclipse.cdt.sdk-feature/pom.xml16
-rw-r--r--releng/org.eclipse.cdt.sdk/pom.xml37
-rw-r--r--releng/org.eclipse.cdt.testing-feature/feature.xml2
-rw-r--r--releng/org.eclipse.cdt.testing-feature/pom.xml17
-rw-r--r--releng/pom.xml29
-rw-r--r--remote/org.eclipse.cdt.remote-feature/pom.xml17
-rw-r--r--remote/org.eclipse.cdt.remote.core/pom.xml17
-rw-r--r--remote/pom.xml20
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.boost/META-INF/MANIFEST.MF2
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.boost/pom.xml17
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.feature/pom.xml18
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.gtest/META-INF/MANIFEST.MF2
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.gtest/pom.xml17
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.qttest/META-INF/MANIFEST.MF2
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.qttest/pom.xml17
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tap/META-INF/MANIFEST.MF2
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tap/pom.xml17
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.test/pom.xml50
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/.classpath (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/.classpath)0
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/.project (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/.project)2
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/.settings/org.eclipse.jdt.core.prefs (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/.settings/org.eclipse.jdt.core.prefs)0
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/META-INF/MANIFEST.MF (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/META-INF/MANIFEST.MF)2
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/OSGI-INF/l10n/bundle.properties (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/OSGI-INF/l10n/bundle.properties)0
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/about.html (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/about.html)0
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/build.properties (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/build.properties)0
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/core/TestModelManagerBaseReorderingTestCase.java (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/core/TestModelManagerBaseReorderingTestCase.java)0
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/core/TestModelManagerCasesReorderingTestCase.java (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/core/TestModelManagerCasesReorderingTestCase.java)0
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/core/TestModelManagerSuitesReorderingTestCase.java (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/core/TestModelManagerSuitesReorderingTestCase.java)0
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/test/AutomatedIntegrationSuite.java (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/test/TestsRunnerSuite.java)12
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/test/TestsRunnerTestActivator.java (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/test/TestsRunnerTestActivator.java)0
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/BaseTestCase.java (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/BaseTestCase.java)0
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/BoostTestCase.java (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/BoostTestCase.java)0
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/GoogleTestCase.java (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/GoogleTestCase.java)0
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/MockTestModelUpdater.java (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/MockTestModelUpdater.java)0
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/QtTestCase.java (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/QtTestCase.java)0
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/TAPTestCase.java (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/TAPTestCase.java)0
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/test.xml (renamed from testsrunner/org.eclipse.cdt.testsrunner.test/test.xml)0
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.tests/ui-test-plugin.properties1
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner/pom.xml17
-rw-r--r--testsrunner/pom.xml25
-rw-r--r--toolchains/arduino/org.eclipse.cdt.arduino-feature/pom.xml15
-rw-r--r--toolchains/arduino/org.eclipse.cdt.arduino.core/pom.xml17
-rw-r--r--toolchains/arduino/org.eclipse.cdt.arduino.ui/pom.xml17
-rw-r--r--toolchains/arduino/pom.xml22
-rw-r--r--upc/org.eclipse.cdt.bupc-feature/pom.xml18
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.feature/pom.xml17
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature-no-source.properties1
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.sdk.feature/pom.xml34
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.tests/pom.xml35
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/AutomatedIntegrationSuite.java (renamed from upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java)2
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc/pom.xml17
-rw-r--r--upc/org.eclipse.cdt.managedbuilder.bupc.ui/pom.xml17
-rw-r--r--upc/pom.xml27
-rw-r--r--util/org.eclipse.cdt.util-feature/pom.xml18
-rw-r--r--util/org.eclipse.cdt.util/pom.xml17
-rw-r--r--util/pom.xml20
-rw-r--r--visualizer/org.eclipse.cdt.visualizer-feature/pom.xml18
-rw-r--r--visualizer/org.eclipse.cdt.visualizer.core/pom.xml17
-rw-r--r--visualizer/org.eclipse.cdt.visualizer.examples/pom.xml17
-rw-r--r--visualizer/org.eclipse.cdt.visualizer.ui/pom.xml17
-rw-r--r--visualizer/pom.xml22
-rw-r--r--windows/org.eclipse.cdt.msw-feature/pom.xml18
-rw-r--r--windows/org.eclipse.cdt.msw.build/pom.xml17
-rw-r--r--windows/pom.xml20
-rw-r--r--xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml35
-rw-r--r--xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/AutomatedIntegrationSuite.java (renamed from xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/XlcTestSuite.java)2
-rw-r--r--xlc/org.eclipse.cdt.core.lrparser.xlc/pom.xml17
-rw-r--r--xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml35
-rw-r--r--xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/AutomatedIntegrationSuite.java (renamed from xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/AllXlcErrorParserTests.java)4
-rw-r--r--xlc/org.eclipse.cdt.errorparsers.xlc/pom.xml17
-rw-r--r--xlc/org.eclipse.cdt.make.xlc.core/pom.xml17
-rw-r--r--xlc/org.eclipse.cdt.managedbuilder.xlc.core/pom.xml17
-rw-r--r--xlc/org.eclipse.cdt.managedbuilder.xlc.ui/pom.xml17
-rw-r--r--xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/pom.xml17
-rw-r--r--xlc/org.eclipse.cdt.xlc.feature/pom.xml17
-rw-r--r--xlc/org.eclipse.cdt.xlc.sdk-feature/feature-no-source.properties1
-rw-r--r--xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml34
-rw-r--r--xlc/pom.xml30
259 files changed, 822 insertions, 3014 deletions
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 0000000000..9d93c39fd9
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extensions>
+ <extension>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pomless</artifactId>
+ <version>1.0.0</version>
+ </extension>
+</extensions>
diff --git a/build/org.eclipse.cdt.autotools-feature/pom.xml b/build/org.eclipse.cdt.autotools-feature/pom.xml
deleted file mode 100644
index 0a3987eb6e..0000000000
--- a/build/org.eclipse.cdt.autotools-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.autotools</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/build/org.eclipse.cdt.autotools.core/pom.xml b/build/org.eclipse.cdt.autotools.core/pom.xml
deleted file mode 100644
index 2bc30b07f4..0000000000
--- a/build/org.eclipse.cdt.autotools.core/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>2.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.autotools.core</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/build/org.eclipse.cdt.autotools.tests/pom.xml b/build/org.eclipse.cdt.autotools.tests/pom.xml
deleted file mode 100644
index eef7c0e576..0000000000
--- a/build/org.eclipse.cdt.autotools.tests/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>2.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.autotools.tests</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <!-- 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>-->
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
- <includes>
- <include>**/AllAutotoolsTests.*</include>
- </includes>
- <testFailureIgnore>true</testFailureIgnore>
- <dependencies>
- <dependency>
- <artifactId>org.eclipse.platform.feature.group</artifactId>
- <type>p2-installable-unit</type>
- </dependency>
- </dependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AllAutotoolsTests.java b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutomatedIntegrationSuite.java
index 1ae9154c3a..2bda062b85 100644
--- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AllAutotoolsTests.java
+++ b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/AutomatedIntegrationSuite.java
@@ -27,5 +27,5 @@ import org.junit.runners.Suite;
UpdateConfigureTest.class,
EditorTests.class
})
-public class AllAutotoolsTests {
+public class AutomatedIntegrationSuite {
}
diff --git a/build/org.eclipse.cdt.autotools.tests/ui-test-plugin.properties b/build/org.eclipse.cdt.autotools.tests/ui-test-plugin.properties
new file mode 100644
index 0000000000..a209073d59
--- /dev/null
+++ b/build/org.eclipse.cdt.autotools.tests/ui-test-plugin.properties
@@ -0,0 +1 @@
+# This file tells the Maven build to use the settings for UI test plugins
diff --git a/build/org.eclipse.cdt.autotools.ui.tests/pom.xml b/build/org.eclipse.cdt.autotools.ui.tests/pom.xml
deleted file mode 100644
index c078b0cdd3..0000000000
--- a/build/org.eclipse.cdt.autotools.ui.tests/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2014, Red Hat, Inc.
-
- 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
--->
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.autotools.ui.tests</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>true</useUIHarness>
- <useUIThread>false</useUIThread>
- <product>org.eclipse.platform.ide</product>
- <application>org.eclipse.ui.ide.workbench</application>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
- <includes>
- <include>**/AllTests.*</include>
- </includes>
- <testFailureIgnore>true</testFailureIgnore>
- <dependencies>
- <dependency>
- <artifactId>org.eclipse.platform.feature.group</artifactId>
- <type>p2-installable-unit</type>
- </dependency>
- </dependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AllTests.java b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AutomatedIntegrationSuite.java
index 909994aa24..fbc79eae22 100644
--- a/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AllTests.java
+++ b/build/org.eclipse.cdt.autotools.ui.tests/src/org/eclipse/cdt/autotools/ui/tests/AutomatedIntegrationSuite.java
@@ -32,7 +32,7 @@ import org.junit.runners.Suite;
AutoconfTests.class
})
-public class AllTests {
+public class AutomatedIntegrationSuite {
// needed for this class to compile
@BeforeClass
public static void beforeClassMethod() {
diff --git a/build/org.eclipse.cdt.autotools.ui.tests/swtbot-test-plugin.properties b/build/org.eclipse.cdt.autotools.ui.tests/swtbot-test-plugin.properties
new file mode 100644
index 0000000000..338038b934
--- /dev/null
+++ b/build/org.eclipse.cdt.autotools.ui.tests/swtbot-test-plugin.properties
@@ -0,0 +1 @@
+# This file tells the Maven build to use the settings for SWTBot test plugins
diff --git a/build/org.eclipse.cdt.autotools.ui/pom.xml b/build/org.eclipse.cdt.autotools.ui/pom.xml
deleted file mode 100644
index 3160d2a1d6..0000000000
--- a/build/org.eclipse.cdt.autotools.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>2.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.autotools.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project> \ No newline at end of file
diff --git a/build/org.eclipse.cdt.build.gcc.core/pom.xml b/build/org.eclipse.cdt.build.gcc.core/pom.xml
deleted file mode 100644
index 21eb5745d8..0000000000
--- a/build/org.eclipse.cdt.build.gcc.core/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.build.gcc.core</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project> \ No newline at end of file
diff --git a/build/org.eclipse.cdt.cmake-feature/pom.xml b/build/org.eclipse.cdt.cmake-feature/pom.xml
deleted file mode 100644
index f79a9d9bde..0000000000
--- a/build/org.eclipse.cdt.cmake-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.cmake</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/build/org.eclipse.cdt.cmake.core/pom.xml b/build/org.eclipse.cdt.cmake.core/pom.xml
deleted file mode 100644
index 30b6ef9ca8..0000000000
--- a/build/org.eclipse.cdt.cmake.core/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.1.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.cmake.core</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project> \ No newline at end of file
diff --git a/build/org.eclipse.cdt.cmake.ui/pom.xml b/build/org.eclipse.cdt.cmake.ui/pom.xml
deleted file mode 100644
index 74020b670e..0000000000
--- a/build/org.eclipse.cdt.cmake.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.1.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.cmake.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project> \ No newline at end of file
diff --git a/build/org.eclipse.cdt.gnu.build-feature/pom.xml b/build/org.eclipse.cdt.gnu.build-feature/pom.xml
deleted file mode 100644
index fac5e0827a..0000000000
--- a/build/org.eclipse.cdt.gnu.build-feature/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <artifactId>org.eclipse.cdt.gnu.build</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/build/org.eclipse.cdt.make.core.tests/pom.xml b/build/org.eclipse.cdt.make.core.tests/pom.xml
deleted file mode 100644
index 235c02d7ff..0000000000
--- a/build/org.eclipse.cdt.make.core.tests/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>7.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.make.core.tests</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>false</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
- <includes>
- <include>**/AutomatedIntegrationSuite.*</include>
- </includes>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/build/org.eclipse.cdt.make.core/pom.xml b/build/org.eclipse.cdt.make.core/pom.xml
deleted file mode 100644
index f55339f076..0000000000
--- a/build/org.eclipse.cdt.make.core/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>7.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.make.core</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/build/org.eclipse.cdt.make.ui.tests/pom.xml b/build/org.eclipse.cdt.make.ui.tests/pom.xml
deleted file mode 100644
index 66ec6d83b4..0000000000
--- a/build/org.eclipse.cdt.make.ui.tests/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.make.ui.tests</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
- <includes>
- <include>**/AllMakeUITests.*</include>
- </includes>
- <testFailureIgnore>true</testFailureIgnore>
- <dependencies>
- <dependency>
- <artifactId>org.eclipse.platform.feature.group</artifactId>
- <type>p2-installable-unit</type>
- </dependency>
- </dependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/AllMakeUITests.java b/build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/AutomatedIntegrationSuite.java
index 67a687831b..d9c84daeb7 100644
--- a/build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/AllMakeUITests.java
+++ b/build/org.eclipse.cdt.make.ui.tests/src/org/eclipse/cdt/make/ui/tests/AutomatedIntegrationSuite.java
@@ -16,5 +16,5 @@ import org.junit.runners.Suite.SuiteClasses;
@RunWith(Suite.class)
@SuiteClasses({ MakeUIImagesTest.class })
-public class AllMakeUITests {
+public class AutomatedIntegrationSuite {
}
diff --git a/build/org.eclipse.cdt.make.ui.tests/ui-test-plugin.properties b/build/org.eclipse.cdt.make.ui.tests/ui-test-plugin.properties
new file mode 100644
index 0000000000..a209073d59
--- /dev/null
+++ b/build/org.eclipse.cdt.make.ui.tests/ui-test-plugin.properties
@@ -0,0 +1 @@
+# This file tells the Maven build to use the settings for UI test plugins
diff --git a/build/org.eclipse.cdt.make.ui/pom.xml b/build/org.eclipse.cdt.make.ui/pom.xml
deleted file mode 100644
index ae31ea14c2..0000000000
--- a/build/org.eclipse.cdt.make.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>7.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.make.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF
index 8c19abd0fb..d174cbfc93 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF
@@ -20,6 +20,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.cdt.core,
org.eclipse.cdt.managedbuilder.core,
org.eclipse.cdt.managedbuilder.gnu.ui,
- org.eclipse.cdt.core.tests;bundle-version="5.0.0"
+ org.eclipse.cdt.core.tests;bundle-version="5.0.0",
+ org.eclipse.cdt.ui
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml
deleted file mode 100644
index ccb08ee0fe..0000000000
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>8.2.1-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.managedbuilder.core.tests</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <!-- 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>-->
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <!-- Yes, the managed build core tests use the UI harness. -->
- <useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
- <includes>
- <include>**/AllManagedBuildTests.*</include>
- </includes>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.platform</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.cdt</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AutomatedIntegrationSuite.java
index 22904902fc..9a4570db53 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AllManagedBuildTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/tests/suite/AutomatedIntegrationSuite.java
@@ -49,9 +49,9 @@ import org.eclipse.cdt.projectmodel.tests.ProjectModelTests;
/**
* Main TestSuite for all the managed build tests
*/
-public class AllManagedBuildTests {
+public class AutomatedIntegrationSuite {
public static void main(String[] args) {
- junit.textui.TestRunner.run(AllManagedBuildTests.suite());
+ junit.textui.TestRunner.run(AutomatedIntegrationSuite.suite());
}
public static Test suite() {
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/LanguageSettingsProvidersMBSTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/LanguageSettingsProvidersMBSTest.java
index 5b46bd6910..e5c4cb5fe1 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/LanguageSettingsProvidersMBSTest.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/LanguageSettingsProvidersMBSTest.java
@@ -34,6 +34,7 @@ import org.eclipse.core.resources.IProject;
public class LanguageSettingsProvidersMBSTest extends BaseTestCase {
private static final String MBS_LANGUAGE_SETTINGS_PROVIDER_ID = ScannerDiscoveryLegacySupport.MBS_LANGUAGE_SETTINGS_PROVIDER_ID;
private static final String REFERENCED_PROJECTS_PROVIDER_ID = ReferencedProjectsLanguageSettingsProvider.ID;
+ /* This extension comes from org.eclipse.cdt.ui which is why this test plug-in depends on it */
private static final String USER_LANGUAGE_SETTINGS_PROVIDER_ID = ScannerDiscoveryLegacySupport.USER_LANGUAGE_SETTINGS_PROVIDER_ID;
private static final String GCC_SPECS_DETECTOR_ID = "org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector";
private static final String PROJECT_TYPE_EXECUTABLE_GNU = "cdt.managedbuild.target.gnu.exe";
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/ui-test-plugin.properties b/build/org.eclipse.cdt.managedbuilder.core.tests/ui-test-plugin.properties
new file mode 100644
index 0000000000..a209073d59
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/ui-test-plugin.properties
@@ -0,0 +1 @@
+# This file tells the Maven build to use the settings for UI test plugins
diff --git a/build/org.eclipse.cdt.managedbuilder.core/pom.xml b/build/org.eclipse.cdt.managedbuilder.core/pom.xml
deleted file mode 100644
index c213e8ab45..0000000000
--- a/build/org.eclipse.cdt.managedbuilder.core/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>8.4.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.managedbuilder.core</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/pom.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/pom.xml
deleted file mode 100644
index 0f979b1544..0000000000
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>8.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.managedbuilder.gnu.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/pom.xml b/build/org.eclipse.cdt.managedbuilder.ui.tests/pom.xml
deleted file mode 100644
index dd8e7414bc..0000000000
--- a/build/org.eclipse.cdt.managedbuilder.ui.tests/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>8.2.1-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.managedbuilder.ui.tests</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
- <includes>
- <include>**/AllManagedBuildUITests.*</include>
- </includes>
- <testFailureIgnore>true</testFailureIgnore>
- <dependencies>
- <dependency>
- <artifactId>org.eclipse.platform.feature.group</artifactId>
- <type>p2-installable-unit</type>
- </dependency>
- </dependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/suite/AllManagedBuildUITests.java b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/suite/AutomatedIntegrationSuite.java
index 50a700ef34..fc7b8a16de 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/suite/AllManagedBuildUITests.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/src/org/eclipse/cdt/managedbuilder/ui/tests/suite/AutomatedIntegrationSuite.java
@@ -19,9 +19,9 @@ import org.eclipse.cdt.managedbuilder.ui.tests.TestCustomPageManager;
/**
*
*/
-public class AllManagedBuildUITests {
+public class AutomatedIntegrationSuite {
public static void main(String[] args) {
- junit.textui.TestRunner.run(AllManagedBuildUITests.suite());
+ junit.textui.TestRunner.run(AutomatedIntegrationSuite.suite());
}
public static Test suite() {
TestSuite suite = new TestSuite(
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/ui-test-plugin.properties b/build/org.eclipse.cdt.managedbuilder.ui.tests/ui-test-plugin.properties
new file mode 100644
index 0000000000..a209073d59
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/ui-test-plugin.properties
@@ -0,0 +1 @@
+# This file tells the Maven build to use the settings for UI test plugins
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/pom.xml b/build/org.eclipse.cdt.managedbuilder.ui/pom.xml
deleted file mode 100644
index daa7b6a492..0000000000
--- a/build/org.eclipse.cdt.managedbuilder.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>9.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.managedbuilder.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/build/pom.xml b/build/pom.xml
new file mode 100644
index 0000000000..9964cdd85f
--- /dev/null
+++ b/build/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <modules>
+ <module>org.eclipse.cdt.build.gcc.core</module>
+ <module>org.eclipse.cdt.make.core</module>
+ <module>org.eclipse.cdt.make.ui</module>
+ <module>org.eclipse.cdt.managedbuilder.core</module>
+ <module>org.eclipse.cdt.managedbuilder.ui</module>
+
+ <module>org.eclipse.cdt.managedbuilder.gnu.ui</module>
+ <module>org.eclipse.cdt.gnu.build-feature</module>
+
+ <module>org.eclipse.cdt.managedbuilder.core.tests</module>
+ <module>org.eclipse.cdt.managedbuilder.ui.tests</module>
+ <module>org.eclipse.cdt.make.core.tests</module>
+ <module>org.eclipse.cdt.make.ui.tests</module>
+
+ <module>org.eclipse.cdt.autotools.core</module>
+ <module>org.eclipse.cdt.autotools.docs</module>
+ <module>org.eclipse.cdt.autotools.tests</module>
+ <module>org.eclipse.cdt.autotools.ui</module>
+ <module>org.eclipse.cdt.autotools.ui.tests</module>
+ <module>org.eclipse.cdt.autotools-feature</module>
+
+ <module>org.eclipse.cdt.cmake.core</module>
+ <module>org.eclipse.cdt.cmake.ui</module>
+ <module>org.eclipse.cdt.cmake-feature</module>
+ </modules>
+
+ <artifactId>org.eclipse.cdt.build-parent</artifactId>
+ <packaging>pom</packaging>
+</project>
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui.test/pom.xml b/codan/org.eclipse.cdt.codan.checkers.ui.test/pom.xml
deleted file mode 100644
index df83678023..0000000000
--- a/codan/org.eclipse.cdt.codan.checkers.ui.test/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>3.2.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.codan.checkers.ui.test</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <!-- Need UI harness for quick fix tests -->
- <useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
- <testFailureIgnore>true</testFailureIgnore>
- <dependencies>
- <dependency>
- <artifactId>org.eclipse.platform.feature.group</artifactId>
- <type>p2-installable-unit</type>
- </dependency>
- </dependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui.test/.classpath b/codan/org.eclipse.cdt.codan.checkers.ui.tests/.classpath
index eca7bdba8f..eca7bdba8f 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui.test/.classpath
+++ b/codan/org.eclipse.cdt.codan.checkers.ui.tests/.classpath
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui.test/.project b/codan/org.eclipse.cdt.codan.checkers.ui.tests/.project
index 031b00c652..7c0ba48a9e 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui.test/.project
+++ b/codan/org.eclipse.cdt.codan.checkers.ui.tests/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.cdt.codan.checkers.ui.test</name>
+ <name>org.eclipse.cdt.codan.checkers.ui.tests</name>
<comment></comment>
<projects>
</projects>
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui.test/.settings/org.eclipse.jdt.core.prefs b/codan/org.eclipse.cdt.codan.checkers.ui.tests/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dca..0c68a61dca 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui.test/.settings/org.eclipse.jdt.core.prefs
+++ b/codan/org.eclipse.cdt.codan.checkers.ui.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui.test/META-INF/MANIFEST.MF b/codan/org.eclipse.cdt.codan.checkers.ui.tests/META-INF/MANIFEST.MF
index 6c8e44c760..359ae4a05d 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui.test/META-INF/MANIFEST.MF
+++ b/codan/org.eclipse.cdt.codan.checkers.ui.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.cdt.codan.checkers.ui.test
+Bundle-SymbolicName: org.eclipse.cdt.codan.checkers.ui.tests
Bundle-Version: 3.2.0.qualifier
Bundle-Activator: org.eclipse.cdt.codan.checkers.ui.Activator
Require-Bundle: org.eclipse.core.runtime,
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui.test/OSGI-INF/l10n/bundle.properties b/codan/org.eclipse.cdt.codan.checkers.ui.tests/OSGI-INF/l10n/bundle.properties
index c796fcf3c0..c796fcf3c0 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui.test/OSGI-INF/l10n/bundle.properties
+++ b/codan/org.eclipse.cdt.codan.checkers.ui.tests/OSGI-INF/l10n/bundle.properties
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui.test/build.properties b/codan/org.eclipse.cdt.codan.checkers.ui.tests/build.properties
index 34d2e4d2da..34d2e4d2da 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui.test/build.properties
+++ b/codan/org.eclipse.cdt.codan.checkers.ui.tests/build.properties
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui.test/src/org/eclipse/cdt/codan/checkers/ui/Activator.java b/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/Activator.java
index 928d0408ae..928d0408ae 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui.test/src/org/eclipse/cdt/codan/checkers/ui/Activator.java
+++ b/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/Activator.java
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/quickfix/AutomatedIntegrationSuite.java b/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/quickfix/AutomatedIntegrationSuite.java
new file mode 100644
index 0000000000..da6dd8056d
--- /dev/null
+++ b/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/quickfix/AutomatedIntegrationSuite.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Ericsson.
+ * 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
+ *******************************************************************************/
+
+package org.eclipse.cdt.codan.checkers.ui.quickfix;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({ QuickFixCreateNewClassTest.class })
+public class AutomatedIntegrationSuite {
+
+}
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui.test/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixCreateNewClassTest.java b/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixCreateNewClassTest.java
index 687f1fd788..687f1fd788 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui.test/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixCreateNewClassTest.java
+++ b/codan/org.eclipse.cdt.codan.checkers.ui.tests/src/org/eclipse/cdt/codan/checkers/ui/quickfix/QuickFixCreateNewClassTest.java
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui.tests/ui-test-plugin.properties b/codan/org.eclipse.cdt.codan.checkers.ui.tests/ui-test-plugin.properties
new file mode 100644
index 0000000000..a209073d59
--- /dev/null
+++ b/codan/org.eclipse.cdt.codan.checkers.ui.tests/ui-test-plugin.properties
@@ -0,0 +1 @@
+# This file tells the Maven build to use the settings for UI test plugins
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/META-INF/MANIFEST.MF b/codan/org.eclipse.cdt.codan.checkers.ui/META-INF/MANIFEST.MF
index 3f66cd8785..828c809af1 100644
--- a/codan/org.eclipse.cdt.codan.checkers.ui/META-INF/MANIFEST.MF
+++ b/codan/org.eclipse.cdt.codan.checkers.ui/META-INF/MANIFEST.MF
@@ -21,5 +21,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Export-Package: org.eclipse.cdt.codan.internal.checkers.ui;x-internal:=true,
- org.eclipse.cdt.codan.internal.checkers.ui.quickfix;x-friends:="org.eclipse.cdt.codan.checkers.ui.test"
+ org.eclipse.cdt.codan.internal.checkers.ui.quickfix;x-friends:="org.eclipse.cdt.codan.checkers.ui.tests"
diff --git a/codan/org.eclipse.cdt.codan.checkers.ui/pom.xml b/codan/org.eclipse.cdt.codan.checkers.ui/pom.xml
deleted file mode 100644
index 42fcea4da6..0000000000
--- a/codan/org.eclipse.cdt.codan.checkers.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>3.2.1-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.codan.checkers.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/codan/org.eclipse.cdt.codan.checkers/pom.xml b/codan/org.eclipse.cdt.codan.checkers/pom.xml
deleted file mode 100644
index ce0072955c..0000000000
--- a/codan/org.eclipse.cdt.codan.checkers/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>3.2.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.codan.checkers</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/codan/org.eclipse.cdt.codan.core.cxx/pom.xml b/codan/org.eclipse.cdt.codan.core.cxx/pom.xml
deleted file mode 100644
index 27f77141e0..0000000000
--- a/codan/org.eclipse.cdt.codan.core.cxx/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>3.4.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.codan.core.cxx</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/codan/org.eclipse.cdt.codan.core.test/pom.xml b/codan/org.eclipse.cdt.codan.core.test/pom.xml
deleted file mode 100644
index 53460ffd2b..0000000000
--- a/codan/org.eclipse.cdt.codan.core.test/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>3.2.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.codan.core.test</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <!-- Need UI harness for quick fix tests -->
- <useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
- <includes>
- <include>**/AutomatedIntegrationSuite.*</include>
- </includes>
- <testFailureIgnore>true</testFailureIgnore>
- <dependencies>
- <dependency>
- <artifactId>org.eclipse.platform.feature.group</artifactId>
- <type>p2-installable-unit</type>
- </dependency>
- </dependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/codan/org.eclipse.cdt.codan.core.test/.classpath b/codan/org.eclipse.cdt.codan.core.tests/.classpath
index eca7bdba8f..eca7bdba8f 100644
--- a/codan/org.eclipse.cdt.codan.core.test/.classpath
+++ b/codan/org.eclipse.cdt.codan.core.tests/.classpath
diff --git a/codan/org.eclipse.cdt.codan.core.test/.project b/codan/org.eclipse.cdt.codan.core.tests/.project
index 657ca80b92..f84f532f39 100644
--- a/codan/org.eclipse.cdt.codan.core.test/.project
+++ b/codan/org.eclipse.cdt.codan.core.tests/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.cdt.codan.core.test</name>
+ <name>org.eclipse.cdt.codan.core.tests</name>
<comment></comment>
<projects>
</projects>
diff --git a/codan/org.eclipse.cdt.codan.core.test/.settings/org.eclipse.jdt.core.prefs b/codan/org.eclipse.cdt.codan.core.tests/.settings/org.eclipse.jdt.core.prefs
index 2600be86a4..2600be86a4 100644
--- a/codan/org.eclipse.cdt.codan.core.test/.settings/org.eclipse.jdt.core.prefs
+++ b/codan/org.eclipse.cdt.codan.core.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/codan/org.eclipse.cdt.codan.core.test/.settings/org.eclipse.jdt.ui.prefs b/codan/org.eclipse.cdt.codan.core.tests/.settings/org.eclipse.jdt.ui.prefs
index 91bce7d781..91bce7d781 100644
--- a/codan/org.eclipse.cdt.codan.core.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/codan/org.eclipse.cdt.codan.core.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/codan/org.eclipse.cdt.codan.core.test/META-INF/MANIFEST.MF b/codan/org.eclipse.cdt.codan.core.tests/META-INF/MANIFEST.MF
index 315e003be2..1059306141 100644
--- a/codan/org.eclipse.cdt.codan.core.test/META-INF/MANIFEST.MF
+++ b/codan/org.eclipse.cdt.codan.core.tests/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.cdt.codan.core.test
+Bundle-SymbolicName: org.eclipse.cdt.codan.core.tests
Bundle-Version: 3.2.0.qualifier
-Bundle-Activator: org.eclipse.cdt.codan.core.test.CodanCoreTestActivator
+Bundle-Activator: org.eclipse.cdt.codan.core.tests.CodanCoreTestActivator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.cdt.codan.checkers;bundle-version="1.0.0",
org.eclipse.cdt.core,
@@ -26,4 +26,4 @@ Export-Package: org.eclipse.cdt.codan.core.cfg,
org.eclipse.cdt.codan.core.cxx,
org.eclipse.cdt.codan.core.internal.checkers,
org.eclipse.cdt.codan.core.param,
- org.eclipse.cdt.codan.core.test
+ org.eclipse.cdt.codan.core.tests
diff --git a/codan/org.eclipse.cdt.codan.core.test/OSGI-INF/l10n/bundle.properties b/codan/org.eclipse.cdt.codan.core.tests/OSGI-INF/l10n/bundle.properties
index 40c727d9ea..40c727d9ea 100644
--- a/codan/org.eclipse.cdt.codan.core.test/OSGI-INF/l10n/bundle.properties
+++ b/codan/org.eclipse.cdt.codan.core.tests/OSGI-INF/l10n/bundle.properties
diff --git a/codan/org.eclipse.cdt.codan.core.test/about.html b/codan/org.eclipse.cdt.codan.core.tests/about.html
index d7c511887d..d7c511887d 100644
--- a/codan/org.eclipse.cdt.codan.core.test/about.html
+++ b/codan/org.eclipse.cdt.codan.core.tests/about.html
diff --git a/codan/org.eclipse.cdt.codan.core.test/build.properties b/codan/org.eclipse.cdt.codan.core.tests/build.properties
index 5f380c2efd..5f380c2efd 100644
--- a/codan/org.eclipse.cdt.codan.core.test/build.properties
+++ b/codan/org.eclipse.cdt.codan.core.tests/build.properties
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cfg/ControlFlowGraphTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/cfg/ControlFlowGraphTest.java
index 8aaef8d2ad..b9cfd4d942 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cfg/ControlFlowGraphTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/cfg/ControlFlowGraphTest.java
@@ -24,7 +24,7 @@ import org.eclipse.cdt.codan.core.model.cfg.IJumpNode;
import org.eclipse.cdt.codan.core.model.cfg.IPlainNode;
import org.eclipse.cdt.codan.core.model.cfg.ISingleOutgoing;
import org.eclipse.cdt.codan.core.model.cfg.IStartNode;
-import org.eclipse.cdt.codan.core.test.CodanFastCxxAstTestCase;
+import org.eclipse.cdt.codan.core.tests.CodanFastCxxAstTestCase;
import org.eclipse.cdt.codan.internal.core.cfg.AbstractBasicBlock;
import org.eclipse.cdt.codan.internal.core.cfg.ControlFlowGraph;
import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtilsTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtilsTest.java
index 43026431d9..2133f771f5 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtilsTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/cxx/CxxAstUtilsTest.java
@@ -13,7 +13,7 @@ package org.eclipse.cdt.codan.core.cxx;
import java.io.IOException;
import org.eclipse.cdt.codan.core.model.IChecker;
-import org.eclipse.cdt.codan.core.test.CodanFastCxxAstTestCase;
+import org.eclipse.cdt.codan.core.tests.CodanFastCxxAstTestCase;
import org.eclipse.cdt.core.dom.ast.ASTVisitor;
import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cxx/externaltool/ArgsSeparatorTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/cxx/externaltool/ArgsSeparatorTest.java
index 0623c6477a..0623c6477a 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/cxx/externaltool/ArgsSeparatorTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/cxx/externaltool/ArgsSeparatorTest.java
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/AbstractClassInstantiationCheckerTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/AbstractClassInstantiationCheckerTest.java
index 800708747f..2bb86d7377 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/AbstractClassInstantiationCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/AbstractClassInstantiationCheckerTest.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.codan.core.internal.checkers;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
import org.eclipse.cdt.codan.internal.checkers.AbstractClassInstantiationChecker;
/**
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/AssignmentInConditionCheckerTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/AssignmentInConditionCheckerTest.java
index 6f8a2bf82d..aa1d42f440 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/AssignmentInConditionCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/AssignmentInConditionCheckerTest.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.codan.core.internal.checkers;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
import org.eclipse.cdt.codan.internal.core.model.CodanProblemMarker;
import org.eclipse.core.resources.IMarker;
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/AssignmentToItselfCheckerTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/AssignmentToItselfCheckerTest.java
index 18c39ada40..869969c319 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/AssignmentToItselfCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/AssignmentToItselfCheckerTest.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.codan.core.internal.checkers;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
import org.eclipse.core.resources.IMarker;
/**
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CaseBreakCheckerTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/CaseBreakCheckerTest.java
index dd40b057ef..3f5f808b8f 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CaseBreakCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/CaseBreakCheckerTest.java
@@ -12,7 +12,7 @@
package org.eclipse.cdt.codan.core.internal.checkers;
import org.eclipse.cdt.codan.core.param.IProblemPreference;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
import org.eclipse.cdt.codan.internal.checkers.CaseBreakChecker;
/**
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CatchByReferenceTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/CatchByReferenceTest.java
index 3a9f82c6e7..30fe974c20 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CatchByReferenceTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/CatchByReferenceTest.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.codan.core.internal.checkers;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
import org.eclipse.cdt.codan.internal.checkers.CatchByReference;
/**
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ClassMembersInitializationCheckerTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/ClassMembersInitializationCheckerTest.java
index 3cc0437ab5..5cd0fa13aa 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ClassMembersInitializationCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/ClassMembersInitializationCheckerTest.java
@@ -13,7 +13,7 @@
*******************************************************************************/
package org.eclipse.cdt.codan.core.internal.checkers;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
import org.eclipse.cdt.codan.internal.checkers.ClassMembersInitializationChecker;
/**
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CommentCheckerLineTests.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/CommentCheckerLineTests.java
index efbe0a6ec0..59e438128b 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CommentCheckerLineTests.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/CommentCheckerLineTests.java
@@ -12,7 +12,7 @@ package org.eclipse.cdt.codan.core.internal.checkers;
import java.io.File;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
import org.eclipse.cdt.codan.internal.checkers.CommentChecker;
import org.junit.Test;
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CommentCheckerNestedTests.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/CommentCheckerNestedTests.java
index 81782d63c8..ea95da3d0f 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/CommentCheckerNestedTests.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/CommentCheckerNestedTests.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.codan.core.internal.checkers;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
import org.eclipse.cdt.codan.internal.checkers.CommentChecker;
import org.junit.Test;
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/FormatStringCheckerTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/FormatStringCheckerTest.java
index cfc8b0bf12..e4e13476dc 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/FormatStringCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/FormatStringCheckerTest.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.codan.core.internal.checkers;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
/**
* Test for {@see FormatStringChecker} class
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/NonVirtualDestructorCheckerTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/NonVirtualDestructorCheckerTest.java
index d795824f41..6949d3f09a 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/NonVirtualDestructorCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/NonVirtualDestructorCheckerTest.java
@@ -12,7 +12,7 @@
*******************************************************************************/
package org.eclipse.cdt.codan.core.internal.checkers;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
import org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructor;
import org.eclipse.core.resources.IMarker;
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ProblemBindingCheckerTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/ProblemBindingCheckerTest.java
index 604fab38cc..149785324d 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ProblemBindingCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/ProblemBindingCheckerTest.java
@@ -11,7 +11,7 @@
*******************************************************************************/
package org.eclipse.cdt.codan.core.internal.checkers;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
import org.eclipse.cdt.codan.internal.checkers.ProblemBindingChecker;
import org.eclipse.core.resources.IMarker;
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnCheckerTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnCheckerTest.java
index 2263ed74a1..69715f65a7 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnCheckerTest.java
@@ -13,7 +13,7 @@
package org.eclipse.cdt.codan.core.internal.checkers;
import org.eclipse.cdt.codan.core.param.IProblemPreference;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
import org.eclipse.cdt.codan.internal.checkers.ReturnChecker;
/**
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnStyleCheckerTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnStyleCheckerTest.java
index a9dc0b0f19..b28128afe5 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnStyleCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/ReturnStyleCheckerTest.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.codan.core.internal.checkers;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
public class ReturnStyleCheckerTest extends CheckerTestCase {
@Override
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/StatementHasNoEffectCheckerTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/StatementHasNoEffectCheckerTest.java
index bc70839538..4859975b9b 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/StatementHasNoEffectCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/StatementHasNoEffectCheckerTest.java
@@ -13,7 +13,7 @@ package org.eclipse.cdt.codan.core.internal.checkers;
import java.io.File;
import org.eclipse.cdt.codan.core.param.IProblemPreference;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
import org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectChecker;
import org.eclipse.core.resources.IMarker;
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/SuggestedParenthesisCheckerTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/SuggestedParenthesisCheckerTest.java
index 4b0c686dd6..78b8acfd6e 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/SuggestedParenthesisCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/SuggestedParenthesisCheckerTest.java
@@ -11,7 +11,7 @@
package org.eclipse.cdt.codan.core.internal.checkers;
import org.eclipse.cdt.codan.core.param.IProblemPreference;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
import org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisChecker;
/**
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/SuspiciousSemicolonCheckerTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/SuspiciousSemicolonCheckerTest.java
index a32d9c2653..cb1b822a22 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/SuspiciousSemicolonCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/SuspiciousSemicolonCheckerTest.java
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.eclipse.cdt.codan.core.internal.checkers;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
import org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonChecker;
public class SuspiciousSemicolonCheckerTest extends CheckerTestCase {
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/UnusedSymbolInFileScopeCheckerTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/UnusedSymbolInFileScopeCheckerTest.java
index 8dc72bb6c0..87eb9e0998 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/internal/checkers/UnusedSymbolInFileScopeCheckerTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/internal/checkers/UnusedSymbolInFileScopeCheckerTest.java
@@ -11,7 +11,7 @@
*******************************************************************************/
package org.eclipse.cdt.codan.core.internal.checkers;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
import org.eclipse.cdt.codan.internal.checkers.UnusedSymbolInFileScopeChecker;
/**
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/param/BasicProblemPreferenceTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/param/BasicProblemPreferenceTest.java
index bd94d48c04..bd94d48c04 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/param/BasicProblemPreferenceTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/param/BasicProblemPreferenceTest.java
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/param/ListProblemPreferenceTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/param/ListProblemPreferenceTest.java
index 095a643e3a..095a643e3a 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/param/ListProblemPreferenceTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/param/ListProblemPreferenceTest.java
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/param/MapProblemPreferenceTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/param/MapProblemPreferenceTest.java
index e0abcb169c..e0abcb169c 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/param/MapProblemPreferenceTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/param/MapProblemPreferenceTest.java
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/AutomatedIntegrationSuite.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/AutomatedIntegrationSuite.java
index 19e14ea4dd..79093b226e 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/AutomatedIntegrationSuite.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/AutomatedIntegrationSuite.java
@@ -9,7 +9,7 @@
* QNX Software Systems - initial API and implementation
* Markus Schorn (Wind River Systems)
*******************************************************************************/
-package org.eclipse.cdt.codan.core.test;
+package org.eclipse.cdt.codan.core.tests;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CheckerTestCase.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CheckerTestCase.java
index a4368c0903..2c5d488f3a 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CheckerTestCase.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CheckerTestCase.java
@@ -9,7 +9,7 @@
* Alena Laskavaia - initial API and implementation
* Marc-Andre Laperle
*******************************************************************************/
-package org.eclipse.cdt.codan.core.test;
+package org.eclipse.cdt.codan.core.tests;
import java.io.File;
import java.io.IOException;
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanCoreTestActivator.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanCoreTestActivator.java
index a158d613a6..e11f5e2764 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanCoreTestActivator.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanCoreTestActivator.java
@@ -8,7 +8,7 @@
* Contributors:
* Alena Laskavaia - initial API and implementation
*******************************************************************************/
-package org.eclipse.cdt.codan.core.test;
+package org.eclipse.cdt.codan.core.tests;
import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanFastCxxAstTestCase.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastCxxAstTestCase.java
index 1142cf1a12..5ca94aaef4 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanFastCxxAstTestCase.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastCxxAstTestCase.java
@@ -8,7 +8,7 @@
* Contributors:
* QNX Software Systems (Alena Laskavaia) - initial API and implementation
*******************************************************************************/
-package org.eclipse.cdt.codan.core.test;
+package org.eclipse.cdt.codan.core.tests;
import junit.framework.TestCase;
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanFastTestSuite.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastTestSuite.java
index 5893e9eb6d..e1147e315e 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanFastTestSuite.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanFastTestSuite.java
@@ -9,7 +9,7 @@
* QNX Software Systems - initial API and implementation
* Markus Schorn (Wind River Systems)
*******************************************************************************/
-package org.eclipse.cdt.codan.core.test;
+package org.eclipse.cdt.codan.core.tests;
import junit.framework.Test;
import junit.framework.TestCase;
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanTestCase.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanTestCase.java
index d5b9b5ab79..718a998799 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/CodanTestCase.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/CodanTestCase.java
@@ -8,7 +8,7 @@
* Contributors:
* Alena Laskavaia - initial API and implementation
*******************************************************************************/
-package org.eclipse.cdt.codan.core.test;
+package org.eclipse.cdt.codan.core.tests;
import java.io.ByteArrayInputStream;
import java.io.File;
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/TestUtils.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/TestUtils.java
index 677e69fd1c..471fcbae88 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/core/test/TestUtils.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/core/tests/TestUtils.java
@@ -8,7 +8,7 @@
* Contributors:
* Alena Laskavaia - initial API and implementation
*******************************************************************************/
-package org.eclipse.cdt.codan.core.test;
+package org.eclipse.cdt.codan.core.tests;
import java.io.BufferedReader;
import java.io.File;
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/AssignmentInConditionQuickFixTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/AssignmentInConditionQuickFixTest.java
index 092764fdf8..092764fdf8 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/AssignmentInConditionQuickFixTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/AssignmentInConditionQuickFixTest.java
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixTest.java
index bafe92bc2a..bafe92bc2a 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CaseBreakQuickFixTest.java
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByReferenceQuickFixTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByReferenceQuickFixTest.java
index d3dd2f8539..d3dd2f8539 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByReferenceQuickFixTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CatchByReferenceQuickFixTest.java
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CreateLocalVariableQuickFixTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CreateLocalVariableQuickFixTest.java
index f721c7ade1..f721c7ade1 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CreateLocalVariableQuickFixTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/CreateLocalVariableQuickFixTest.java
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixTestCase.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixTestCase.java
index fa8576ffd1..2fd7fa29df 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixTestCase.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/QuickFixTestCase.java
@@ -13,8 +13,8 @@ package org.eclipse.cdt.codan.internal.checkers.ui.quickfix;
import java.io.IOException;
import org.eclipse.cdt.codan.core.PreferenceConstants;
-import org.eclipse.cdt.codan.core.test.CheckerTestCase;
-import org.eclipse.cdt.codan.core.test.TestUtils;
+import org.eclipse.cdt.codan.core.tests.CheckerTestCase;
+import org.eclipse.cdt.codan.core.tests.TestUtils;
import org.eclipse.cdt.codan.internal.ui.CodanUIActivator;
import org.eclipse.cdt.codan.ui.AbstractCodanCMarkerResolution;
import org.eclipse.core.resources.IMarker;
diff --git a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/SuggestedParenthesisQuickFixTest.java b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/SuggestedParenthesisQuickFixTest.java
index 8d2b6292d9..09b0c15b1c 100644
--- a/codan/org.eclipse.cdt.codan.core.test/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/SuggestedParenthesisQuickFixTest.java
+++ b/codan/org.eclipse.cdt.codan.core.tests/src/org/eclipse/cdt/codan/internal/checkers/ui/quickfix/SuggestedParenthesisQuickFixTest.java
@@ -13,7 +13,7 @@ package org.eclipse.cdt.codan.internal.checkers.ui.quickfix;
import java.io.File;
import java.io.FileInputStream;
-import org.eclipse.cdt.codan.core.test.TestUtils;
+import org.eclipse.cdt.codan.core.tests.TestUtils;
import org.eclipse.cdt.codan.ui.AbstractCodanCMarkerResolution;
import org.eclipse.cdt.internal.ui.util.EditorUtility;
diff --git a/codan/org.eclipse.cdt.codan.core.test/test.xml b/codan/org.eclipse.cdt.codan.core.tests/test.xml
index cd6c9f31f4..cd6c9f31f4 100644
--- a/codan/org.eclipse.cdt.codan.core.test/test.xml
+++ b/codan/org.eclipse.cdt.codan.core.tests/test.xml
diff --git a/codan/org.eclipse.cdt.codan.core.tests/ui-test-plugin.properties b/codan/org.eclipse.cdt.codan.core.tests/ui-test-plugin.properties
new file mode 100644
index 0000000000..a209073d59
--- /dev/null
+++ b/codan/org.eclipse.cdt.codan.core.tests/ui-test-plugin.properties
@@ -0,0 +1 @@
+# This file tells the Maven build to use the settings for UI test plugins
diff --git a/codan/org.eclipse.cdt.codan.core/pom.xml b/codan/org.eclipse.cdt.codan.core/pom.xml
deleted file mode 100644
index b5c0ad9732..0000000000
--- a/codan/org.eclipse.cdt.codan.core/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>4.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.codan.core</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/codan/org.eclipse.cdt.codan.ui.cxx/pom.xml b/codan/org.eclipse.cdt.codan.ui.cxx/pom.xml
deleted file mode 100644
index 0ccb0fd006..0000000000
--- a/codan/org.eclipse.cdt.codan.ui.cxx/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>3.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.codan.ui.cxx</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/codan/org.eclipse.cdt.codan.ui/pom.xml b/codan/org.eclipse.cdt.codan.ui/pom.xml
deleted file mode 100644
index fe87fb744b..0000000000
--- a/codan/org.eclipse.cdt.codan.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>3.2.1-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.codan.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/codan/pom.xml b/codan/pom.xml
new file mode 100644
index 0000000000..1b03cd35e6
--- /dev/null
+++ b/codan/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.codan-parent</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <module>org.eclipse.cdt.codan.core</module>
+ <module>org.eclipse.cdt.codan.ui</module>
+ <module>org.eclipse.cdt.codan.core.cxx</module>
+ <module>org.eclipse.cdt.codan.ui.cxx</module>
+ <module>org.eclipse.cdt.codan.checkers</module>
+ <module>org.eclipse.cdt.codan.checkers.ui</module>
+ <module>org.eclipse.cdt.codan.core.tests</module>
+ <module>org.eclipse.cdt.codan.checkers.ui.tests</module>
+ </modules>
+</project>
diff --git a/core/org.eclipse.cdt.core.tests/pom.xml b/core/org.eclipse.cdt.core.tests/pom.xml
index f51dcdec41..9d3a76b109 100644
--- a/core/org.eclipse.cdt.core.tests/pom.xml
+++ b/core/org.eclipse.cdt.core.tests/pom.xml
@@ -19,15 +19,6 @@
<extra.vmargs></extra.vmargs>
</properties>
- <!-- 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>-->
-
<profiles>
<profile>
<id>indexer-timeout-set</id>
diff --git a/core/org.eclipse.cdt.core/pom.xml b/core/org.eclipse.cdt.core/pom.xml
deleted file mode 100644
index 393899a092..0000000000
--- a/core/org.eclipse.cdt.core/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>6.3.1-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.core</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/core/org.eclipse.cdt.ui.tests/pom.xml b/core/org.eclipse.cdt.ui.tests/pom.xml
index 62f96dc876..3da636bb6c 100644
--- a/core/org.eclipse.cdt.ui.tests/pom.xml
+++ b/core/org.eclipse.cdt.ui.tests/pom.xml
@@ -62,6 +62,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
+ <useUIThread>true</useUIThread>
<argLine>${tycho.testArgLine} ${base.ui.test.vmargs} ${extra.vmargs.indexer.timeout} ${extra.vmargs.displayhelper.timeoutmultipler}</argLine>
<includes>
<include>**/AutomatedSuite.*</include>
diff --git a/core/org.eclipse.cdt.ui/pom.xml b/core/org.eclipse.cdt.ui/pom.xml
deleted file mode 100644
index 5db4e46f1b..0000000000
--- a/core/org.eclipse.cdt.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>6.2.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/core/pom.xml b/core/pom.xml
new file mode 100644
index 0000000000..7e2f3dd71a
--- /dev/null
+++ b/core/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.core.native</module>
+ <module>org.eclipse.cdt.core.linux</module>
+ <module>org.eclipse.cdt.core.linux.x86</module>
+ <module>org.eclipse.cdt.core.linux.x86_64</module>
+ <module>org.eclipse.cdt.core.linux.ppc64</module>
+ <module>org.eclipse.cdt.core.linux.ppc64le</module>
+ <module>org.eclipse.cdt.core.win32</module>
+ <module>org.eclipse.cdt.core.win32.x86</module>
+ <module>org.eclipse.cdt.core.win32.x86_64</module>
+ <module>org.eclipse.cdt.core.macosx</module>
+
+ <module>org.eclipse.cdt.core</module>
+ <module>org.eclipse.cdt.ui</module>
+
+ <module>org.eclipse.cdt.core.tests</module>
+ <module>org.eclipse.cdt.ui.tests</module>
+ </modules>
+</project>
diff --git a/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml b/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
deleted file mode 100644
index 5783a67330..0000000000
--- a/cross/org.eclipse.cdt.build.crossgcc-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.build.crossgcc</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/cross/org.eclipse.cdt.build.crossgcc/pom.xml b/cross/org.eclipse.cdt.build.crossgcc/pom.xml
deleted file mode 100644
index d247c3a06b..0000000000
--- a/cross/org.eclipse.cdt.build.crossgcc/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.1.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.build.crossgcc</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/cross/org.eclipse.cdt.launch.remote-feature/pom.xml b/cross/org.eclipse.cdt.launch.remote-feature/pom.xml
deleted file mode 100644
index 20be1fe60f..0000000000
--- a/cross/org.eclipse.cdt.launch.remote-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.launch.remote</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/cross/org.eclipse.cdt.launch.remote/pom.xml b/cross/org.eclipse.cdt.launch.remote/pom.xml
deleted file mode 100644
index 2d72780f03..0000000000
--- a/cross/org.eclipse.cdt.launch.remote/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>2.5.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.launch.remote</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/cross/pom.xml b/cross/pom.xml
new file mode 100644
index 0000000000..41ab73f510
--- /dev/null
+++ b/cross/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.cross-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.build.crossgcc</module>
+ <module>org.eclipse.cdt.build.crossgcc-feature</module>
+ <module>org.eclipse.cdt.launch.remote</module>
+ <module>org.eclipse.cdt.launch.remote-feature</module>
+ </modules>
+</project>
diff --git a/debug/org.eclipse.cdt.debug.application/pom.xml b/debug/org.eclipse.cdt.debug.application/pom.xml
deleted file mode 100644
index 048aea2949..0000000000
--- a/debug/org.eclipse.cdt.debug.application/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.1.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.debug.application</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/debug/org.eclipse.cdt.debug.core/pom.xml b/debug/org.eclipse.cdt.debug.core/pom.xml
deleted file mode 100644
index 30ea6a202a..0000000000
--- a/debug/org.eclipse.cdt.debug.core/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>8.1.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.debug.core</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/debug/org.eclipse.cdt.debug.standalone-feature/pom.xml b/debug/org.eclipse.cdt.debug.standalone-feature/pom.xml
deleted file mode 100644
index b739b30ea2..0000000000
--- a/debug/org.eclipse.cdt.debug.standalone-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <artifactId>org.eclipse.cdt.debug.standalone</artifactId>
- <packaging>eclipse-feature</packaging>
- <version>9.3.0-SNAPSHOT</version>
-</project>
diff --git a/debug/org.eclipse.cdt.debug.ui/pom.xml b/debug/org.eclipse.cdt.debug.ui/pom.xml
deleted file mode 100644
index 1a53822c7b..0000000000
--- a/debug/org.eclipse.cdt.debug.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>8.2.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.debug.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/debug/org.eclipse.cdt.gdb-feature/pom.xml b/debug/org.eclipse.cdt.gdb-feature/pom.xml
deleted file mode 100644
index b516866f68..0000000000
--- a/debug/org.eclipse.cdt.gdb-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <artifactId>org.eclipse.cdt.gdb</artifactId>
- <packaging>eclipse-feature</packaging>
- <version>9.3.0-SNAPSHOT</version>
-</project>
diff --git a/debug/org.eclipse.cdt.gdb.ui/pom.xml b/debug/org.eclipse.cdt.gdb.ui/pom.xml
deleted file mode 100644
index a361d68adc..0000000000
--- a/debug/org.eclipse.cdt.gdb.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>7.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.gdb.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/debug/org.eclipse.cdt.gdb/pom.xml b/debug/org.eclipse.cdt.gdb/pom.xml
deleted file mode 100644
index 652f54680c..0000000000
--- a/debug/org.eclipse.cdt.gdb/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>7.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.gdb</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/debug/org.eclipse.cdt.gnu.debug-feature/pom.xml b/debug/org.eclipse.cdt.gnu.debug-feature/pom.xml
deleted file mode 100644
index 2011c808a4..0000000000
--- a/debug/org.eclipse.cdt.gnu.debug-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.feature</groupId>
- <artifactId>org.eclipse.cdt.gnu.debug</artifactId>
- <packaging>eclipse-feature</packaging>
- <version>9.3.0-SNAPSHOT</version>
-</project>
diff --git a/debug/pom.xml b/debug/pom.xml
new file mode 100644
index 0000000000..431d7b1853
--- /dev/null
+++ b/debug/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.debug-parent</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <module>org.eclipse.cdt.debug.core</module>
+ <module>org.eclipse.cdt.debug.ui</module>
+
+ <module>org.eclipse.cdt.gdb</module>
+ <module>org.eclipse.cdt.gdb.ui</module>
+ <module>org.eclipse.cdt.gdb-feature</module>
+ <module>org.eclipse.cdt.gnu.debug-feature</module>
+
+ <module>org.eclipse.cdt.debug.application</module>
+ <module>org.eclipse.cdt.debug.application.doc</module>
+ <module>org.eclipse.cdt.debug.standalone-feature</module>
+ <!--
+ TODO: Investigate/Fix hanging before re-enable re-enabling
+ <module>org.eclipse.cdt.debug.application.tests</module>
+ -->
+ </modules>
+
+ <profiles>
+ <profile>
+ <id>build-standalone-debugger-rcp</id>
+ <modules>
+ <module>org.eclipse.cdt.debug.application.product</module>
+ </modules>
+ </profile>
+ </profiles>
+</project>
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/pom.xml b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/pom.xml
deleted file mode 100644
index 7ea49599ab..0000000000
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <!-- 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>
- -->
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
- <includes>
- <include>**/AllTests.*</include>
- </includes>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.platform</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.cdt</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/ui/test/AllTests.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/ui/test/AutomatedIntegrationSuite.java
index 7f6634c30c..ec55742ebb 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/ui/test/AllTests.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/src/org/eclipse/cdt/dsf/gdb/multicorevisualizer/ui/test/AutomatedIntegrationSuite.java
@@ -23,6 +23,6 @@ import org.junit.runners.Suite.SuiteClasses;
PersistentSettingsManagerTest.class,
VisualizerVirtualBoundsGraphicObjectTest.class,
})
-public class AllTests {
+public class AutomatedIntegrationSuite {
// Often overriding BeforeClass method here
}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/ui-test-plugin.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/ui-test-plugin.properties
new file mode 100644
index 0000000000..a209073d59
--- /dev/null
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests/ui-test-plugin.properties
@@ -0,0 +1 @@
+# This file tells the Maven build to use the settings for UI test plugins
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/pom.xml b/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/pom.xml
deleted file mode 100644
index e2ee67e28f..0000000000
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.1.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml
deleted file mode 100644
index e2fe449e29..0000000000
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.dsf.gdb.tests</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <!-- 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>
- -->
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
- <includes>
- <include>**/AllTests.*</include>
- </includes>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.platform</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.cdt</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/gdb/tests/AllTests.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/gdb/tests/AutomatedIntegrationSuite.java
index 9bcdeff4be..37eb0477a8 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/gdb/tests/AllTests.java
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/src/org/eclipse/cdt/dsf/gdb/tests/AutomatedIntegrationSuite.java
@@ -31,6 +31,6 @@ import org.junit.runners.Suite.SuiteClasses;
ProcStatParserTest.class,
FilePartsTest.class,
})
-public class AllTests {
+public class AutomatedIntegrationSuite {
// Often overriding BeforeClass method here
}
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/ui-test-plugin.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/ui-test-plugin.properties
new file mode 100644
index 0000000000..a209073d59
--- /dev/null
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/ui-test-plugin.properties
@@ -0,0 +1 @@
+# This file tells the Maven build to use the settings for UI test plugins
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/pom.xml b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/pom.xml
deleted file mode 100644
index badd4fd359..0000000000
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>2.6.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.dsf.gdb.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb/pom.xml b/dsf-gdb/org.eclipse.cdt.dsf.gdb/pom.xml
deleted file mode 100644
index 76c501dfd9..0000000000
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>5.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.dsf.gdb</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/pom.xml b/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/pom.xml
deleted file mode 100644
index 9d612f1e89..0000000000
--- a/dsf-gdb/org.eclipse.cdt.examples.dsf.gdb/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.1.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.examples.dsf.gdb</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/pom.xml b/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/pom.xml
deleted file mode 100644
index e1844bd81d..0000000000
--- a/dsf-gdb/org.eclipse.cdt.gnu.dsf-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.feature</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.gnu.dsf</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/dsf-gdb/org.eclipse.cdt.gnu.multicorevisualizer-feature/pom.xml b/dsf-gdb/org.eclipse.cdt.gnu.multicorevisualizer-feature/pom.xml
deleted file mode 100644
index f900490433..0000000000
--- a/dsf-gdb/org.eclipse.cdt.gnu.multicorevisualizer-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.gnu.multicorevisualizer</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/dsf-gdb/pom.xml b/dsf-gdb/pom.xml
new file mode 100644
index 0000000000..fc4c784bad
--- /dev/null
+++ b/dsf-gdb/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.dsf-gdb-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.dsf.gdb</module>
+ <module>org.eclipse.cdt.dsf.gdb.ui</module>
+ <module>org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui</module>
+ <module>org.eclipse.cdt.gnu.dsf-feature</module>
+ <module>org.eclipse.cdt.gnu.multicorevisualizer-feature</module>
+
+ <module>org.eclipse.cdt.dsf.gdb.tests</module>
+ <module>org.eclipse.cdt.tests.dsf.gdb</module>
+ <module>org.eclipse.cdt.examples.dsf.gdb</module>
+ <module>org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests</module>
+ </modules>
+</project>
diff --git a/dsf/org.eclipse.cdt.dsf.ui/pom.xml b/dsf/org.eclipse.cdt.dsf.ui/pom.xml
deleted file mode 100644
index 0495cdffbf..0000000000
--- a/dsf/org.eclipse.cdt.dsf.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>2.5.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.dsf.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/dsf/org.eclipse.cdt.dsf/pom.xml b/dsf/org.eclipse.cdt.dsf/pom.xml
deleted file mode 100644
index 8a97083de3..0000000000
--- a/dsf/org.eclipse.cdt.dsf/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>2.8.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.dsf</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml b/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
deleted file mode 100644
index bf084f1b82..0000000000
--- a/dsf/org.eclipse.cdt.examples.dsf-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.examples.dsf</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/pom.xml b/dsf/org.eclipse.cdt.examples.dsf.pda.ui/pom.xml
deleted file mode 100644
index 6dd676b96d..0000000000
--- a/dsf/org.eclipse.cdt.examples.dsf.pda.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>2.1.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.examples.dsf.pda.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/dsf/org.eclipse.cdt.examples.dsf.pda/pom.xml b/dsf/org.eclipse.cdt.examples.dsf.pda/pom.xml
deleted file mode 100644
index 14ab0376cd..0000000000
--- a/dsf/org.eclipse.cdt.examples.dsf.pda/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>2.1.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.examples.dsf.pda</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/dsf/org.eclipse.cdt.examples.dsf/pom.xml b/dsf/org.eclipse.cdt.examples.dsf/pom.xml
deleted file mode 100644
index 0b3243a8cf..0000000000
--- a/dsf/org.eclipse.cdt.examples.dsf/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>2.2.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.examples.dsf</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/dsf/pom.xml b/dsf/pom.xml
new file mode 100644
index 0000000000..7b8981207a
--- /dev/null
+++ b/dsf/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.dsf-parent</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <module>org.eclipse.cdt.dsf</module>
+ <module>org.eclipse.cdt.dsf.ui</module>
+ <module>org.eclipse.cdt.examples.dsf</module>
+ <module>org.eclipse.cdt.examples.dsf.pda</module>
+ <module>org.eclipse.cdt.examples.dsf.pda.ui</module>
+ <module>org.eclipse.cdt.examples.dsf-feature</module>
+ </modules>
+</project>
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml
deleted file mode 100644
index 329c297256..0000000000
--- a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.debug.gdbjtag</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.core/pom.xml b/jtag/org.eclipse.cdt.debug.gdbjtag.core/pom.xml
deleted file mode 100644
index 5e30f1740f..0000000000
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.core/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>9.1.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.debug.gdbjtag.core</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/pom.xml b/jtag/org.eclipse.cdt.debug.gdbjtag.ui/pom.xml
deleted file mode 100644
index 975d9539d0..0000000000
--- a/jtag/org.eclipse.cdt.debug.gdbjtag.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>8.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.debug.gdbjtag.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag/pom.xml b/jtag/org.eclipse.cdt.debug.gdbjtag/pom.xml
deleted file mode 100644
index 1b9691982a..0000000000
--- a/jtag/org.eclipse.cdt.debug.gdbjtag/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>7.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.debug.gdbjtag</artifactId>
- <packaging>eclipse-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>plugin-source</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>attach-source</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/core/org.eclipse.cdt.core.native/pom.xml b/jtag/pom.xml
index 1603e372b2..f1582724ac 100644
--- a/core/org.eclipse.cdt.core.native/pom.xml
+++ b/jtag/pom.xml
@@ -8,10 +8,15 @@
<groupId>org.eclipse.cdt</groupId>
<artifactId>cdt-parent</artifactId>
<version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
- <version>5.10.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.core.native</artifactId>
- <packaging>eclipse-plugin</packaging>
+ <artifactId>org.eclipse.cdt.jtag-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.debug.gdbjtag</module>
+ <module>org.eclipse.cdt.debug.gdbjtag.core</module>
+ <module>org.eclipse.cdt.debug.gdbjtag.ui</module>
+ <module>org.eclipse.cdt.debug.gdbjtag-feature</module>
+ </modules>
</project>
diff --git a/launch/org.eclipse.cdt.docker.launcher-feature/pom.xml b/launch/org.eclipse.cdt.docker.launcher-feature/pom.xml
deleted file mode 100644
index 383976a61d..0000000000
--- a/launch/org.eclipse.cdt.docker.launcher-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.docker.launcher</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/launch/org.eclipse.cdt.docker.launcher/pom.xml b/launch/org.eclipse.cdt.docker.launcher/pom.xml
deleted file mode 100644
index dbb0f72c42..0000000000
--- a/launch/org.eclipse.cdt.docker.launcher/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.docker.launcher</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/launch/org.eclipse.cdt.launch/pom.xml b/launch/org.eclipse.cdt.launch/pom.xml
deleted file mode 100644
index 39854c329f..0000000000
--- a/launch/org.eclipse.cdt.launch/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>9.1.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.launch</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/launch/pom.xml b/launch/pom.xml
new file mode 100644
index 0000000000..e1378e2609
--- /dev/null
+++ b/launch/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.launch-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.launch</module>
+ <module>org.eclipse.cdt.docker.launcher</module>
+ <module>org.eclipse.cdt.docker.launcher-feature</module>
+ </modules>
+</project>
diff --git a/llvm/org.eclipse.cdt.llvm.dsf.lldb-feature/pom.xml b/llvm/org.eclipse.cdt.llvm.dsf.lldb-feature/pom.xml
deleted file mode 100644
index fbad273faa..0000000000
--- a/llvm/org.eclipse.cdt.llvm.dsf.lldb-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.llvm.dsf.lldb</artifactId>
- <packaging>eclipse-feature</packaging>
-
-</project>
diff --git a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/pom.xml b/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/pom.xml
deleted file mode 100644
index ce83fe996b..0000000000
--- a/llvm/org.eclipse.cdt.llvm.dsf.lldb.core/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.llvm.dsf.lldb.core</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/llvm/org.eclipse.cdt.llvm.dsf.lldb.ui/pom.xml b/llvm/org.eclipse.cdt.llvm.dsf.lldb.ui/pom.xml
deleted file mode 100644
index e51542a2ec..0000000000
--- a/llvm/org.eclipse.cdt.llvm.dsf.lldb.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.llvm.dsf.lldb.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm-feature/pom.xml b/llvm/org.eclipse.cdt.managedbuilder.llvm-feature/pom.xml
deleted file mode 100644
index 5399dbb356..0000000000
--- a/llvm/org.eclipse.cdt.managedbuilder.llvm-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.managedbuilder.llvm</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/pom.xml b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/pom.xml
deleted file mode 100644
index fb922c1e48..0000000000
--- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.1.7-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.managedbuilder.llvm.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/llvm/pom.xml b/llvm/pom.xml
new file mode 100644
index 0000000000..46ab5aa388
--- /dev/null
+++ b/llvm/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.llvm-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.managedbuilder.llvm.ui</module>
+ <module>org.eclipse.cdt.managedbuilder.llvm-feature</module>
+ <module>org.eclipse.cdt.llvm.dsf.lldb.core</module>
+ <module>org.eclipse.cdt.llvm.dsf.lldb.ui</module>
+ <module>org.eclipse.cdt.llvm.dsf.lldb-feature</module>
+ </modules>
+</project>
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.feature/pom.xml b/lrparser/org.eclipse.cdt.core.lrparser.feature/pom.xml
deleted file mode 100644
index 3e4f9669fe..0000000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.feature/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.core.lrparser.feature</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature-no-source.properties b/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature-no-source.properties
new file mode 100644
index 0000000000..8c2b2f70c5
--- /dev/null
+++ b/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/feature-no-source.properties
@@ -0,0 +1 @@
+# This file tells the Maven build to not generate sources for this feature
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/pom.xml b/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/pom.xml
deleted file mode 100644
index 60c7f3bc94..0000000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.sdk.feature/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.core.lrparser.sdk</artifactId>
- <packaging>eclipse-feature</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <version>${tycho-extras-version}</version>
- <executions>
- <execution>
- <id>source-feature</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/pom.xml b/lrparser/org.eclipse.cdt.core.lrparser.tests/pom.xml
deleted file mode 100644
index c8c441ae57..0000000000
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>5.2.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.core.lrparser.tests</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>false</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
- <includes>
- <include>**/LRParserTestSuite.*</include>
- </includes>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRParserTestSuite.java b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/AutomatedIntegrationSuite.java
index 48a614d9ad..34ef474d89 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/LRParserTestSuite.java
+++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/src/org/eclipse/cdt/core/lrparser/tests/AutomatedIntegrationSuite.java
@@ -15,7 +15,7 @@ package org.eclipse.cdt.core.lrparser.tests;
import junit.framework.Test;
import junit.framework.TestSuite;
-public class LRParserTestSuite extends TestSuite {
+public class AutomatedIntegrationSuite extends TestSuite {
// TODO: the following test are not being reused
//
diff --git a/lrparser/org.eclipse.cdt.core.lrparser/pom.xml b/lrparser/org.eclipse.cdt.core.lrparser/pom.xml
deleted file mode 100644
index df57201137..0000000000
--- a/lrparser/org.eclipse.cdt.core.lrparser/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>5.2.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.core.lrparser</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/lrparser/pom.xml b/lrparser/pom.xml
new file mode 100644
index 0000000000..1fa6dcd1ff
--- /dev/null
+++ b/lrparser/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.lrparser-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.core.lrparser</module>
+ <module>org.eclipse.cdt.core.lrparser.feature</module>
+ <module>org.eclipse.cdt.core.lrparser.sdk.feature</module>
+<!--
+ <module>org.eclipse.cdt.core.lrparser.tests</module>
+-->
+ </modules>
+</project>
diff --git a/memory/org.eclipse.cdt.debug.ui.memory-feature/pom.xml b/memory/org.eclipse.cdt.debug.ui.memory-feature/pom.xml
deleted file mode 100644
index 46b66ff3d5..0000000000
--- a/memory/org.eclipse.cdt.debug.ui.memory-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.debug.ui.memory</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/pom.xml b/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/pom.xml
deleted file mode 100644
index 7c0234219b..0000000000
--- a/memory/org.eclipse.cdt.debug.ui.memory.floatingpoint/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.cdt.debug.ui.memory.floatingpoint</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/pom.xml b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/pom.xml
deleted file mode 100644
index 67816367a7..0000000000
--- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.debug.ui.memory.memorybrowser</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.search/pom.xml b/memory/org.eclipse.cdt.debug.ui.memory.search/pom.xml
deleted file mode 100644
index 2d68092f3a..0000000000
--- a/memory/org.eclipse.cdt.debug.ui.memory.search/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.debug.ui.memory.search</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.traditional/pom.xml b/memory/org.eclipse.cdt.debug.ui.memory.traditional/pom.xml
deleted file mode 100644
index 7d9ff4916a..0000000000
--- a/memory/org.eclipse.cdt.debug.ui.memory.traditional/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.5.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.debug.ui.memory.traditional</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.transport/pom.xml b/memory/org.eclipse.cdt.debug.ui.memory.transport/pom.xml
deleted file mode 100644
index 95fb90656e..0000000000
--- a/memory/org.eclipse.cdt.debug.ui.memory.transport/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>2.1.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.debug.ui.memory.transport</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/memory/pom.xml b/memory/pom.xml
new file mode 100644
index 0000000000..14ce725e88
--- /dev/null
+++ b/memory/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.memory-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.debug.ui.memory.memorybrowser</module>
+ <module>org.eclipse.cdt.debug.ui.memory.floatingpoint</module>
+ <module>org.eclipse.cdt.debug.ui.memory.search</module>
+ <module>org.eclipse.cdt.debug.ui.memory.traditional</module>
+ <module>org.eclipse.cdt.debug.ui.memory.transport</module>
+ <module>org.eclipse.cdt.debug.ui.memory-feature</module>
+ </modules>
+</project>
diff --git a/native/org.eclipse.cdt.native.serial/pom.xml b/native/org.eclipse.cdt.native.serial/pom.xml
deleted file mode 100644
index abf0ea0a7a..0000000000
--- a/native/org.eclipse.cdt.native.serial/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.native.serial</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/native/pom.xml b/native/pom.xml
new file mode 100644
index 0000000000..a28abdc156
--- /dev/null
+++ b/native/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.native-parent</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <module>org.eclipse.cdt.native.serial</module>
+ </modules>
+</project>
diff --git a/pom.xml b/pom.xml
index 515ba60a21..07025b98cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<prerequisites>
- <maven>3.0.5</maven>
+ <maven>${required-maven-version}</maven>
</prerequisites>
<groupId>org.eclipse.cdt</groupId>
@@ -15,6 +15,7 @@
<name>CDT Parent</name>
<properties>
+ <required-maven-version>3.3</required-maven-version>
<tycho-version>1.0.0</tycho-version>
<tycho-extras-version>1.0.0</tycho-extras-version>
<cbi-plugins.version>1.1.3</cbi-plugins.version>
@@ -45,189 +46,32 @@
</licenses>
<modules>
- <module>core/org.eclipse.cdt.core.native</module>
- <module>core/org.eclipse.cdt.core.linux</module>
- <module>core/org.eclipse.cdt.core.linux.x86</module>
- <module>core/org.eclipse.cdt.core.linux.x86_64</module>
- <module>core/org.eclipse.cdt.core.linux.ppc64</module>
- <module>core/org.eclipse.cdt.core.linux.ppc64le</module>
- <module>core/org.eclipse.cdt.core.win32</module>
- <module>core/org.eclipse.cdt.core.win32.x86</module>
- <module>core/org.eclipse.cdt.core.win32.x86_64</module>
- <module>core/org.eclipse.cdt.core.macosx</module>
- <module>native/org.eclipse.cdt.native.serial</module>
- <module>releng/org.eclipse.cdt.native-feature</module>
+ <module>build</module>
+ <module>codan</module>
+ <module>core</module>
+ <module>cross</module>
+ <module>debug</module>
+ <module>dsf</module>
+ <module>dsf-gdb</module>
+ <module>jtag</module>
+ <module>launch</module>
+ <module>llvm</module>
+ <module>lrparser</module>
+ <module>memory</module>
+ <module>native</module>
+ <module>qt</module>
+ <module>releng</module>
+ <module>remote</module>
+ <module>testsrunner</module>
+ <module>toolchains/arduino</module>
+ <module>upc</module>
+ <module>util</module>
+ <module>visualizer</module>
+ <module>windows</module>
+ <module>xlc</module>
- <module>releng/org.eclipse.cdt</module>
- <module>core/org.eclipse.cdt.core</module>
- <module>codan/org.eclipse.cdt.codan.core</module>
- <module>codan/org.eclipse.cdt.codan.ui</module>
- <module>codan/org.eclipse.cdt.codan.core.cxx</module>
- <module>codan/org.eclipse.cdt.codan.ui.cxx</module>
- <module>codan/org.eclipse.cdt.codan.checkers</module>
- <module>codan/org.eclipse.cdt.codan.checkers.ui</module>
- <module>debug/org.eclipse.cdt.debug.core</module>
- <module>debug/org.eclipse.cdt.debug.ui</module>
- <module>build/org.eclipse.cdt.make.core</module>
- <module>build/org.eclipse.cdt.make.ui</module>
- <module>build/org.eclipse.cdt.managedbuilder.core</module>
- <module>build/org.eclipse.cdt.managedbuilder.ui</module>
- <module>core/org.eclipse.cdt.ui</module>
<module>doc/org.eclipse.cdt.doc.user</module>
- <module>dsf/org.eclipse.cdt.dsf</module>
- <module>dsf/org.eclipse.cdt.dsf.ui</module>
- <module>releng/org.eclipse.cdt.platform-feature</module>
-
- <module>build/org.eclipse.cdt.build.gcc.core</module>
- <module>build/org.eclipse.cdt.managedbuilder.gnu.ui</module>
- <module>build/org.eclipse.cdt.gnu.build-feature</module>
-
- <module>debug/org.eclipse.cdt.gdb</module>
- <module>debug/org.eclipse.cdt.gdb.ui</module>
- <module>debug/org.eclipse.cdt.gdb-feature</module>
-
- <module>launch/org.eclipse.cdt.launch</module>
- <module>debug/org.eclipse.cdt.gnu.debug-feature</module>
-
- <module>debug/org.eclipse.cdt.debug.application</module>
- <module>debug/org.eclipse.cdt.debug.application.doc</module>
- <module>debug/org.eclipse.cdt.debug.standalone-feature</module>
-<!--
- TODO: Investigate/Fix hanging before re-enable re-enabling
- <module>debug/org.eclipse.cdt.debug.application.tests</module>
--->
- <module>dsf-gdb/org.eclipse.cdt.dsf.gdb</module>
- <module>dsf-gdb/org.eclipse.cdt.dsf.gdb.ui</module>
- <module>dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui</module>
- <module>dsf-gdb/org.eclipse.cdt.gnu.dsf-feature</module>
- <module>dsf-gdb/org.eclipse.cdt.gnu.multicorevisualizer-feature</module>
-
- <module>releng/org.eclipse.cdt-feature</module>
-
<module>doc/org.eclipse.cdt.doc.isv</module>
- <module>releng/org.eclipse.cdt.sdk</module>
- <module>releng/org.eclipse.cdt.sdk-feature</module>
-
- <module>lrparser/org.eclipse.cdt.core.lrparser</module>
- <module>lrparser/org.eclipse.cdt.core.lrparser.feature</module>
- <module>lrparser/org.eclipse.cdt.core.lrparser.sdk.feature</module>
-
- <module>upc/org.eclipse.cdt.core.parser.upc</module>
- <module>upc/org.eclipse.cdt.core.parser.upc.feature</module>
- <module>upc/org.eclipse.cdt.core.parser.upc.sdk.feature</module>
-
- <module>upc/org.eclipse.cdt.managedbuilder.bupc.ui</module>
- <module>upc/org.eclipse.cdt.bupc-feature</module>
-
- <module>jtag/org.eclipse.cdt.debug.gdbjtag</module>
- <module>jtag/org.eclipse.cdt.debug.gdbjtag.core</module>
- <module>jtag/org.eclipse.cdt.debug.gdbjtag.ui</module>
- <module>jtag/org.eclipse.cdt.debug.gdbjtag-feature</module>
-
- <module>xlc/org.eclipse.cdt.core.lrparser.xlc</module>
- <module>xlc/org.eclipse.cdt.errorparsers.xlc</module>
- <module>xlc/org.eclipse.cdt.make.xlc.core</module>
- <module>xlc/org.eclipse.cdt.managedbuilder.xlc.core</module>
- <module>xlc/org.eclipse.cdt.managedbuilder.xlc.ui</module>
- <module>xlc/org.eclipse.cdt.managedbuilder.xlupc.ui</module>
- <module>xlc/org.eclipse.cdt.xlc.feature</module>
- <module>xlc/org.eclipse.cdt.xlc.sdk-feature</module>
-
- <module>util/org.eclipse.cdt.util</module>
- <module>util/org.eclipse.cdt.util-feature</module>
-
- <module>memory/org.eclipse.cdt.debug.ui.memory.memorybrowser</module>
- <module>memory/org.eclipse.cdt.debug.ui.memory.floatingpoint</module>
- <module>memory/org.eclipse.cdt.debug.ui.memory.search</module>
- <module>memory/org.eclipse.cdt.debug.ui.memory.traditional</module>
- <module>memory/org.eclipse.cdt.debug.ui.memory.transport</module>
- <module>memory/org.eclipse.cdt.debug.ui.memory-feature</module>
-
- <module>cross/org.eclipse.cdt.build.crossgcc</module>
- <module>cross/org.eclipse.cdt.build.crossgcc-feature</module>
- <module>cross/org.eclipse.cdt.launch.remote</module>
- <module>cross/org.eclipse.cdt.launch.remote-feature</module>
-
- <module>windows/org.eclipse.cdt.msw.build</module>
- <module>windows/org.eclipse.cdt.msw-feature</module>
-
- <module>dsf/org.eclipse.cdt.examples.dsf</module>
- <module>dsf/org.eclipse.cdt.examples.dsf.pda</module>
- <module>dsf/org.eclipse.cdt.examples.dsf.pda.ui</module>
- <module>dsf/org.eclipse.cdt.examples.dsf-feature</module>
-
- <module>visualizer/org.eclipse.cdt.visualizer.core</module>
- <module>visualizer/org.eclipse.cdt.visualizer.examples</module>
- <module>visualizer/org.eclipse.cdt.visualizer.ui</module>
- <module>visualizer/org.eclipse.cdt.visualizer-feature</module>
-
- <module>core/org.eclipse.cdt.core.tests</module>
- <module>core/org.eclipse.cdt.ui.tests</module>
- <module>codan/org.eclipse.cdt.codan.core.test</module>
- <module>codan/org.eclipse.cdt.codan.checkers.ui.test</module>
- <module>build/org.eclipse.cdt.managedbuilder.core.tests</module>
- <module>build/org.eclipse.cdt.managedbuilder.ui.tests</module>
- <module>build/org.eclipse.cdt.make.core.tests</module>
- <module>build/org.eclipse.cdt.make.ui.tests</module>
- <module>dsf-gdb/org.eclipse.cdt.dsf.gdb.tests</module>
- <module>dsf-gdb/org.eclipse.cdt.tests.dsf.gdb</module>
- <module>dsf-gdb/org.eclipse.cdt.examples.dsf.gdb</module>
- <module>dsf-gdb/org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests</module>
-
- <module>build/org.eclipse.cdt.autotools.core</module>
- <module>build/org.eclipse.cdt.autotools.docs</module>
- <module>build/org.eclipse.cdt.autotools.tests</module>
- <module>build/org.eclipse.cdt.autotools.ui</module>
- <module>build/org.eclipse.cdt.autotools.ui.tests</module>
- <module>build/org.eclipse.cdt.autotools-feature</module>
-
- <module>launch/org.eclipse.cdt.docker.launcher</module>
- <module>launch/org.eclipse.cdt.docker.launcher-feature</module>
-
- <module>testsrunner/org.eclipse.cdt.testsrunner</module>
- <module>testsrunner/org.eclipse.cdt.testsrunner.boost</module>
- <module>testsrunner/org.eclipse.cdt.testsrunner.gtest</module>
- <module>testsrunner/org.eclipse.cdt.testsrunner.qttest</module>
- <module>testsrunner/org.eclipse.cdt.testsrunner.tap</module>
- <module>testsrunner/org.eclipse.cdt.testsrunner.test</module>
- <module>testsrunner/org.eclipse.cdt.testsrunner.feature</module>
-
- <module>llvm/org.eclipse.cdt.managedbuilder.llvm.ui</module>
- <module>llvm/org.eclipse.cdt.managedbuilder.llvm-feature</module>
- <module>llvm/org.eclipse.cdt.llvm.dsf.lldb.core</module>
- <module>llvm/org.eclipse.cdt.llvm.dsf.lldb.ui</module>
- <module>llvm/org.eclipse.cdt.llvm.dsf.lldb-feature</module>
-
- <module>qt/org.eclipse.cdt.qt.core</module>
- <module>qt/org.eclipse.cdt.qt.ui</module>
- <!--module>qt/org.eclipse.cdt.qt.core.tests</module-->
- <module>qt/org.eclipse.cdt.qt.ui.tests</module>
- <module>qt/org.eclipse.cdt.qt-feature</module>
-
- <module>build/org.eclipse.cdt.cmake.core</module>
- <module>build/org.eclipse.cdt.cmake.ui</module>
- <module>build/org.eclipse.cdt.cmake-feature</module>
-
- <module>xlc/org.eclipse.cdt.errorparsers.xlc.tests</module>
-
- <module>remote/org.eclipse.cdt.remote.core</module>
- <module>remote/org.eclipse.cdt.remote-feature</module>
-
- <module>toolchains/arduino/org.eclipse.cdt.arduino.core</module>
- <module>toolchains/arduino/org.eclipse.cdt.arduino.ui</module>
- <module>toolchains/arduino/org.eclipse.cdt.arduino-feature</module>
-
-<!--
- <module>lrparser/org.eclipse.cdt.core.lrparser.tests</module>
- <module>upc/org.eclipse.cdt.core.parser.upc.tests</module>
- <module>xlc/org.eclipse.cdt.core.lrparser.xlc.tests</module>
--->
- <module>releng/org.eclipse.cdt.target</module>
- <module>releng/org.eclipse.cdt.testing</module>
- <module>releng/org.eclipse.cdt.testing-feature</module>
- <module>releng/org.eclipse.cdt.testing.repo</module>
-
- <module>releng/org.eclipse.cdt.repo</module>
</modules>
<pluginRepositories>
@@ -248,12 +92,6 @@
</repositories>
</profile>
<profile>
- <id>build-standalone-debugger-rcp</id>
- <modules>
- <module>debug/org.eclipse.cdt.debug.application.product</module>
- </modules>
- </profile>
- <profile>
<id>macosx</id>
<activation>
<os>
@@ -275,6 +113,74 @@
<base.ui.test.vmargs>${base.test.vmargs}</base.ui.test.vmargs>
</properties>
</profile>
+ <!-- Automatic profile for features that shouldn't generate sources -->
+ <profile>
+ <id>feature-no-source</id>
+ <activation>
+ <file>
+ <exists>feature-no-source.properties</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tycho-extras-version}</version>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <!-- Automatic profile to define the settings for UI test plugins -->
+ <profile>
+ <id>ui-test-plugin</id>
+ <activation>
+ <file>
+ <exists>ui-test-plugin.properties</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <useUIHarness>true</useUIHarness>
+ <useUIThread>true</useUIThread>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <!-- Automatic profile to define the settings for SWTBot test plugins -->
+ <profile>
+ <id>swtbot-test-plugin</id>
+ <activation>
+ <file>
+ <exists>swtbot-test-plugin.properties</exists>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <useUIHarness>true</useUIHarness>
+ <useUIThread>false</useUIThread>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>production</id>
<build>
@@ -541,6 +447,28 @@
</dependencies>
</plugin>
<plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <!-- Default configuration, UI tests may have to override these -->
+ <useUIHarness>false</useUIHarness>
+ <useUIThread>false</useUIThread>
+ <includes>
+ <include>**/AutomatedIntegrationSuite.*</include>
+ </includes>
+ <testFailureIgnore>true</testFailureIgnore>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.platform.feature.group</artifactId>
+ </dependency>
+ </dependencies>
+ <product>org.eclipse.platform.ide</product>
+ <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
@@ -627,6 +555,31 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4.1</version>
+ <executions>
+ <execution>
+ <id>enforce-maven-version</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>${required-maven-version}</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>1.8</version>
+ </requireJavaVersion>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/qt/org.eclipse.cdt.qt-feature/pom.xml b/qt/org.eclipse.cdt.qt-feature/pom.xml
deleted file mode 100644
index 6732692342..0000000000
--- a/qt/org.eclipse.cdt.qt-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.qt</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/qt/org.eclipse.cdt.qt.core.tests/pom.xml b/qt/org.eclipse.cdt.qt.core.tests/pom.xml
deleted file mode 100644
index c506e0ab5b..0000000000
--- a/qt/org.eclipse.cdt.qt.core.tests/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>2.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.qt.core.tests</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <!-- 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>-->
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>false</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.platform</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.cdt</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.cdt.qt</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/qt/org.eclipse.cdt.qt.core/pom.xml b/qt/org.eclipse.cdt.qt.core/pom.xml
deleted file mode 100644
index a47ae160b2..0000000000
--- a/qt/org.eclipse.cdt.qt.core/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>2.2.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.qt.core</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project> \ No newline at end of file
diff --git a/qt/org.eclipse.cdt.qt.ui.tests/pom.xml b/qt/org.eclipse.cdt.qt.ui.tests/pom.xml
deleted file mode 100644
index a131628d25..0000000000
--- a/qt/org.eclipse.cdt.qt.ui.tests/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>2.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.qt.ui.tests</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <!-- 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>-->
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
- <includes>
- <include>**/AllQtTests.*</include>
- </includes>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.platform</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.cdt</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.cdt.qt</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/AllQtTests.java b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/AutomatedIntegrationSuite.java
index e73a532857..128c243c11 100644
--- a/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/AllQtTests.java
+++ b/qt/org.eclipse.cdt.qt.ui.tests/src/org/eclipse/cdt/qt/tests/AutomatedIntegrationSuite.java
@@ -13,7 +13,7 @@ import org.eclipse.cdt.qt.pro.parser.tests.QtProjectFileParserTest;
import junit.framework.Test;
import junit.framework.TestSuite;
-public class AllQtTests extends TestSuite {
+public class AutomatedIntegrationSuite extends TestSuite {
public static Test suite() throws Exception {
return
diff --git a/qt/org.eclipse.cdt.qt.ui.tests/ui-test-plugin.properties b/qt/org.eclipse.cdt.qt.ui.tests/ui-test-plugin.properties
new file mode 100644
index 0000000000..a209073d59
--- /dev/null
+++ b/qt/org.eclipse.cdt.qt.ui.tests/ui-test-plugin.properties
@@ -0,0 +1 @@
+# This file tells the Maven build to use the settings for UI test plugins
diff --git a/qt/org.eclipse.cdt.qt.ui/pom.xml b/qt/org.eclipse.cdt.qt.ui/pom.xml
deleted file mode 100644
index f7b5f27dfa..0000000000
--- a/qt/org.eclipse.cdt.qt.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>2.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.qt.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/qt/pom.xml b/qt/pom.xml
new file mode 100644
index 0000000000..8ae1417f76
--- /dev/null
+++ b/qt/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.qt-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.qt.core</module>
+ <module>org.eclipse.cdt.qt.ui</module>
+ <!--module>org.eclipse.cdt.qt.core.tests</module-->
+ <module>org.eclipse.cdt.qt.ui.tests</module>
+ <module>org.eclipse.cdt.qt-feature</module>
+ </modules>
+</project>
diff --git a/releng/org.eclipse.cdt.native-feature/pom.xml b/releng/org.eclipse.cdt.native-feature/pom.xml
deleted file mode 100644
index a72ce93d52..0000000000
--- a/releng/org.eclipse.cdt.native-feature/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <artifactId>org.eclipse.cdt.native</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/releng/org.eclipse.cdt.platform-feature/pom.xml b/releng/org.eclipse.cdt.platform-feature/pom.xml
deleted file mode 100644
index 7c563e8bf0..0000000000
--- a/releng/org.eclipse.cdt.platform-feature/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <artifactId>org.eclipse.cdt.platform</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/releng/org.eclipse.cdt.sdk-feature/feature-no-source.properties b/releng/org.eclipse.cdt.sdk-feature/feature-no-source.properties
new file mode 100644
index 0000000000..8c2b2f70c5
--- /dev/null
+++ b/releng/org.eclipse.cdt.sdk-feature/feature-no-source.properties
@@ -0,0 +1 @@
+# This file tells the Maven build to not generate sources for this feature
diff --git a/releng/org.eclipse.cdt.sdk-feature/pom.xml b/releng/org.eclipse.cdt.sdk-feature/pom.xml
index 6af22411aa..172b340bc8 100644
--- a/releng/org.eclipse.cdt.sdk-feature/pom.xml
+++ b/releng/org.eclipse.cdt.sdk-feature/pom.xml
@@ -14,20 +14,4 @@
<groupId>org.eclipse.cdt.features</groupId>
<artifactId>org.eclipse.cdt.sdk</artifactId>
<packaging>eclipse-feature</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <version>${tycho-extras-version}</version>
- <executions>
- <execution>
- <id>source-feature</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/releng/org.eclipse.cdt.sdk/pom.xml b/releng/org.eclipse.cdt.sdk/pom.xml
deleted file mode 100644
index 8e836c19b2..0000000000
--- a/releng/org.eclipse.cdt.sdk/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.sdk</artifactId>
- <packaging>eclipse-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-source-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>plugin-source</id>
- <phase>none</phase>
- </execution>
- <execution>
- <id>attach-source</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/releng/org.eclipse.cdt.testing-feature/feature.xml b/releng/org.eclipse.cdt.testing-feature/feature.xml
index c51c4fbbb9..d09a1bd61e 100644
--- a/releng/org.eclipse.cdt.testing-feature/feature.xml
+++ b/releng/org.eclipse.cdt.testing-feature/feature.xml
@@ -63,7 +63,7 @@
version="0.0.0"/>
<plugin
- id="org.eclipse.cdt.codan.core.test"
+ id="org.eclipse.cdt.codan.core.tests"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/releng/org.eclipse.cdt.testing-feature/pom.xml b/releng/org.eclipse.cdt.testing-feature/pom.xml
deleted file mode 100644
index a575016236..0000000000
--- a/releng/org.eclipse.cdt.testing-feature/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <artifactId>org.eclipse.cdt.testing</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/releng/pom.xml b/releng/pom.xml
new file mode 100644
index 0000000000..4dc5b75886
--- /dev/null
+++ b/releng/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.releng-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.native-feature</module>
+ <module>org.eclipse.cdt</module>
+ <module>org.eclipse.cdt.platform-feature</module>
+ <module>org.eclipse.cdt-feature</module>
+ <module>org.eclipse.cdt.sdk</module>
+ <module>org.eclipse.cdt.sdk-feature</module>
+ <module>org.eclipse.cdt.target</module>
+ <module>org.eclipse.cdt.testing</module>
+ <module>org.eclipse.cdt.testing-feature</module>
+ <module>org.eclipse.cdt.testing.repo</module>
+ <module>org.eclipse.cdt.repo</module>
+ </modules>
+</project>
diff --git a/remote/org.eclipse.cdt.remote-feature/pom.xml b/remote/org.eclipse.cdt.remote-feature/pom.xml
deleted file mode 100644
index 80fb6bf92e..0000000000
--- a/remote/org.eclipse.cdt.remote-feature/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.remote</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/remote/org.eclipse.cdt.remote.core/pom.xml b/remote/org.eclipse.cdt.remote.core/pom.xml
deleted file mode 100644
index 61bad003c3..0000000000
--- a/remote/org.eclipse.cdt.remote.core/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.remote.core</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/remote/pom.xml b/remote/pom.xml
new file mode 100644
index 0000000000..68574a4fb4
--- /dev/null
+++ b/remote/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.remote-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.remote.core</module>
+ <module>org.eclipse.cdt.remote-feature</module>
+ </modules>
+</project>
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.boost/META-INF/MANIFEST.MF b/testsrunner/org.eclipse.cdt.testsrunner.boost/META-INF/MANIFEST.MF
index f551573308..7e693552fa 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.boost/META-INF/MANIFEST.MF
+++ b/testsrunner/org.eclipse.cdt.testsrunner.boost/META-INF/MANIFEST.MF
@@ -10,4 +10,4 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
org.eclipse.cdt.testsrunner;bundle-version="3.5.0"
-Export-Package: org.eclipse.cdt.testsrunner.internal.boost;x-friends:="org.eclipse.cdt.testsrunner.test"
+Export-Package: org.eclipse.cdt.testsrunner.internal.boost;x-friends:="org.eclipse.cdt.testsrunner.tests"
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.boost/pom.xml b/testsrunner/org.eclipse.cdt.testsrunner.boost/pom.xml
deleted file mode 100644
index 2c4032e506..0000000000
--- a/testsrunner/org.eclipse.cdt.testsrunner.boost/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>7.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.testsrunner.boost</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.feature/pom.xml b/testsrunner/org.eclipse.cdt.testsrunner.feature/pom.xml
deleted file mode 100644
index 8db818b432..0000000000
--- a/testsrunner/org.eclipse.cdt.testsrunner.feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.testsrunner.feature</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.gtest/META-INF/MANIFEST.MF b/testsrunner/org.eclipse.cdt.testsrunner.gtest/META-INF/MANIFEST.MF
index e5ed08354c..ac2960eaf7 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.gtest/META-INF/MANIFEST.MF
+++ b/testsrunner/org.eclipse.cdt.testsrunner.gtest/META-INF/MANIFEST.MF
@@ -10,4 +10,4 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
org.eclipse.cdt.testsrunner;bundle-version="3.5.0"
-Export-Package: org.eclipse.cdt.testsrunner.internal.gtest;x-friends:="org.eclipse.cdt.testsrunner.test"
+Export-Package: org.eclipse.cdt.testsrunner.internal.gtest;x-friends:="org.eclipse.cdt.testsrunner.tests"
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.gtest/pom.xml b/testsrunner/org.eclipse.cdt.testsrunner.gtest/pom.xml
deleted file mode 100644
index 61c9daefa1..0000000000
--- a/testsrunner/org.eclipse.cdt.testsrunner.gtest/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>7.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.testsrunner.gtest</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.qttest/META-INF/MANIFEST.MF b/testsrunner/org.eclipse.cdt.testsrunner.qttest/META-INF/MANIFEST.MF
index d46db5cdfe..b6b5761b9e 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.qttest/META-INF/MANIFEST.MF
+++ b/testsrunner/org.eclipse.cdt.testsrunner.qttest/META-INF/MANIFEST.MF
@@ -10,4 +10,4 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
org.eclipse.cdt.testsrunner;bundle-version="3.5.0"
-Export-Package: org.eclipse.cdt.testsrunner.internal.qttest;x-friends:="org.eclipse.cdt.testsrunner.test"
+Export-Package: org.eclipse.cdt.testsrunner.internal.qttest;x-friends:="org.eclipse.cdt.testsrunner.tests"
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.qttest/pom.xml b/testsrunner/org.eclipse.cdt.testsrunner.qttest/pom.xml
deleted file mode 100644
index 78e874ac0f..0000000000
--- a/testsrunner/org.eclipse.cdt.testsrunner.qttest/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>7.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.testsrunner.qttest</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.tap/META-INF/MANIFEST.MF b/testsrunner/org.eclipse.cdt.testsrunner.tap/META-INF/MANIFEST.MF
index 506b5d8d77..3b7a625955 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.tap/META-INF/MANIFEST.MF
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tap/META-INF/MANIFEST.MF
@@ -10,4 +10,4 @@ Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
org.eclipse.cdt.testsrunner;bundle-version="3.5.0"
-Export-Package: org.eclipse.cdt.testsrunner.internal.tap;x-friends:="org.eclipse.cdt.testsrunner.test"
+Export-Package: org.eclipse.cdt.testsrunner.internal.tap;x-friends:="org.eclipse.cdt.testsrunner.tests"
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.tap/pom.xml b/testsrunner/org.eclipse.cdt.testsrunner.tap/pom.xml
deleted file mode 100644
index e192cf1eea..0000000000
--- a/testsrunner/org.eclipse.cdt.testsrunner.tap/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.testsrunner.tap</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/pom.xml b/testsrunner/org.eclipse.cdt.testsrunner.test/pom.xml
deleted file mode 100644
index 6d04a04039..0000000000
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.testsrunner.test</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <!-- 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>-->
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>true</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
- <includes>
- <include>**/TestsRunnerSuite.*</include>
- </includes>
- <testFailureIgnore>true</testFailureIgnore>
- <dependencies>
- <dependency>
- <artifactId>org.eclipse.platform.feature.group</artifactId>
- <type>p2-installable-unit</type>
- </dependency>
- </dependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/.classpath b/testsrunner/org.eclipse.cdt.testsrunner.tests/.classpath
index eca7bdba8f..eca7bdba8f 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/.classpath
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/.classpath
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/.project b/testsrunner/org.eclipse.cdt.testsrunner.tests/.project
index fcfb09a776..673ccfee5c 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/.project
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.cdt.testsrunner.test</name>
+ <name>org.eclipse.cdt.testsrunner.tests</name>
<comment></comment>
<projects>
</projects>
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/.settings/org.eclipse.jdt.core.prefs b/testsrunner/org.eclipse.cdt.testsrunner.tests/.settings/org.eclipse.jdt.core.prefs
index f3b1585f72..f3b1585f72 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/.settings/org.eclipse.jdt.core.prefs
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/META-INF/MANIFEST.MF b/testsrunner/org.eclipse.cdt.testsrunner.tests/META-INF/MANIFEST.MF
index b739cbe6a3..9c0dae8d46 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/META-INF/MANIFEST.MF
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.cdt.testsrunner.test
+Bundle-SymbolicName: org.eclipse.cdt.testsrunner.tests
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.cdt.testsrunner.test.TestsRunnerTestActivator
Require-Bundle: org.junit,
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/OSGI-INF/l10n/bundle.properties b/testsrunner/org.eclipse.cdt.testsrunner.tests/OSGI-INF/l10n/bundle.properties
index c93c6763da..c93c6763da 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/OSGI-INF/l10n/bundle.properties
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/OSGI-INF/l10n/bundle.properties
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/about.html b/testsrunner/org.eclipse.cdt.testsrunner.tests/about.html
index d7c511887d..d7c511887d 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/about.html
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/about.html
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/build.properties b/testsrunner/org.eclipse.cdt.testsrunner.tests/build.properties
index 1a640cdd7e..1a640cdd7e 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/build.properties
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/build.properties
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/core/TestModelManagerBaseReorderingTestCase.java b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/core/TestModelManagerBaseReorderingTestCase.java
index 092944ffe1..092944ffe1 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/core/TestModelManagerBaseReorderingTestCase.java
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/core/TestModelManagerBaseReorderingTestCase.java
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/core/TestModelManagerCasesReorderingTestCase.java b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/core/TestModelManagerCasesReorderingTestCase.java
index a6ff4b37d9..a6ff4b37d9 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/core/TestModelManagerCasesReorderingTestCase.java
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/core/TestModelManagerCasesReorderingTestCase.java
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/core/TestModelManagerSuitesReorderingTestCase.java b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/core/TestModelManagerSuitesReorderingTestCase.java
index 5c08b66681..5c08b66681 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/core/TestModelManagerSuitesReorderingTestCase.java
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/core/TestModelManagerSuitesReorderingTestCase.java
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/test/TestsRunnerSuite.java b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/test/AutomatedIntegrationSuite.java
index ddbd2650aa..8963c78815 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/test/TestsRunnerSuite.java
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/test/AutomatedIntegrationSuite.java
@@ -24,25 +24,25 @@ import org.eclipse.cdt.testsrunner.testsrunners.QtTestCase;
/**
* Test suite with all the tests on Tests Runner.
*/
-public class TestsRunnerSuite extends TestSuite {
+public class AutomatedIntegrationSuite extends TestSuite {
- public TestsRunnerSuite() {
+ public AutomatedIntegrationSuite() {
}
- public TestsRunnerSuite(Class<? extends TestCase> theClass, String name) {
+ public AutomatedIntegrationSuite(Class<? extends TestCase> theClass, String name) {
super(theClass, name);
}
- public TestsRunnerSuite(Class<? extends TestCase> theClass) {
+ public AutomatedIntegrationSuite(Class<? extends TestCase> theClass) {
super(theClass);
}
- public TestsRunnerSuite(String name) {
+ public AutomatedIntegrationSuite(String name) {
super(name);
}
public static Test suite() {
- final TestsRunnerSuite suite = new TestsRunnerSuite();
+ final AutomatedIntegrationSuite suite = new AutomatedIntegrationSuite();
// Core
suite.addTestSuite(TestModelManagerSuitesReorderingTestCase.class);
suite.addTestSuite(TestModelManagerCasesReorderingTestCase.class);
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/test/TestsRunnerTestActivator.java b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/test/TestsRunnerTestActivator.java
index 16f3a8248b..16f3a8248b 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/test/TestsRunnerTestActivator.java
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/test/TestsRunnerTestActivator.java
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/BaseTestCase.java b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/BaseTestCase.java
index de8d68bcd3..de8d68bcd3 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/BaseTestCase.java
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/BaseTestCase.java
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/BoostTestCase.java b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/BoostTestCase.java
index 679840b0a8..679840b0a8 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/BoostTestCase.java
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/BoostTestCase.java
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/GoogleTestCase.java b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/GoogleTestCase.java
index 72c8184b0f..72c8184b0f 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/GoogleTestCase.java
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/GoogleTestCase.java
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/MockTestModelUpdater.java b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/MockTestModelUpdater.java
index 1f79ace71d..1f79ace71d 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/MockTestModelUpdater.java
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/MockTestModelUpdater.java
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/QtTestCase.java b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/QtTestCase.java
index 6891513548..6891513548 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/QtTestCase.java
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/QtTestCase.java
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/TAPTestCase.java b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/TAPTestCase.java
index d977b37800..d977b37800 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/src/org/eclipse/cdt/testsrunner/testsrunners/TAPTestCase.java
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/src/org/eclipse/cdt/testsrunner/testsrunners/TAPTestCase.java
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/test.xml b/testsrunner/org.eclipse.cdt.testsrunner.tests/test.xml
index eed63892c1..eed63892c1 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/test.xml
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/test.xml
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.tests/ui-test-plugin.properties b/testsrunner/org.eclipse.cdt.testsrunner.tests/ui-test-plugin.properties
new file mode 100644
index 0000000000..a209073d59
--- /dev/null
+++ b/testsrunner/org.eclipse.cdt.testsrunner.tests/ui-test-plugin.properties
@@ -0,0 +1 @@
+# This file tells the Maven build to use the settings for UI test plugins
diff --git a/testsrunner/org.eclipse.cdt.testsrunner/pom.xml b/testsrunner/org.eclipse.cdt.testsrunner/pom.xml
deleted file mode 100644
index 30740b7265..0000000000
--- a/testsrunner/org.eclipse.cdt.testsrunner/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>8.1.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.testsrunner</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/testsrunner/pom.xml b/testsrunner/pom.xml
new file mode 100644
index 0000000000..63d910b386
--- /dev/null
+++ b/testsrunner/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.testsrunner-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.testsrunner</module>
+ <module>org.eclipse.cdt.testsrunner.boost</module>
+ <module>org.eclipse.cdt.testsrunner.gtest</module>
+ <module>org.eclipse.cdt.testsrunner.qttest</module>
+ <module>org.eclipse.cdt.testsrunner.tap</module>
+ <module>org.eclipse.cdt.testsrunner.tests</module>
+ <module>org.eclipse.cdt.testsrunner.feature</module>
+ </modules>
+</project>
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino-feature/pom.xml b/toolchains/arduino/org.eclipse.cdt.arduino-feature/pom.xml
deleted file mode 100644
index 1afe363579..0000000000
--- a/toolchains/arduino/org.eclipse.cdt.arduino-feature/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.cdt.arduino</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.core/pom.xml b/toolchains/arduino/org.eclipse.cdt.arduino.core/pom.xml
deleted file mode 100644
index 83b1669ed8..0000000000
--- a/toolchains/arduino/org.eclipse.cdt.arduino.core/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.cdt.arduino.core</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.ui/pom.xml b/toolchains/arduino/org.eclipse.cdt.arduino.ui/pom.xml
deleted file mode 100644
index ccd7ccae35..0000000000
--- a/toolchains/arduino/org.eclipse.cdt.arduino.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.cdt.arduino.ui</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/toolchains/arduino/pom.xml b/toolchains/arduino/pom.xml
new file mode 100644
index 0000000000..de80ec7167
--- /dev/null
+++ b/toolchains/arduino/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.arduino-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.arduino.core</module>
+ <module>org.eclipse.cdt.arduino.ui</module>
+ <module>org.eclipse.cdt.arduino-feature</module>
+ </modules>
+</project>
diff --git a/upc/org.eclipse.cdt.bupc-feature/pom.xml b/upc/org.eclipse.cdt.bupc-feature/pom.xml
deleted file mode 100644
index 41bc809036..0000000000
--- a/upc/org.eclipse.cdt.bupc-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.bupc</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/upc/org.eclipse.cdt.core.parser.upc.feature/pom.xml b/upc/org.eclipse.cdt.core.parser.upc.feature/pom.xml
deleted file mode 100644
index 8d4992d5ee..0000000000
--- a/upc/org.eclipse.cdt.core.parser.upc.feature/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.core.parser.upc.feature</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature-no-source.properties b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature-no-source.properties
new file mode 100644
index 0000000000..8c2b2f70c5
--- /dev/null
+++ b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature-no-source.properties
@@ -0,0 +1 @@
+# This file tells the Maven build to not generate sources for this feature
diff --git a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/pom.xml b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/pom.xml
deleted file mode 100644
index 930edcf669..0000000000
--- a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.core.parser.upc.sdk</artifactId>
- <packaging>eclipse-feature</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <version>${tycho-extras-version}</version>
- <executions>
- <execution>
- <id>source-feature</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/pom.xml b/upc/org.eclipse.cdt.core.parser.upc.tests/pom.xml
deleted file mode 100644
index 2110e37e61..0000000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>5.1.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.core.parser.upc.tests</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>false</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
- <includes>
- <include>**/UPCParserTestSuite.*</include>
- </includes>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/AutomatedIntegrationSuite.java
index f8959bf35a..f5966cffd2 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/AutomatedIntegrationSuite.java
@@ -13,7 +13,7 @@ package org.eclipse.cdt.core.parser.upc.tests;
import junit.framework.Test;
import junit.framework.TestSuite;
-public class UPCParserTestSuite extends TestSuite {
+public class AutomatedIntegrationSuite extends TestSuite {
public static Test suite() {
return new TestSuite() {{
diff --git a/upc/org.eclipse.cdt.core.parser.upc/pom.xml b/upc/org.eclipse.cdt.core.parser.upc/pom.xml
deleted file mode 100644
index 6737135b16..0000000000
--- a/upc/org.eclipse.cdt.core.parser.upc/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>5.1.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.core.parser.upc</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/pom.xml b/upc/org.eclipse.cdt.managedbuilder.bupc.ui/pom.xml
deleted file mode 100644
index ac08e2e968..0000000000
--- a/upc/org.eclipse.cdt.managedbuilder.bupc.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.3-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.managedbuilder.bupc.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/upc/pom.xml b/upc/pom.xml
new file mode 100644
index 0000000000..92d0b5dfcc
--- /dev/null
+++ b/upc/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.upc-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.core.parser.upc</module>
+ <module>org.eclipse.cdt.core.parser.upc.feature</module>
+ <module>org.eclipse.cdt.core.parser.upc.sdk.feature</module>
+
+ <module>org.eclipse.cdt.managedbuilder.bupc.ui</module>
+ <module>org.eclipse.cdt.bupc-feature</module>
+<!--
+ <module>org.eclipse.cdt.core.parser.upc.tests</module>
+-->
+ </modules>
+</project>
diff --git a/util/org.eclipse.cdt.util-feature/pom.xml b/util/org.eclipse.cdt.util-feature/pom.xml
deleted file mode 100644
index b9757b81e6..0000000000
--- a/util/org.eclipse.cdt.util-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.util</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/util/org.eclipse.cdt.util/pom.xml b/util/org.eclipse.cdt.util/pom.xml
deleted file mode 100644
index 6f2263571f..0000000000
--- a/util/org.eclipse.cdt.util/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>5.0.100-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.util</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/util/pom.xml b/util/pom.xml
new file mode 100644
index 0000000000..255967f098
--- /dev/null
+++ b/util/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.util-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.util</module>
+ <module>org.eclipse.cdt.util-feature</module>
+ </modules>
+</project>
diff --git a/visualizer/org.eclipse.cdt.visualizer-feature/pom.xml b/visualizer/org.eclipse.cdt.visualizer-feature/pom.xml
deleted file mode 100644
index 5a24f20f59..0000000000
--- a/visualizer/org.eclipse.cdt.visualizer-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.visualizer</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/visualizer/org.eclipse.cdt.visualizer.core/pom.xml b/visualizer/org.eclipse.cdt.visualizer.core/pom.xml
deleted file mode 100644
index 1a9a954320..0000000000
--- a/visualizer/org.eclipse.cdt.visualizer.core/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.visualizer.core</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/visualizer/org.eclipse.cdt.visualizer.examples/pom.xml b/visualizer/org.eclipse.cdt.visualizer.examples/pom.xml
deleted file mode 100644
index e82b459f73..0000000000
--- a/visualizer/org.eclipse.cdt.visualizer.examples/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.visualizer.examples</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/visualizer/org.eclipse.cdt.visualizer.ui/pom.xml b/visualizer/org.eclipse.cdt.visualizer.ui/pom.xml
deleted file mode 100644
index cad8fff256..0000000000
--- a/visualizer/org.eclipse.cdt.visualizer.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.visualizer.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/visualizer/pom.xml b/visualizer/pom.xml
new file mode 100644
index 0000000000..7d6d59f0e5
--- /dev/null
+++ b/visualizer/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.visualizer-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.visualizer.core</module>
+ <module>org.eclipse.cdt.visualizer.examples</module>
+ <module>org.eclipse.cdt.visualizer.ui</module>
+ <module>org.eclipse.cdt.visualizer-feature</module>
+ </modules>
+</project>
diff --git a/windows/org.eclipse.cdt.msw-feature/pom.xml b/windows/org.eclipse.cdt.msw-feature/pom.xml
deleted file mode 100644
index 8d7a7cb6e5..0000000000
--- a/windows/org.eclipse.cdt.msw-feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.msw</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/windows/org.eclipse.cdt.msw.build/pom.xml b/windows/org.eclipse.cdt.msw.build/pom.xml
deleted file mode 100644
index e5f72eaee9..0000000000
--- a/windows/org.eclipse.cdt.msw.build/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.msw.build</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/windows/pom.xml b/windows/pom.xml
new file mode 100644
index 0000000000..d85bab51c4
--- /dev/null
+++ b/windows/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.windows-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.msw.build</module>
+ <module>org.eclipse.cdt.msw-feature</module>
+ </modules>
+</project>
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml
deleted file mode 100644
index ddcdfd24b1..0000000000
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.0.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.core.lrparser.xlc.tests</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>false</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
- <includes>
- <include>**/XlcTestSuite.*</include>
- </includes>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/XlcTestSuite.java b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/AutomatedIntegrationSuite.java
index 5c03a49515..7053ab9ad3 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/XlcTestSuite.java
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/src/org/eclipse/cdt/core/parser/xlc/tests/suite/AutomatedIntegrationSuite.java
@@ -17,7 +17,7 @@ import junit.framework.TestSuite;
import org.eclipse.cdt.core.parser.xlc.tests.XlcExtensionsTestSuite;
import org.eclipse.cdt.core.parser.xlc.tests.base.XlcLRParserTestSuite;
-public class XlcTestSuite extends TestSuite {
+public class AutomatedIntegrationSuite extends TestSuite {
public static Test suite() {
return new TestSuite() {{
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc/pom.xml b/xlc/org.eclipse.cdt.core.lrparser.xlc/pom.xml
deleted file mode 100644
index c27daea26e..0000000000
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>5.1.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.core.lrparser.xlc</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml
deleted file mode 100644
index 53c351cc0f..0000000000
--- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>5.0.100-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.errorparsers.xlc.tests</artifactId>
- <packaging>eclipse-test-plugin</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <useUIHarness>false</useUIHarness>
- <argLine>${tycho.testArgLine} ${base.test.vmargs}</argLine>
- <includes>
- <include>**/AllXlcErrorParserTests.*</include>
- </includes>
- <testFailureIgnore>true</testFailureIgnore>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/AllXlcErrorParserTests.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/AutomatedIntegrationSuite.java
index 819b663f28..bbc9c75687 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/AllXlcErrorParserTests.java
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/AutomatedIntegrationSuite.java
@@ -13,9 +13,9 @@ package org.eclipse.cdt.errorparsers.xlc.tests;
import junit.framework.Test;
import junit.framework.TestSuite;
-public class AllXlcErrorParserTests {
+public class AutomatedIntegrationSuite {
public static void main(String[] args) {
- junit.textui.TestRunner.run(AllXlcErrorParserTests.suite());
+ junit.textui.TestRunner.run(AutomatedIntegrationSuite.suite());
}
public static Test suite() {
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc/pom.xml b/xlc/org.eclipse.cdt.errorparsers.xlc/pom.xml
deleted file mode 100644
index 8989b5d853..0000000000
--- a/xlc/org.eclipse.cdt.errorparsers.xlc/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>5.0.100-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.errorparsers.xlc</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/xlc/org.eclipse.cdt.make.xlc.core/pom.xml b/xlc/org.eclipse.cdt.make.xlc.core/pom.xml
deleted file mode 100644
index 1796c7cdda..0000000000
--- a/xlc/org.eclipse.cdt.make.xlc.core/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>5.2.100-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.make.xlc.core</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/pom.xml b/xlc/org.eclipse.cdt.managedbuilder.xlc.core/pom.xml
deleted file mode 100644
index dd26a82220..0000000000
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.core/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>5.0.1-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.managedbuilder.xlc.core</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/pom.xml b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/pom.xml
deleted file mode 100644
index 0a8c1bacbd..0000000000
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>6.4.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.managedbuilder.xlc.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/pom.xml b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/pom.xml
deleted file mode 100644
index 3740e2ca52..0000000000
--- a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>1.1.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.managedbuilder.xlupc.ui</artifactId>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/xlc/org.eclipse.cdt.xlc.feature/pom.xml b/xlc/org.eclipse.cdt.xlc.feature/pom.xml
deleted file mode 100644
index 7cb416bc05..0000000000
--- a/xlc/org.eclipse.cdt.xlc.feature/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.xlc.feature</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>
diff --git a/xlc/org.eclipse.cdt.xlc.sdk-feature/feature-no-source.properties b/xlc/org.eclipse.cdt.xlc.sdk-feature/feature-no-source.properties
new file mode 100644
index 0000000000..8c2b2f70c5
--- /dev/null
+++ b/xlc/org.eclipse.cdt.xlc.sdk-feature/feature-no-source.properties
@@ -0,0 +1 @@
+# This file tells the Maven build to not generate sources for this feature
diff --git a/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml b/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml
deleted file mode 100644
index 85a64f2450..0000000000
--- a/xlc/org.eclipse.cdt.xlc.sdk-feature/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.xlc.sdk</artifactId>
- <packaging>eclipse-feature</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <version>${tycho-extras-version}</version>
- <executions>
- <execution>
- <id>source-feature</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/xlc/pom.xml b/xlc/pom.xml
new file mode 100644
index 0000000000..ec5b5c4e9b
--- /dev/null
+++ b/xlc/pom.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.cdt</groupId>
+ <artifactId>cdt-parent</artifactId>
+ <version>9.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.cdt.xlc-parent</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>org.eclipse.cdt.core.lrparser.xlc</module>
+ <module>org.eclipse.cdt.errorparsers.xlc</module>
+ <module>org.eclipse.cdt.make.xlc.core</module>
+ <module>org.eclipse.cdt.managedbuilder.xlc.core</module>
+ <module>org.eclipse.cdt.managedbuilder.xlc.ui</module>
+ <module>org.eclipse.cdt.managedbuilder.xlupc.ui</module>
+ <module>org.eclipse.cdt.xlc.feature</module>
+ <module>org.eclipse.cdt.xlc.sdk-feature</module>
+ <module>org.eclipse.cdt.errorparsers.xlc.tests</module>
+<!--
+ <module>org.eclipse.cdt.core.lrparser.xlc.tests</module>
+-->
+ </modules>
+</project>

Back to the top