Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
saasio
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
reyun
saasio
Commits
53d03c4a
Commit
53d03c4a
authored
Apr 03, 2018
by
carrieyzzhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dependence conflict
parent
51d67ae1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
63 additions
and
46 deletions
+63
-46
pom.xml
pom.xml
+61
-43
saasio.iml
saasio.iml
+2
-2
AwsS3Util.java
src/main/java/com/reyun/util/AwsS3Util.java
+0
-1
No files found.
pom.xml
View file @
53d03c4a
...
@@ -860,12 +860,30 @@
...
@@ -860,12 +860,30 @@
<groupId>
org.apache.hive
</groupId>
<groupId>
org.apache.hive
</groupId>
<artifactId>
hive-jdbc
</artifactId>
<artifactId>
hive-jdbc
</artifactId>
<version>
1.1.0-cdh5.12.1
</version>
<version>
1.1.0-cdh5.12.1
</version>
<exclusions>
<exclusion>
<artifactId>
httpclient
</artifactId>
<groupId>
org.apache.httpcomponents
</groupId>
</exclusion>
<exclusion>
<artifactId>
httpcore
</artifactId>
<groupId>
org.apache.httpcomponents
</groupId>
</exclusion>
</exclusions>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.apache.hive
</groupId>
<groupId>
org.apache.hive
</groupId>
<artifactId>
hive-exec
</artifactId>
<artifactId>
hive-exec
</artifactId>
<version>
1.1.0-cdh5.12.1
</version>
<version>
1.1.0-cdh5.12.1
</version>
<exclusions>
<exclusion>
<artifactId>
commons-httpclient
</artifactId>
<groupId>
commons-httpclient
</groupId>
</exclusion>
</exclusions>
</dependency>
</dependency>
</dependencies>
</dependencies>
<!-- 配置构建 -->
<!-- 配置构建 -->
...
@@ -949,49 +967,49 @@
...
@@ -949,49 +967,49 @@
</triggerfiles>
</triggerfiles>
</configuration>
</configuration>
<
!--<executions>--
>
<
executions
>
<
!--<execution>--
>
<
execution
>
<
!--<id>install node and npm</id>--
>
<
id>
install node and npm
</id
>
<
!--<goals>--
>
<
goals
>
<
!--<goal>install-node-and-npm</goal>--
>
<
goal>
install-node-and-npm
</goal
>
<
!--</goals>--
>
<
/goals
>
<
!--<configuration>--
>
<
configuration
>
<
!--<nodeVersion>v0.10.18</nodeVersion>--
>
<
nodeVersion>
v0.10.18
</nodeVersion
>
<
!--<npmVersion>1.3.8</npmVersion>--
>
<
npmVersion>
1.3.8
</npmVersion
>
<
!--</configuration>--
>
<
/configuration
>
<
!--</execution>--
>
<
/execution
>
<
!--<execution>--
>
<
execution
>
<
!--<id>npm install</id>--
>
<
id>
npm install
</id
>
<
!--<goals>--
>
<
goals
>
<
!--<goal>npm</goal>--
>
<
goal>
npm
</goal
>
<
!--</goals>--
>
<
/goals
>
<
!--<configuration>--
>
<
configuration
>
<
!--<arguments>install</arguments>--
>
<
arguments>
install
</arguments
>
<
!--</configuration>--
>
<
/configuration
>
<
!--</execution>--
>
<
/execution
>
<
!--<execution>--
>
<
execution
>
<
!--<id>npm run build</id>--
>
<
id>
npm run build
</id
>
<
!--<goals>--
>
<
goals
>
<
!--<goal>npm</goal>--
>
<
goal>
npm
</goal
>
<
!--</goals>--
>
<
/goals
>
<
!--<configuration>--
>
<
configuration
>
<
!--<arguments>run build</arguments>--
>
<
arguments>
run build
</arguments
>
<
!--</configuration>--
>
<
/configuration
>
<
!--</execution>--
>
<
/execution
>
<
!--<execution>--
>
<
execution
>
<
!--<id>grunt build</id>--
>
<
id>
grunt build
</id
>
<
!--<goals>--
>
<
goals
>
<
!--<goal>grunt</goal>--
>
<
goal>
grunt
</goal
>
<
!--</goals>--
>
<
/goals
>
<
!--<configuration>--
>
<
configuration
>
<
!--<arguments>build --force</arguments>--
>
<
arguments>
build --force
</arguments
>
<
!--</configuration>--
>
<
/configuration
>
<
!--</execution>--
>
<
/execution
>
<
!--</executions>--
>
<
/executions
>
</plugin>
</plugin>
<plugin>
<plugin>
...
...
saasio.iml
View file @
53d03c4a
...
@@ -148,6 +148,8 @@
...
@@ -148,6 +148,8 @@
<orderEntry
type=
"library"
name=
"Maven: com.amazonaws:aws-java-sdk-s3:1.11.52"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.amazonaws:aws-java-sdk-s3:1.11.52"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.amazonaws:aws-java-sdk-kms:1.11.52"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.amazonaws:aws-java-sdk-kms:1.11.52"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.amazonaws:aws-java-sdk-core:1.11.52"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.amazonaws:aws-java-sdk-core:1.11.52"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.httpcomponents:httpclient:4.5.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.httpcomponents:httpcore:4.4.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: software.amazon.ion:ion-java:1.0.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: software.amazon.ion:ion-java:1.0.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.6"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.6"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.amazonaws:jmespath-java:1.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.amazonaws:jmespath-java:1.0"
level=
"project"
/>
...
@@ -244,8 +246,6 @@
...
@@ -244,8 +246,6 @@
<orderEntry
type=
"library"
scope=
"RUNTIME"
name=
"Maven: org.apache.hadoop:hadoop-yarn-server-web-proxy:2.6.0-cdh5.12.1"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"RUNTIME"
name=
"Maven: org.apache.hadoop:hadoop-yarn-server-web-proxy:2.6.0-cdh5.12.1"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"RUNTIME"
name=
"Maven: org.apache.hive.shims:hive-shims-scheduler:1.1.0-cdh5.12.1"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"RUNTIME"
name=
"Maven: org.apache.hive.shims:hive-shims-scheduler:1.1.0-cdh5.12.1"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"RUNTIME"
name=
"Maven: org.mockito:mockito-all:1.9.5"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"RUNTIME"
name=
"Maven: org.mockito:mockito-all:1.9.5"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.httpcomponents:httpclient:4.2.5"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.httpcomponents:httpcore:4.2.5"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.thrift:libthrift:0.9.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.thrift:libthrift:0.9.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.zookeeper:zookeeper:3.4.5-cdh5.12.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.zookeeper:zookeeper:3.4.5-cdh5.12.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.curator:curator-framework:2.6.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.curator:curator-framework:2.6.0"
level=
"project"
/>
...
...
src/main/java/com/reyun/util/AwsS3Util.java
View file @
53d03c4a
package
com
.
reyun
.
util
;
package
com
.
reyun
.
util
;
import
com.amazonaws.ClientConfiguration
;
import
com.amazonaws.ClientConfiguration
;
import
com.amazonaws.auth.AWSCredentials
;
import
com.amazonaws.auth.AWSCredentials
;
import
com.amazonaws.auth.BasicAWSCredentials
;
import
com.amazonaws.auth.BasicAWSCredentials
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment