TBD-2880:Remove deprecated hadoop version from wizard

Revert "TBD-2880:Remove deprecated hadoop version from wizard"
This reverts commit ba43de3f78.
2015-12-04 00:03:11 +08:00 · 2015-12-04 00:03:11 +08:00 · 2015-12-04 00:03:11 +08:00 · 2015-12-04 00:03:10 +08:00 · 2015-12-04 00:03:10 +08:00 · 2015-12-04 00:03:09 +08:00
7 changed files with 125 additions and 9 deletions
--- a/main/features/org.talend.utils.feature/feature.xml
+++ b/main/features/org.talend.utils.feature/feature.xml
@@ -107,4 +107,11 @@
         version="0.0.0"
         unpack="false"/>

+   <plugin
+         id="org.talend.daikon"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
--- a/main/plugins/org.talend.commons.runtime/pom_server.xml
+++ b/main/plugins/org.talend.commons.runtime/pom_server.xml
@@ -48,57 +48,68 @@
            <version>1.0</version>
            <scope>system</scope>
            <systemPath>${basedir}/fakejdbc_driver.jar</systemPath>
+            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>org.eclipse.birt.runtime</groupId>
            <artifactId>org.eclipse.osgi</artifactId>
            <version>3.10.2.v20150203-1939</version>
+            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>org.eclipse.birt.runtime</groupId>
            <artifactId>org.eclipse.core.runtime</artifactId>
            <version>3.10.0.v20140318-2214</version>
+            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>org.eclipse.birt.runtime</groupId>
            <artifactId>org.eclipse.emf.common</artifactId>
            <version>2.10.1.v20140901-1043</version>
+            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>org.eclipse.birt.runtime</groupId>
            <artifactId>org.eclipse.emf.ecore</artifactId>
            <version>2.10.1.v20140901-1043</version>
+            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>org.eclipse.birt.runtime</groupId>
            <artifactId>org.eclipse.emf.ecore.xmi</artifactId>
            <version>2.10.1.v20140901-1043</version>
+            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>org.eclipse.birt.runtime</groupId>
            <artifactId>org.eclipse.equinox.common</artifactId>
            <version>3.6.200.v20130402-1505</version>
+            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>org.eclipse.birt.runtime</groupId>
            <artifactId>org.eclipse.equinox.registry</artifactId>
            <version>3.5.400.v20140428-1507</version>
+            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>org.eclipse.birt.runtime</groupId>
            <artifactId>org.eclipse.equinox.app</artifactId>
            <version>1.3.200.v20130910-1609</version>
+            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>xerces</groupId>
            <artifactId>xercesImpl</artifactId>
            <version>2.11.0</version>
+            <optional>true</optional>
        </dependency>
        <dependency>
            <groupId>log4j</groupId>
            <artifactId>log4j</artifactId>
            <version>1.2.16</version>
            <type>bundle</type>
+            <optional>true</optional>
        </dependency>
    </dependencies>

@@ -110,8 +121,11 @@
                <artifactId>maven-compiler-plugin</artifactId>
                <version>2.3.2</version>
                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <includes>
+                        <include>org/talend/commons/utils/threading/lockerbykey/*.java</include>
+                    </includes>
                </configuration>
            </plugin>
            <plugin>
@@ -122,8 +136,8 @@
                <configuration>
                    <instructions>
                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                        <Embed-Dependency>artifactId=fakejdbc;inline=true</Embed-Dependency>
                    </instructions>
+                    <classifier>minimal</classifier>
                </configuration>
            </plugin>
        </plugins>
--- a/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/EHadoopVersion4Drivers.java
+++ b/main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/hadoop/version/EHadoopVersion4Drivers.java
@@ -52,6 +52,12 @@ public enum EHadoopVersion4Drivers {

    APACHE_1_0_0(EHadoopDistributions.APACHE, "Apache 1.0.0", "APACHE_1_0_0", true, false), //$NON-NLS-1$ //$NON-NLS-2$

+    CLOUDERA_CDH5_5(EHadoopDistributions.CLOUDERA, "Cloudera CDH5.5(YARN mode)", //$NON-NLS-1$
+                    "Cloudera_CDH5_5", //$NON-NLS-1$
+                    true,
+                    false,
+                    new EMRVersion[] { EMRVersion.YARN }),
+
    CLOUDERA_CDH5_5(EHadoopDistributions.CLOUDERA, "Cloudera CDH5.5(YARN mode)", //$NON-NLS-1$
                    "Cloudera_CDH5_5", //$NON-NLS-1$
                    true,
--- a/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/PomUtil.java
+++ b/main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/utils/PomUtil.java
@@ -122,6 +122,14 @@ public class PomUtil {
        return pomFileName;
    }

+    public static String getPomFileName(String name, String version) {
+        String pomFileName = TalendMavenConstants.POM_FILE_NAME;
+        if (name != null && name.length() > 0) {
+            pomFileName = TalendMavenConstants.POM_NAME + '_' + name + "_" + version + TalendMavenConstants.XML_EXT;
+        }
+        return pomFileName;
+    }
+
    /**
     * get the assembly name, if name is null, return default one "assembly.xml", else will be
     * "assembly_<name>_<version>.xml"
--- a/main/plugins/org.talend.metadata.managment/plugin.xml
+++ b/main/plugins/org.talend.metadata.managment/plugin.xml
@@ -486,6 +486,78 @@
            name="commons-lang-2.4.jar" mvn_uri="mvn:org.talend.libraries/commons-lang-2.4/6.0.0" 
            required="true"
            uripath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.4.jar">
+      </libraryNeeded>
+            <libraryNeeded
+            context="Hive wizard"
+            language="java"
+            message="Wizard for hive HDP 2.0 Embedded"
+            name="httpcore-4.1.2.jar" mvn_uri="mvn:org.talend.libraries/httpcore-4.1.2/6.0.0" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.apache.http/lib/httpcore-4.1.2.jar">
+      </libraryNeeded>
+            <libraryNeeded
+            context="Hive wizard"
+            language="java"
+            message="Wizard for hive HDP 2.0"
+            name="httpclient-4.1.2.jar" mvn_uri="mvn:org.talend.libraries/httpclient-4.1.2/6.0.0" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.apache.http/lib/httpclient-4.1.2.jar">
+      </libraryNeeded>
+       <libraryNeeded
+            context="Hive wizard"
+            language="java"
+            message="Wizard use for Hive"
+            name="hive-service-0.7.1.jar" mvn_uri="mvn:org.talend.libraries/hive-service-0.7.1/6.0.0" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.hadoop.apache.0.20.203/lib/hive-service-0.7.1.jar">
+      </libraryNeeded>
+            <libraryNeeded
+            context="Hive wizard"
+            language="java"
+            message="Wizard use for Hive"
+            name="hadoop-core-0.20.203.0.jar" mvn_uri="mvn:org.talend.libraries/hadoop-core-0.20.203.0/6.0.0" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.hadoop.apache.0.20.203/lib/hadoop-core-0.20.203.0.jar">
+      </libraryNeeded>
+            <libraryNeeded
+            context="Hive wizard"
+            language="java"
+            message="Wizard use for Hive"
+            name="hive-exec-0.7.1.jar" mvn_uri="mvn:org.talend.libraries/hive-exec-0.7.1/6.0.0" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.hadoop.apache.0.20.203/lib/hive-exec-0.7.1.jar">
+      </libraryNeeded>
+            <libraryNeeded
+            context="Hive wizard"
+            language="java"
+            message="Wizard use for Hive"
+            name="hive-metastore-0.7.1.jar" mvn_uri="mvn:org.talend.libraries/hive-metastore-0.7.1/6.0.0" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.hadoop.apache.0.20.203/lib/hive-metastore-0.7.1.jar">
+      </libraryNeeded>
+            <libraryNeeded
+            context="Hive wizard"
+            language="java"
+            message="Wizard use for Hive"
+            name="libfb303.jar" mvn_uri="mvn:org.talend.libraries/libfb303/6.0.0" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.hadoop.apache.0.20.203/lib/libfb303.jar">
+      </libraryNeeded>
+            <libraryNeeded
+            context="Hive wizard"
+            language="java"
+            message="Wizard use for Hive"
+            name="hive-jdbc-0.7.1.jar" mvn_uri="mvn:org.talend.libraries/hive-jdbc-0.7.1/6.0.0" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.hadoop.apache.0.20.203/lib/hive-jdbc-0.7.1.jar">
+      </libraryNeeded>
+            <libraryNeeded
+            context="Hive wizard"
+            language="java"
+            message="Wizard use for Hive"
+            name="commons-lang-2.4.jar" mvn_uri="mvn:org.talend.libraries/commons-lang-2.4/6.0.0" 
+            required="true"
+            uripath="platform:/plugin/org.talend.libraries.apache.common/lib/commons-lang-2.4.jar">
      </libraryNeeded>
   </extension>
   <extension
--- a/main/plugins/org.talend.utils/.project
+++ b/main/plugins/org.talend.utils/.project
@@ -25,14 +25,8 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
--- a/main/plugins/org.talend.utils/pom.xml
+++ b/main/plugins/org.talend.utils/pom.xml
@@ -46,4 +46,19 @@
            <version>0.2.0.BUILD-SNAPSHOT</version>
        </dependency>
    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+                <executions>
+                    <execution>
+                        <id>default-deploy</id>
+                        <phase>deploy</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
Author	SHA1	Message	Date
hwang	b46a4f8eb0	TBD-2880:Remove deprecated hadoop version from wizard	2015-12-04 00:03:11 +08:00
hwang	951259fb81	Revert "TBD-2880:Remove deprecated hadoop version from wizard" This reverts commit `ba43de3f78`.	2015-12-04 00:03:11 +08:00
Sizhao Liu	e853ca0e92	TUP-3822 bump exported jackson version in org.talend.libraries jackson	2015-12-04 00:03:11 +08:00
Igor Lazebny	b575923c99	TESB-16841: Introduce org.talend.utils.minimal build Conflicts: main/plugins/org.talend.utils/pom_minimal.xml	2015-12-04 00:03:10 +08:00
Igor Lazebny	39c46176b7	TESB-16841: Embed daikon dependency in org.talend.utils bundle build	2015-12-04 00:03:10 +08:00
Sebastien Gandon	1cfc6bb252	TCOMP-12 : remove the maven (m2e) nature from the utils project	2015-12-04 00:03:09 +08:00
iwangtalend	dbe1433860	Deploy org.talend.utils to Nexus	2015-12-04 00:03:09 +08:00
Sebastien Gandon	5e91a5020f	TCOMP-12 : added missing daikon to the org.talend.utils features	2015-12-04 00:03:08 +08:00
cmeng-talend	81fa236f82	TBD-2854 feature: support for cdh5.5 https://jira.talendforge.org/browse/TBD-2854 Conflicts: main/plugins/org.talend.core.runtime/src/main/java/org/talend/core/model/metadata/connection/hive/HiveConnVersionInfo.java	2015-12-04 00:03:08 +08:00
Sebastien Gandon	10ed7e4197	TCOMP-12 : update feature with org.talend.utils to add daikon Conflicts: main/features/org.talend.utils.feature/feature.xml	2015-12-04 00:03:08 +08:00
Sebastien Gandon	5b2946449b	TCOMP-12: moved the CryptoHelper class to daikon	2015-12-04 00:03:07 +08:00
Sebastien Gandon	fc494b0346	TCOMP-12 : moved the CryptoHelper into daikon. Conflicts: main/plugins/org.talend.utils/src/main/java/org/talend/utils/security/CryptoHelper.java	2015-12-04 00:03:07 +08:00
nrousseau	ea1a06bec2	TDI-34636: remove unused jars	2015-12-04 00:02:25 +08:00
nrousseau	152c02f006	TDI-34636: remove unused jars Conflicts: main/features/org.talend.fragment.jars.feature/feature.xml main/plugins/org.talend.libraries.mdm/lib/cxf-core-3.1.4.jar main/plugins/org.talend.libraries.mdm/lib/cxf-rt-databinding-jaxb-3.1.4.jar main/plugins/org.talend.libraries.mdm/lib/cxf-rt-transports-http-3.1.4.jar	2015-12-04 00:02:25 +08:00
jzhao	8476e5cced	TDI-30959: Support of Exasol 5 with Talend DI component https://jira.talendforge.org/browse/TDI-30959 Note:Remove talend-db-exasol-1.0.0.jar and would move to other place for TDI-34289	2015-12-04 00:02:24 +08:00
jzhao	dcc4c39d6e	TDI-30959: Support of Exasol 5 with Talend DI component https://jira.talendforge.org/browse/TDI-30959 Note: upload jar for TDI-34289	2015-12-04 00:02:24 +08:00
wdliu	1e752b99d2	TUP-3747: DI Studio Part TUP-3747: Re-implement the copy to branch with the new way.------Optimize the preivous implementation	2015-12-04 00:02:24 +08:00
rdubois	02e8726cbe	TUP-3747 - FIXME - Fix a compilation error	2015-12-04 00:02:23 +08:00
Igor Lazebny	51e56344e0	Add minimal build of org.talend.commons.runtime	2015-12-04 00:02:23 +08:00
cmeng-talend	ac28766322	Revert "TUP-3628 fix bug: Exception in FixProjectResourceLink https://jira.talendforge.org/browse/TUP-3628 " This reverts commit `b233d023b7`.	2015-12-04 00:02:22 +08:00
cmeng-talend	039536471e	Revert "TUP-3628 fix bug: Exception in FixProjectResourceLink" This reverts commit `b8aa3824a0`.	2015-12-04 00:02:22 +08:00
xhkong	8d2a70deae	Revert "TDI-32521 Renaming a generic schema is causing issue https://jira.talendforge.org/browse/TDI-32521 " This reverts commit `1abf29ab54`.	2015-12-04 00:02:22 +08:00
xhkong	2517baaa8d	Revert "TDI-32521 Renaming a generic schema is causing issue https://jira.talendforge.org/browse/TDI-32521 " This reverts commit `7479573feb`.	2015-12-04 00:02:21 +08:00
cmeng-talend	138652edc1	TDI-34154 fix bug: Wrong schema retrieval with synonyms on Oracle https://jira.talendforge.org/browse/TDI-34154 Also fix problem when check all synonyms	2015-12-04 00:02:21 +08:00
cmeng-talend	8926746847	TDI-34154 fix bug: Wrong schema retrieval with synonyms on Oracle https://jira.talendforge.org/browse/TDI-34154	2015-12-04 00:02:20 +08:00
xhkong	313af1a25a	TDI-32521 Renaming a generic schema is causing issue https://jira.talendforge.org/browse/TDI-32521	2015-12-04 00:02:20 +08:00
xhkong	2082ad0ebc	TDI-32521 Renaming a generic schema is causing issue https://jira.talendforge.org/browse/TDI-32521	2015-12-04 00:02:20 +08:00
wchen-talend	7990806b74	TUP-3644:Build fails when a job contains two sub of the same subjobs Conflicts: main/plugins/org.talend.designer.maven/src/main/java/org/talend/designer/maven/tools/creator/CreateMavenJobPom.java	2015-12-04 00:02:19 +08:00
Chao Meng	26079474de	TUP-3628 fix bug: Exception in FixProjectResourceLink https://jira.talendforge.org/browse/TUP-3628 correct the comment	2015-12-04 00:02:19 +08:00
cmeng-talend	fc1cfc0b9c	TUP-3628 fix bug: Exception in FixProjectResourceLink https://jira.talendforge.org/browse/TUP-3628 Firstly try to get the file name from it's resource if exists	2015-12-04 00:02:18 +08:00
wluo-talend	c10279ef79	TUP-3614: Upgrade CXF to 3.1.3 https://jira.talendforge.org/browse/TUP-3614	2015-12-04 00:02:18 +08:00
wluo-talend	fe9a7640de	TUP-3614: Upgrade CXF to 3.1.3 https://jira.talendforge.org/browse/TUP-3614	2015-12-04 00:02:18 +08:00
zwxue	94235104fe	Revert "TDI-33924: Remove wrong Java setup warning when launching studio since JRE is supported now." This reverts commit `e6182a9da1`. Conflicts: main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/intro/ApplicationWorkbenchWindowAdvisor.java	2015-12-04 00:02:17 +08:00
zwxue	47233aae94	TDI-33924: Remove wrong Java setup warning when launching studio since JRE is supported now. Conflicts: main/plugins/org.talend.rcp/src/main/java/org/talend/rcp/intro/ApplicationWorkbenchWindowAdvisor.java	2015-12-04 00:02:17 +08:00
wang wei	c727c8d707	TDI-33991: AWS EMR, On-Demand APIs (start, stop) https://jira.talendforge.org/browse/TDI-33991	2015-12-04 00:02:16 +08:00