Skip to content

Commit

Permalink
Revert "hdfs and extendeds3 gradle files"
Browse files Browse the repository at this point in the history
This reverts commit cf583eb.
  • Loading branch information
Ravi Rajamani committed Sep 11, 2020
1 parent cf583eb commit 7f5fd97
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 172 deletions.
57 changes: 41 additions & 16 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,54 @@ allprojects {
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') {
apply from: "$rootDir/gradle/maven-publish.gradle"

dependencies {

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

project ('hdfs') {
apply from: "$rootDir/gradle/maven-publish.gradle"

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 Expand Up @@ -208,18 +248,3 @@ distributions {
}
}
}

/*
artifactory {
publish {
contextUrl = artifactoryPublishUrl
repository {
repoKey = artifactoryRepo
username = artifactoryUser
password = artifactoryPassword
}
}
clientConfig.info.setBuildNumber(buildVersion)
}
*/
70 changes: 0 additions & 70 deletions extendeds3/build.gradle

This file was deleted.

6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ nettyVersion=4.1.50.Final

# Version and base tags can be overridden at build time
# These should match those in the core Pravega repository: https://github.com/pravega/pravega
pravegaVersion=0.9.0-2643.7e191fb-SNAPSHOT
pravegaTestVersion=0.9.0-2643.7e191fb-SNAPSHOT
pravegaDockerImageVersion=0.9.0-2643.7e191fb-SNAPSHOT
pravegaVersion=0.9.0-2625.fd290ad-SNAPSHOT
pravegaTestVersion=0.9.0-2625.fd290ad-SNAPSHOT
pravegaDockerImageVersion=0.9.0-2625.fd290ad-SNAPSHOT
pravegaBaseTag=pravega/pravega

# Pravega Signing Key
Expand Down
2 changes: 1 addition & 1 deletion gradle/maven-publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ publishing {

// Declares coordinates for publishing
groupId = 'io.pravega'
artifactId = "pravega-" + project.name.replace(':', '-')
artifactId = "pravega-bindings-" + project.name.replace(':', '-')
}
}
repositories {
Expand Down
82 changes: 0 additions & 82 deletions hdfs/build.gradle

This file was deleted.

0 comments on commit 7f5fd97

Please sign in to comment.