Merge branch 'ptp_9_1'
Change-Id: I50d5e21a5292ca106e91cdf302cf95176f41d9d2
Signed-off-by: Watson, Gregory <g.watson@computer.org>
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 0000000..fdf2b1a
--- /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>
\ No newline at end of file
diff --git a/org.eclipse.photran-feature/pom.xml b/org.eclipse.photran-feature/pom.xml
deleted file mode 100644
index 901cb29..0000000
--- a/org.eclipse.photran-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.photran</groupId>
- <artifactId>photran-parent</artifactId>
- <version>9.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.ptp.features</groupId>
- <artifactId>org.eclipse.photran</artifactId>
- <packaging>eclipse-feature</packaging>
- <version>9.1.2-SNAPSHOT</version>
-</project>
diff --git a/org.eclipse.photran.cdtinterface.vpg/pom.xml b/org.eclipse.photran.cdtinterface.vpg/pom.xml
deleted file mode 100644
index 39d7a9d..0000000
--- a/org.eclipse.photran.cdtinterface.vpg/pom.xml
+++ /dev/null
@@ -1,16 +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.photran</groupId>
- <artifactId>photran-parent</artifactId>
- <version>9.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.photran.cdtinterface.vpg</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.photran.cdtinterface/pom.xml b/org.eclipse.photran.cdtinterface/pom.xml
deleted file mode 100644
index 93315c7..0000000
--- a/org.eclipse.photran.cdtinterface/pom.xml
+++ /dev/null
@@ -1,16 +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.photran</groupId>
- <artifactId>photran-parent</artifactId>
- <version>9.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.photran.cdtinterface</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.photran.core.intel/pom.xml b/org.eclipse.photran.core.intel/pom.xml
deleted file mode 100644
index a46f602..0000000
--- a/org.eclipse.photran.core.intel/pom.xml
+++ /dev/null
@@ -1,16 +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.photran</groupId>
- <artifactId>photran-parent</artifactId>
- <version>9.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.photran.core.intel</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.photran.core.vpg.preprocessor.c/pom.xml b/org.eclipse.photran.core.vpg.preprocessor.c/pom.xml
deleted file mode 100644
index 4c10edb..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c/pom.xml
+++ /dev/null
@@ -1,16 +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.photran</groupId>
- <artifactId>photran-parent</artifactId>
- <version>9.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.photran.core.vpg.preprocessor.c</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.photran.core.vpg/pom.xml b/org.eclipse.photran.core.vpg/pom.xml
deleted file mode 100644
index da3ed99..0000000
--- a/org.eclipse.photran.core.vpg/pom.xml
+++ /dev/null
@@ -1,16 +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.photran</groupId>
- <artifactId>photran-parent</artifactId>
- <version>9.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.photran.core.vpg</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.photran.core.xlf/pom.xml b/org.eclipse.photran.core.xlf/pom.xml
deleted file mode 100644
index 54dc146..0000000
--- a/org.eclipse.photran.core.xlf/pom.xml
+++ /dev/null
@@ -1,16 +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.photran</groupId>
- <artifactId>photran-parent</artifactId>
- <version>9.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.photran.core.xlf</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.photran.core/pom.xml b/org.eclipse.photran.core/pom.xml
deleted file mode 100644
index 4283c1f..0000000
--- a/org.eclipse.photran.core/pom.xml
+++ /dev/null
@@ -1,16 +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.photran</groupId>
- <artifactId>photran-parent</artifactId>
- <version>9.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.photran.core</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.photran.doc.user/pom.xml b/org.eclipse.photran.doc.user/pom.xml
deleted file mode 100644
index 65b3806..0000000
--- a/org.eclipse.photran.doc.user/pom.xml
+++ /dev/null
@@ -1,16 +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.photran</groupId>
- <artifactId>photran-parent</artifactId>
- <version>9.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.photran.doc.user</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.photran.intel-feature/pom.xml b/org.eclipse.photran.intel-feature/pom.xml
deleted file mode 100644
index 23cb2b2..0000000
--- a/org.eclipse.photran.intel-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.photran</groupId>
- <artifactId>photran-parent</artifactId>
- <version>9.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.ptp.features</groupId>
- <artifactId>org.eclipse.photran.intel</artifactId>
- <packaging>eclipse-feature</packaging>
- <version>9.1.2-SNAPSHOT</version>
-</project>
diff --git a/org.eclipse.photran.managedbuilder.gnu.ui/pom.xml b/org.eclipse.photran.managedbuilder.gnu.ui/pom.xml
deleted file mode 100644
index 6034204..0000000
--- a/org.eclipse.photran.managedbuilder.gnu.ui/pom.xml
+++ /dev/null
@@ -1,16 +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.photran</groupId>
- <artifactId>photran-parent</artifactId>
- <version>9.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.photran.managedbuilder.gnu.ui</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.photran.managedbuilder.intel.ui/pom.xml b/org.eclipse.photran.managedbuilder.intel.ui/pom.xml
deleted file mode 100644
index 191563f..0000000
--- a/org.eclipse.photran.managedbuilder.intel.ui/pom.xml
+++ /dev/null
@@ -1,16 +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.photran</groupId>
- <artifactId>photran-parent</artifactId>
- <version>9.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.photran.managedbuilder.intel.ui</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.photran.managedbuilder.ui/pom.xml b/org.eclipse.photran.managedbuilder.ui/pom.xml
deleted file mode 100644
index 3d31547..0000000
--- a/org.eclipse.photran.managedbuilder.ui/pom.xml
+++ /dev/null
@@ -1,16 +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.photran</groupId>
- <artifactId>photran-parent</artifactId>
- <version>9.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.photran.managedbuilder.ui</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.photran.managedbuilder.xlf.ui/pom.xml b/org.eclipse.photran.managedbuilder.xlf.ui/pom.xml
deleted file mode 100644
index 728fd26..0000000
--- a/org.eclipse.photran.managedbuilder.xlf.ui/pom.xml
+++ /dev/null
@@ -1,16 +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.photran</groupId>
- <artifactId>photran-parent</artifactId>
- <version>9.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.photran.managedbuilder.xlf.ui</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.photran.target/neon.target b/org.eclipse.photran.target/neon.target
index 2ceeea9..50a57ea 100644
--- a/org.eclipse.photran.target/neon.target
+++ b/org.eclipse.photran.target/neon.target
@@ -25,5 +25,9 @@
<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
<repository location="http://download.eclipse.org/tm/terminal/updates/4.2milestones/"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tm/terminal/updates/4.2milestones/"/>
+</location>
</locations>
</target>
diff --git a/org.eclipse.photran.ui.vpg/pom.xml b/org.eclipse.photran.ui.vpg/pom.xml
deleted file mode 100644
index cb39afd..0000000
--- a/org.eclipse.photran.ui.vpg/pom.xml
+++ /dev/null
@@ -1,16 +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.photran</groupId>
- <artifactId>photran-parent</artifactId>
- <version>9.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.photran.ui.vpg</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.photran.ui/pom.xml b/org.eclipse.photran.ui/pom.xml
deleted file mode 100644
index 59d4fb7..0000000
--- a/org.eclipse.photran.ui/pom.xml
+++ /dev/null
@@ -1,16 +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.photran</groupId>
- <artifactId>photran-parent</artifactId>
- <version>9.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.eclipse.photran.ui</artifactId>
- <version>9.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/org.eclipse.photran.xlf-feature/pom.xml b/org.eclipse.photran.xlf-feature/pom.xml
deleted file mode 100644
index 2b8d838..0000000
--- a/org.eclipse.photran.xlf-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.photran</groupId>
- <artifactId>photran-parent</artifactId>
- <version>9.1.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.ptp.features</groupId>
- <artifactId>org.eclipse.photran.xlf</artifactId>
- <packaging>eclipse-feature</packaging>
- <version>9.1.2-SNAPSHOT</version>
-</project>
diff --git a/pom.xml b/pom.xml
index 67dc6ad..bbb4532 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
<name>PTP Photran Parent</name>
<properties>
- <tycho-version>0.26.0</tycho-version>
+ <tycho-version>1.0.0</tycho-version>
<tycho-extras-version>${tycho-version}</tycho-extras-version>
<photran-install-dir>/home/data/httpd/download.eclipse.org/tools/ptp/builds/hudson/ptp-nightly-photran</photran-install-dir>
</properties>
