Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 10: extendeds3 move #17

Open
wants to merge 3 commits into
base: feature-separate-adapters
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 6 additions & 41 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ buildscript {
classpath group: 'gradle.plugin.com.github.spotbugs', name: 'spotbugs-gradle-plugin', version: spotbugsPluginVersion
classpath "org.ajoberstar:grgit:${gradleGitPluginVersion}"
classpath "io.franzbecker:gradle-lombok:${gradleLombokPluginVersion}"
classpath fileTree(dir: "$rootDir/libs", include: "*.jar")
}
}

Expand Down Expand Up @@ -89,6 +88,7 @@ allprojects {
apply from: "$rootDir/gradle/idea.gradle"
apply from: "$rootDir/gradle/jacoco.gradle"
apply from: "$rootDir/gradle/java.gradle"
apply from: "$rootDir/gradle/maven-publish.gradle"
apply from: "$rootDir/gradle/rat.gradle"

repositories {
Expand All @@ -105,10 +105,10 @@ allprojects {
url "https://repository.apache.org/snapshots"
}
maven {
url "https://oss.jfrog.org/artifactory/oss-snapshot-local"
url "http://asdrepo.isus.emc.com:8081/artifactory/nautilus-prerelease-scratch-local"
}
flatDir {
dirs 'libs'
maven {
url "https://oss.jfrog.org/artifactory/oss-snapshot-local"
}
}

Expand All @@ -133,55 +133,20 @@ allprojects {
//failOnVersionConflict()
force "com.google.guava:guava:" + guavaVersion
force "org.slf4j:slf4j-api:" + slf4jApiVersion
force "com.google.code.gson:gson:2.5"
}
}
if (project.hasProperty("doSigning") && project.property("doSigning") == "false") {
signArchives.enabled = false;
}

}

task publishAllJars() {
dependsOn ':extendeds3:publish'
dependsOn ':hdfs:publish'
}

def withoutLogger = { exclude group: 'org.slf4j', module: 'slf4j-log4j12'
exclude group: 'org.slf4j', module: 'slf4j-simple' }

project ('extendeds3') {
dependencies {

}
javadoc {
dependsOn delombok
source = delombok.outputDir
failOnError = true
}
}

project ('hdfs') {
dependencies {
compile "io.pravega:pravega-common:${pravegaVersion}",
"io.pravega:pravega-shared-metrics:${pravegaVersion}",
"io.pravega:pravega-segmentstore-contracts:${pravegaVersion}",
"io.pravega:pravega-segmentstore-storage:${pravegaVersion}"
compile "io.pravega:pravega-test-testcommon:${pravegaVersion}"
compile files("$rootDir/libs/pravega-segmentstore-storage-0.9.0-2641.ea37ccadc-issue-5124-use-maven-plugin-tests.jar")
compile group: 'org.apache.hadoop', name: 'hadoop-common', version: hadoopVersion, withoutLogger
compile group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: hadoopVersion, withoutLogger
compile group: 'org.apache.hadoop', name: 'hadoop-hdfs-client', version: hadoopVersion, withoutLogger
testCompile group: 'org.apache.hadoop', name: 'hadoop-minicluster', version: hadoopVersion, withoutLogger
testCompile group: 'ch.qos.logback', name: 'logback-classic', version: qosLogbackVersion
testCompile group: 'io.netty', name: 'netty-codec-http', version: nettyVersion

}
javadoc {
dependsOn delombok
source = delombok.outputDir
failOnError = true
}
}

def getProjectVersion() {
String ver = pravegaVersion
if (grgit && ver.contains("-SNAPSHOT")) {
Expand Down
5 changes: 5 additions & 0 deletions checkstyle/import-control.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,10 @@
<allow pkg="io.micrometer"/>
<allow pkg="com.emc.object"/>
<allow pkg="org.gaul.s3proxy" />
<allow pkg="io.netty" />
<allow pkg="javax.ws" />
<allow pkg="io.grpc" />
<allow pkg="com.fasterxml" />
<allow pkg="org.jclouds" />

</import-control>
93 changes: 93 additions & 0 deletions extendeds3/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/**
* Copyright (c) Dell Inc., or its subsidiaries. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*/

def withoutLogger = { exclude group: 'org.slf4j', module: 'slf4j-log4j12'
exclude group: 'org.slf4j', module: 'slf4j-simple' }

configurations.all {
resolutionStrategy {
force "com.google.code.gson:gson:2.5"
}
}

dependencies {
compile "io.pravega:pravega-common:${pravegaVersion}",
"io.pravega:pravega-shared-metrics:${pravegaVersion}",
"io.pravega:pravega-segmentstore-contracts:${pravegaVersion}",
"io.pravega:pravega-segmentstore-storage:${pravegaVersion}"
compile "io.pravega:pravega-test-testcommon:${pravegaVersion}"
compile group:"io.pravega", name:"pravega-segmentstore-storage", version: pravegaVersion, classifier: 'tests'
compile group: 'com.google.guava', name: 'guava', version: guavaVersion
testCompile 'org.glassfish.jersey.core:jersey-common:2.28'

//For Extended S3
compile group: 'com.emc.ecs', name: 'object-client', version: ecsObjectClientVersion, withoutLogger
testCompile group: 'org.gaul', name: 's3proxy', version: '1.5.5'
testCompile group: 'commons-httpclient', name: 'commons-httpclient', version: '3.1'
testCompile group: 'org.apache.jclouds.provider', name: 'google-cloud-storage', version: '2.1.1'

compile "io.pravega:pravega-common:${pravegaVersion}",
"io.pravega:pravega-shared-metrics:${pravegaVersion}",
"io.pravega:pravega-shared-protocol:${pravegaVersion}",
"io.pravega:pravega-segmentstore-contracts:${pravegaVersion}",
"io.pravega:pravega-segmentstore-storage:${pravegaVersion}",
"io.pravega:pravega-segmentstore-server:${pravegaVersion}",
"io.pravega:pravega-segmentstore-server-host:${pravegaVersion}",
"io.pravega:pravega-controller:${pravegaVersion}",
"io.pravega:pravega-client:${pravegaVersion}"
compile "io.pravega:pravega-test-testcommon:${pravegaVersion}"
compile group: 'junit', name:'junit', version: junitVersion
compile group: 'org.apache.curator', name: 'curator-test', version: apacheCuratorVersion
testCompile group: 'ch.qos.logback', name: 'logback-classic', version: qosLogbackVersion
testCompile group: 'org.apache.commons', name: 'commons-csv', version: apacheCommonsCsvVersion
compile group: 'org.apache.hadoop', name: 'hadoop-common', version: hadoopVersion, withoutLogger
compile group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: hadoopVersion, withoutLogger
compile group: 'org.apache.hadoop', name: 'hadoop-hdfs-client', version: hadoopVersion, withoutLogger
compile group: 'org.apache.hadoop', name: 'hadoop-minicluster', version: hadoopVersion, withoutLogger
compile group: 'io.netty', name: 'netty-codec-http', version: nettyVersion
compile group:"io.pravega", name:"pravega-segmentstore-server-host", version: pravegaVersion, classifier: 'tests'
compile group:"io.pravega", name:"pravega-segmentstore-server", version: pravegaVersion, classifier: 'tests'

}

javadoc {
dependsOn delombok
source = delombok.outputDir
failOnError = true
}

configurations.all {
exclude group: "org.slf4j", module: "slf4j-log4j12"
}

task integrationTest(type: Test) {
description = 'Runs integration tests.'
group = 'verification'

outputs.upToDateWhen { false }

testFramework {
useJUnit {
excludeCategories 'io.pravega.storage.extendeds3.ExtendedS3StorageTest'
excludeCategories 'io.pravega.storage.extendeds3.ExtendedS3StorageConfigTest'
}
}

shouldRunAfter test
}

test {
testFramework {
useJUnit {
excludeCategories 'io.pravega.test.integration.ExtendedS3IntegrationTest'
}
}
}
23 changes: 23 additions & 0 deletions extendeds3/integration/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this file at the right place?

<!--
Copyright (c) Dell Inc., or its subsidiaries.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

-->
<configuration scan="true" scanPeriod="30 seconds">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<charset>UTF-8</charset>
<Pattern>%d %-4relative [%thread] %-5level %logger{35} - %msg%n</Pattern>
</encoder>
</appender>

<root level="INFO">
<appender-ref ref="STDOUT"/>
</root>
</configuration>
22 changes: 22 additions & 0 deletions extendeds3/integration/src/test/resources/logback-test.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this file at the right place?

<!--
Copyright (c) Dell Inc., or its subsidiaries.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
-->
<configuration scan="true" scanPeriod="30 seconds">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<charset>UTF-8</charset>
<Pattern>%d %-4relative [%thread] %-5level %logger{35} - %msg%n</Pattern>
</encoder>
</appender>

<root level="INFO">
<appender-ref ref="STDOUT"/>
</root>
</configuration>
Loading