Compare commits
1 Commits
fix_missin
...
feature/6.
| Author | SHA1 | Date | |
|---|---|---|---|
|
c48639a8a1 |
@@ -107,11 +107,4 @@
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.talend.daikon"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
</feature>
|
||||
|
||||
@@ -48,68 +48,57 @@
|
||||
<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>
|
||||
|
||||
@@ -121,11 +110,8 @@
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>2.3.2</version>
|
||||
<configuration>
|
||||
<source>1.7</source>
|
||||
<target>1.7</target>
|
||||
<includes>
|
||||
<include>org/talend/commons/utils/threading/lockerbykey/*.java</include>
|
||||
</includes>
|
||||
<source>1.6</source>
|
||||
<target>1.6</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
@@ -136,8 +122,8 @@
|
||||
<configuration>
|
||||
<instructions>
|
||||
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
|
||||
<Embed-Dependency>artifactId=fakejdbc;inline=true</Embed-Dependency>
|
||||
</instructions>
|
||||
<classifier>minimal</classifier>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
||||
@@ -52,12 +52,6 @@ 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,
|
||||
|
||||
@@ -122,14 +122,6 @@ 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"
|
||||
|
||||
@@ -486,78 +486,6 @@
|
||||
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
|
||||
|
||||
@@ -25,8 +25,14 @@
|
||||
<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>
|
||||
|
||||
@@ -46,19 +46,4 @@
|
||||
<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>
|
||||
|
||||
4
pom.xml
4
pom.xml
@@ -18,7 +18,7 @@
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>talend_open_snapshots</id>
|
||||
@@ -28,7 +28,7 @@
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
<url>http://newbuild.talend.com:8081/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceSnapshot/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
<modules>
|
||||
|
||||
Reference in New Issue
Block a user