Skip to content

Commit

Permalink
Merge pull request #40 from vintmd/unified
Browse files Browse the repository at this point in the history
unified version
  • Loading branch information
vintmd authored Dec 24, 2021
2 parents 301eaca + b4c8d0c commit e86f604
Show file tree
Hide file tree
Showing 30 changed files with 517 additions and 370 deletions.
43 changes: 43 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Created by .ignore support plugin (hsz.mobi)
# User-specific stuff
.DS_Store
.idea/

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
*.iml
*.ipr

### Java template
# Compiled class file
*.class
target/

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

pom.xml-E
pom.xml.versionsBackup

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

# local dep
dep

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
2 changes: 1 addition & 1 deletion compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ do
cp target/*.pom dep/${hadoop_version}/

mvn versions:set -DnewVersion=${origin_version}
done
done
13 changes: 9 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.qcloud.cos</groupId>
<artifactId>hadoop-cos</artifactId>
<version>5.10.0</version>
<version>8.0.1</version>
<packaging>jar</packaging>

<name>Apache Hadoop Tencent Qcloud COS Support</name>
Expand Down Expand Up @@ -41,7 +41,7 @@
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<hadoop.version>3.3.0</hadoop.version>
<cos_api.version>5.6.60</cos_api.version>
<cos_api.version>5.6.62</cos_api.version>
<google.guava.version>24.1.1-jre</google.guava.version>
<commons_lang3.version>3.1</commons_lang3.version>
<junit.version>4.8</junit.version>
Expand All @@ -62,6 +62,13 @@
<version>${hadoop.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.qcloud</groupId>
<artifactId>cosn-ranger-interface</artifactId>
<version>1.0.3</version>
<scope>provided</scope>
</dependency>
</dependencies>

<distributionManagement>
Expand All @@ -88,7 +95,6 @@
</includes>
</resource>
</resources>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -156,6 +162,5 @@
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
12 changes: 12 additions & 0 deletions src/main/java/com/qcloud/chdfs/permission/RangerAccessType.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.qcloud.chdfs.permission;

public enum RangerAccessType {

LIST,
WRITE,
READ,
DELETE;

private RangerAccessType() {
}
}
Loading

0 comments on commit e86f604

Please sign in to comment.