Merge branch 'master' into TEIIDDES-3046

Teiid-Designer · Jun 14, 2017 · 6af3441 · 6af3441
2 parents d8fb4da + bfd4154
commit 6af3441
Show file tree

Hide file tree

Showing 590 changed files with 21,770 additions and 1,022 deletions.
diff --git a/documentation/guides/Teiid_Designer_User_Guide/en-US/master.xml b/documentation/guides/Teiid_Designer_User_Guide/en-US/master.xml
@@ -20,9 +20,9 @@
 <book>
   <bookinfo>
     <title>Teiid Designer User Guide</title>
-    <releaseinfo>11.0.2
+    <releaseinfo>11.1.0
     </releaseinfo>
-    <productnumber>11.0.2
+    <productnumber>11.1.0
     </productnumber>
     <issuenum>1</issuenum>
     <mediaobject>

diff --git a/documentation/guides/Teiid_Designer_User_Guide/pom.xml b/documentation/guides/Teiid_Designer_User_Guide/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>${docname}-${translation}</artifactId>
-	<version>11.0.2-SNAPSHOT</version>
+	<version>11.1.0-SNAPSHOT</version>
 	<packaging>jdocbook</packaging>
 	<name>${bookname}-(${translation})</name>
 

diff --git a/features/org.teiid.datatools.connectivity.feature/LEGAL.txt b/features/org.teiid.datatools.connectivity.feature/LEGAL.txt
@@ -1,4 +1,4 @@
-Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2016 MetaMatrix, Inc. and Red Hat, Inc.
+Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2017 MetaMatrix, Inc. and Red Hat, Inc.
 
 This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is
 available at http://www.eclipse.org/legal/epl-v10.html.

diff --git a/features/org.teiid.datatools.connectivity.feature/feature.xml b/features/org.teiid.datatools.connectivity.feature/feature.xml
@@ -15,7 +15,7 @@
 <feature
       id="org.teiid.datatools.connectivity.feature"
       label="Teiid DataTools Connectivity"
-      version="11.0.2.qualifier"
+      version="11.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
       license-feature-version="0.0.0">

diff --git a/features/org.teiid.datatools.connectivity.feature/pom.xml b/features/org.teiid.datatools.connectivity.feature/pom.xml
@@ -9,6 +9,6 @@
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.datatools.connectivity.feature</artifactId>
-	<version>11.0.2-SNAPSHOT</version>
+	<version>11.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.teiid.designer.feature/feature.xml b/features/org.teiid.designer.feature/feature.xml
@@ -9,7 +9,7 @@
 <feature
       id="org.teiid.designer.feature"
       label="Teiid Designer"
-      version="11.0.2.qualifier"
+      version="11.1.0.qualifier"
       provider-name="%providerName"
       plugin="org.teiid.designer"
       image="designer32.png"
@@ -165,6 +165,10 @@
       <import plugin="org.eclipse.swt" version="3.104.1" match="compatible"/>
       <import plugin="org.eclipse.jdt.core" version="3.11.1" match="compatible"/>
       <import plugin="org.eclipse.wst.server.core" version="1.7.0" match="compatible"/>
+<!--
+	  <import plugin="org.teiid.designer.dataservices.ui" version="11.0.0" match="compatible"/>
+-->
+	   <import plugin="org.teiid.designer.datasources.ui" version="11.0.0" match="compatible"/>
    </requires>
 
    <plugin
@@ -632,5 +636,10 @@
          download-size="0"
          install-size="0"
          version="0.0.0"/>
+   <plugin
+         id="org.teiid.designer.datasources.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
 
 </feature>
diff --git a/features/org.teiid.designer.feature/pom.xml b/features/org.teiid.designer.feature/pom.xml
@@ -8,6 +8,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.designer.feature</artifactId> 
-	<version>11.0.2-SNAPSHOT</version>
+	<version>11.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.teiid.designer.library.feature/LEGAL.txt b/features/org.teiid.designer.library.feature/LEGAL.txt
@@ -1,4 +1,4 @@
-Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2016 MetaMatrix, Inc. and Red Hat, Inc.
+Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2017 MetaMatrix, Inc. and Red Hat, Inc.
 
 This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is
 available at http://www.eclipse.org/legal/epl-v10.html.

diff --git a/features/org.teiid.designer.library.feature/feature.xml b/features/org.teiid.designer.library.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.teiid.designer.library.feature"
       label="Teiid Designer Library Feature"
-      version="11.0.2.qualifier"
+      version="11.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
       license-feature-version="0.0.0">

diff --git a/features/org.teiid.designer.library.feature/pom.xml b/features/org.teiid.designer.library.feature/pom.xml
@@ -8,6 +8,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.designer.library.feature</artifactId> 
-	<version>11.0.2-SNAPSHOT</version>
+	<version>11.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.teiid.designer.runtime.feature/LEGAL.txt b/features/org.teiid.designer.runtime.feature/LEGAL.txt
@@ -1,4 +1,4 @@
-Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2016 MetaMatrix, Inc. and Red Hat, Inc.
+Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2017 MetaMatrix, Inc. and Red Hat, Inc.
 
 This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is
 available at http://www.eclipse.org/legal/epl-v10.html.

diff --git a/features/org.teiid.designer.runtime.feature/feature.properties b/features/org.teiid.designer.runtime.feature/feature.properties
@@ -4,7 +4,7 @@
 # 
 # See the AUTHORS.txt file distributed with this work for a full listing of individual contributors.
 copyright = \
-Teiid Designer (http://www.jboss.org/teiiddesigner.html) is copyright 2000-2016 MetaMatrix, Inc. and Red Hat, Inc.
+Teiid Designer (http://www.jboss.org/teiiddesigner.html) is copyright 2000-2017 MetaMatrix, Inc. and Red Hat, Inc.
 
 license = \
 This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is \

diff --git a/features/org.teiid.designer.runtime.feature/feature.xml b/features/org.teiid.designer.runtime.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.teiid.designer.runtime.feature"
       label="Teiid Designer Runtime"
-      version="11.0.2.qualifier"
+      version="11.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
       license-feature-version="0.0.0">

diff --git a/features/org.teiid.designer.runtime.feature/pom.xml b/features/org.teiid.designer.runtime.feature/pom.xml
@@ -8,6 +8,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.designer.runtime.feature</artifactId> 
-	<version>11.0.2-SNAPSHOT</version>
+	<version>11.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.teiid.designer.teiid.client.feature/LEGAL.txt b/features/org.teiid.designer.teiid.client.feature/LEGAL.txt
@@ -1,4 +1,4 @@
-Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2016 MetaMatrix, Inc. and Red Hat, Inc.
+Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2017 MetaMatrix, Inc. and Red Hat, Inc.
 
 This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is
 available at http://www.eclipse.org/legal/epl-v10.html.

diff --git a/features/org.teiid.designer.teiid.client.feature/feature.xml b/features/org.teiid.designer.teiid.client.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.teiid.designer.teiid.client.feature"
       label="Teiid Runtime Clients"
-      version="11.0.2.qualifier"
+      version="11.1.0.qualifier"
       provider-name="%providerName"
       license-feature="org.jboss.tools.foundation.license.feature"
       license-feature-version="0.0.0">

diff --git a/features/org.teiid.designer.teiid.client.feature/pom.xml b/features/org.teiid.designer.teiid.client.feature/pom.xml
@@ -8,6 +8,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.designer.teiid.client.feature</artifactId> 
-	<version>11.0.2-SNAPSHOT</version>
+	<version>11.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.teiid.designer.test.feature/LEGAL.txt b/features/org.teiid.designer.test.feature/LEGAL.txt
@@ -1,4 +1,4 @@
-Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2016 MetaMatrix, Inc. and Red Hat, Inc.
+Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2017 MetaMatrix, Inc. and Red Hat, Inc.
 
 This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is
 available at http://www.eclipse.org/legal/epl-v10.html.

diff --git a/features/org.teiid.designer.test.feature/feature.xml b/features/org.teiid.designer.test.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.teiid.designer.test.feature"
       label="Teiid Designer Test"
-      version="11.0.2.qualifier"
+      version="11.1.0.qualifier"
       provider-name="%providerName"
       plugin="org.teiid.designer"
       image="feature.gif"

diff --git a/features/org.teiid.designer.test.feature/pom.xml b/features/org.teiid.designer.test.feature/pom.xml
@@ -8,6 +8,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.designer.test.feature</artifactId> 
-	<version>11.0.2-SNAPSHOT</version>
+	<version>11.1.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.teiid.designer.test.feature/sourceTemplateFeature/feature.properties b/features/org.teiid.designer.test.feature/sourceTemplateFeature/feature.properties
@@ -9,7 +9,7 @@
 licenseURL=license.html
 
 copyright = \
-Teiid Designer (http://www.jboss.org/teiiddesigner.html) is copyright 2000-2016 MetaMatrix, Inc. and Red Hat, Inc.
+Teiid Designer (http://www.jboss.org/teiiddesigner.html) is copyright 2000-2017 MetaMatrix, Inc. and Red Hat, Inc.
 
 license = \
 This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is \

diff --git a/plugins/crypto/org.teiid.designer.bc.dummy/META-INF/MANIFEST.MF b/plugins/crypto/org.teiid.designer.bc.dummy/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.teiid.designer.bc.dummy;singleton:=true
-Bundle-Version: 11.0.2.qualifier
+Bundle-Version: 11.1.0.qualifier
 Bundle-Vendor: %pluginProvider
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin

diff --git a/plugins/crypto/org.teiid.designer.bc.dummy/pom.xml b/plugins/crypto/org.teiid.designer.bc.dummy/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.designer.bc.dummy</artifactId> 
-	<version>11.0.2-SNAPSHOT</version>
+	<version>11.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
     <build>
         <plugins>

diff --git a/plugins/org.teiid.core.designer/LEGAL.txt b/plugins/org.teiid.core.designer/LEGAL.txt
@@ -1,4 +1,4 @@
-Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2016 MetaMatrix, Inc. and Red Hat, Inc.
+Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2017 MetaMatrix, Inc. and Red Hat, Inc.
 
 This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is
 available at http://www.eclipse.org/legal/epl-v10.html.

diff --git a/plugins/org.teiid.core.designer/META-INF/MANIFEST.MF b/plugins/org.teiid.core.designer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.teiid.core.designer;singleton:=true
-Bundle-Version: 11.0.2.qualifier
+Bundle-Version: 11.1.0.qualifier
 Bundle-Activator: org.teiid.core.designer.CoreModelerPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin

diff --git a/plugins/org.teiid.core.designer/pom.xml b/plugins/org.teiid.core.designer/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.core.designer</artifactId> 
-	<version>11.0.2-SNAPSHOT</version>
+	<version>11.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
     <build>
         <plugins>

diff --git a/plugins/org.teiid.datatools.connectivity.model/LEGAL.txt b/plugins/org.teiid.datatools.connectivity.model/LEGAL.txt
@@ -1,4 +1,4 @@
-Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2016 MetaMatrix, Inc. and Red Hat, Inc.
+Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2017 MetaMatrix, Inc. and Red Hat, Inc.
 
 This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is
 available at http://www.eclipse.org/legal/epl-v10.html.

diff --git a/plugins/org.teiid.datatools.connectivity.model/META-INF/MANIFEST.MF b/plugins/org.teiid.datatools.connectivity.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.teiid.datatools.connectivity.model;singleton:=true
-Bundle-Version: 11.0.2.qualifier
+Bundle-Version: 11.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin

diff --git a/plugins/org.teiid.datatools.connectivity.model/pom.xml b/plugins/org.teiid.datatools.connectivity.model/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.datatools.connectivity.model</artifactId> 
-	<version>11.0.2-SNAPSHOT</version>
+	<version>11.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
     <build>
         <plugins>

diff --git a/plugins/org.teiid.datatools.connectivity.ui.flatfile/LEGAL.txt b/plugins/org.teiid.datatools.connectivity.ui.flatfile/LEGAL.txt
@@ -1,4 +1,4 @@
-Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2016 MetaMatrix, Inc. and Red Hat, Inc.
+Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2017 MetaMatrix, Inc. and Red Hat, Inc.
 
 This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is
 available at http://www.eclipse.org/legal/epl-v10.html.

diff --git a/plugins/org.teiid.datatools.connectivity.ui.flatfile/META-INF/MANIFEST.MF b/plugins/org.teiid.datatools.connectivity.ui.flatfile/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginProvider
 Bundle-SymbolicName: org.teiid.datatools.connectivity.ui.flatfile;singleton:=true
-Bundle-Version: 11.0.2.qualifier
+Bundle-Version: 11.1.0.qualifier
 Fragment-Host: org.eclipse.datatools.connectivity.oda.flatfile.ui;bundle-version="[3.1.7,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin

diff --git a/plugins/org.teiid.datatools.connectivity.ui.flatfile/pom.xml b/plugins/org.teiid.datatools.connectivity.ui.flatfile/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.datatools.connectivity.ui.flatfile</artifactId> 
-	<version>11.0.2-SNAPSHOT</version>
+	<version>11.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
     <build>
         <plugins>

diff --git a/plugins/org.teiid.datatools.connectivity.ui/LEGAL.txt b/plugins/org.teiid.datatools.connectivity.ui/LEGAL.txt
@@ -1,4 +1,4 @@
-Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2016 MetaMatrix, Inc. and Red Hat, Inc.
+Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2017 MetaMatrix, Inc. and Red Hat, Inc.
 
 This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is
 available at http://www.eclipse.org/legal/epl-v10.html.

diff --git a/plugins/org.teiid.datatools.connectivity.ui/META-INF/MANIFEST.MF b/plugins/org.teiid.datatools.connectivity.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.teiid.datatools.connectivity.ui;singleton:=true
-Bundle-Version: 11.0.2.qualifier
+Bundle-Version: 11.1.0.qualifier
 Bundle-Activator: org.teiid.datatools.connectivity.ui.Activator
 Bundle-Vendor: %pluginProvider
 Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",

diff --git a/plugins/org.teiid.datatools.connectivity.ui/pom.xml b/plugins/org.teiid.datatools.connectivity.ui/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.datatools.connectivity.ui</artifactId> 
-	<version>11.0.2-SNAPSHOT</version>
+	<version>11.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
     <build>
         <plugins>

diff --git a/plugins/org.teiid.datatools.connectivity/LEGAL.txt b/plugins/org.teiid.datatools.connectivity/LEGAL.txt
@@ -1,4 +1,4 @@
-Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2016 MetaMatrix, Inc. and Red Hat, Inc.
+Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2017 MetaMatrix, Inc. and Red Hat, Inc.
 
 This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is
 available at http://www.eclipse.org/legal/epl-v10.html.

diff --git a/plugins/org.teiid.datatools.connectivity/META-INF/MANIFEST.MF b/plugins/org.teiid.datatools.connectivity/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.teiid.datatools.connectivity;singleton:=true
-Bundle-Version: 11.0.2.qualifier
+Bundle-Version: 11.1.0.qualifier
 Bundle-Activator: org.teiid.datatools.connectivity.Activator
 Bundle-Vendor: %pluginProvider
 Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",

diff --git a/plugins/org.teiid.datatools.connectivity/pom.xml b/plugins/org.teiid.datatools.connectivity/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.datatools.connectivity</artifactId> 
-	<version>11.0.2-SNAPSHOT</version>
+	<version>11.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
     <build>
         <plugins>

diff --git a/plugins/org.teiid.designer.advisor.ui/LEGAL.txt b/plugins/org.teiid.designer.advisor.ui/LEGAL.txt
@@ -1,4 +1,4 @@
-Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2016 MetaMatrix, Inc. and Red Hat, Inc.
+Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2017 MetaMatrix, Inc. and Red Hat, Inc.
 
 This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is
 available at http://www.eclipse.org/legal/epl-v10.html.

diff --git a/plugins/org.teiid.designer.advisor.ui/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.advisor.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.teiid.designer.advisor.ui;singleton:=true
-Bundle-Version: 11.0.2.qualifier
+Bundle-Version: 11.1.0.qualifier
 Bundle-Activator: org.teiid.designer.advisor.ui.AdvisorUiPlugin
 Bundle-Vendor: %pluginProvider
 Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",

diff --git a/plugins/org.teiid.designer.advisor.ui/pom.xml b/plugins/org.teiid.designer.advisor.ui/pom.xml
@@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	</parent>
 	<groupId>org.jboss.tools</groupId>
 	<artifactId>org.teiid.designer.advisor.ui</artifactId> 
-	<version>11.0.2-SNAPSHOT</version>
+	<version>11.1.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
     <build>
         <plugins>

diff --git a/...ner.advisor.ui/src/org/teiid/designer/advisor/ui/views/AdvisorPerspectiveContributor.java b/...ner.advisor.ui/src/org/teiid/designer/advisor/ui/views/AdvisorPerspectiveContributor.java
@@ -34,21 +34,21 @@ public PerspectiveObject[] getContributions() {
     }
 
     private void createContributions() {
-    	contributions = new PerspectiveObject[2];
+    	contributions = new PerspectiveObject[1];
 
-        PerspectiveObject connectorsView = 
+        PerspectiveObject guidesView = 
             new PerspectiveObject(
                  AdvisorUiConstants.Extensions.GUIDES_VIEW_ID,
                  false,
-                 PerspectiveObject.TOP_RIGHT);
+                 PerspectiveObject.TOP_LEFT);
 
-        contributions[0] = connectorsView;
+        contributions[0] = guidesView;
 
-        PerspectiveObject statusView = 
-                new PerspectiveObject(
-                     AdvisorUiConstants.Extensions.STATUS_VIEW_ID,
-                     false,
-                     PerspectiveObject.BOTTOM_LEFT);
-        contributions[1] = statusView;
+//        PerspectiveObject statusView = 
+//                new PerspectiveObject(
+//                     AdvisorUiConstants.Extensions.STATUS_VIEW_ID,
+//                     false,
+//                     PerspectiveObject.BOTTOM_LEFT);
+//        contributions[1] = statusView;
     }
 }
diff --git a/plugins/org.teiid.designer.compare.ui/LEGAL.txt b/plugins/org.teiid.designer.compare.ui/LEGAL.txt
@@ -1,4 +1,4 @@
-Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2016 MetaMatrix, Inc. and Red Hat, Inc.
+Teiid Designer (http://www.jboss.org/projects/teiiddesigner.html) is copyright 2000-2017 MetaMatrix, Inc. and Red Hat, Inc.
 
 This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is
 available at http://www.eclipse.org/legal/epl-v10.html.