From 7f5fd9739f4b43ffaa48251ae8f8549ce127c8b4 Mon Sep 17 00:00:00 2001 From: Ravi Rajamani Date: Thu, 10 Sep 2020 19:40:05 -0700 Subject: [PATCH] Revert "hdfs and extendeds3 gradle files" This reverts commit cf583eb652dc82a63d9fd6a9563deb756180cf02. --- build.gradle | 57 ++++++++++++++++++-------- extendeds3/build.gradle | 70 ------------------------------- gradle.properties | 6 +-- gradle/maven-publish.gradle | 2 +- hdfs/build.gradle | 82 ------------------------------------- 5 files changed, 45 insertions(+), 172 deletions(-) delete mode 100644 extendeds3/build.gradle delete mode 100644 hdfs/build.gradle diff --git a/build.gradle b/build.gradle index d71aa0a..900a0ca 100644 --- a/build.gradle +++ b/build.gradle @@ -139,7 +139,6 @@ allprojects { if (project.hasProperty("doSigning") && project.property("doSigning") == "false") { signArchives.enabled = false; } - } task publishAllJars() { @@ -147,6 +146,47 @@ task publishAllJars() { 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")) { @@ -208,18 +248,3 @@ distributions { } } } - -/* -artifactory { - publish { - contextUrl = artifactoryPublishUrl - repository { - repoKey = artifactoryRepo - username = artifactoryUser - password = artifactoryPassword - } - } - clientConfig.info.setBuildNumber(buildVersion) -} - -*/ diff --git a/extendeds3/build.gradle b/extendeds3/build.gradle deleted file mode 100644 index 45c58a0..0000000 --- a/extendeds3/build.gradle +++ /dev/null @@ -1,70 +0,0 @@ -/** - * 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 - * - */ -apply plugin: 'application' -apply plugin: 'java' -apply plugin: 'jacoco' -apply plugin: 'maven-publish' - -def withoutLogger = { exclude group: 'org.slf4j', module: 'slf4j-log4j12' - exclude group: 'org.slf4j', module: 'slf4j-simple' } - -dependencies { - -} - -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 { - // includeCategories 'io.pravega.storage.extendeds3.ExtendedS3StorageTest' - } - } - - shouldRunAfter test -} - -test { - testFramework { - useJUnit { - // excludeCategories 'io.pravega.storage.extendeds3.ExtendedS3IntegrationTest' - } - } -} - -jacoco { - applyTo run -} - -task applicationCodeCoverageReport(type:JacocoReport) { - jacocoTestReport { - reports { - xml.enabled true - csv.enabled false - html.enabled true - } - } - executionData run - sourceSets sourceSets.main -} diff --git a/gradle.properties b/gradle.properties index db81578..a2e47f4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/gradle/maven-publish.gradle b/gradle/maven-publish.gradle index 614d144..4a6d89b 100644 --- a/gradle/maven-publish.gradle +++ b/gradle/maven-publish.gradle @@ -56,7 +56,7 @@ publishing { // Declares coordinates for publishing groupId = 'io.pravega' - artifactId = "pravega-" + project.name.replace(':', '-') + artifactId = "pravega-bindings-" + project.name.replace(':', '-') } } repositories { diff --git a/hdfs/build.gradle b/hdfs/build.gradle deleted file mode 100644 index 5e821c4..0000000 --- a/hdfs/build.gradle +++ /dev/null @@ -1,82 +0,0 @@ -/** - * 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 - * - */ -apply plugin: 'application' -apply plugin: 'java' -apply plugin: 'jacoco' -apply plugin: 'maven-publish' - -def withoutLogger = { exclude group: 'org.slf4j', module: 'slf4j-log4j12' - exclude group: 'org.slf4j', module: 'slf4j-simple' } - -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: '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 -} - -configurations.all { - exclude group: "org.slf4j", module: "slf4j-log4j12" -} - -task integrationTest(type: Test) { - description = 'Runs integration tests.' - group = 'verification' - - outputs.upToDateWhen { false } - - testFramework { - useJUnit { - includeCategories 'io.pravega.storage.hdfs.HDFSStorageTest' - } - } - - shouldRunAfter test -} - -test { - testFramework { - useJUnit { - // excludeCategories 'io.pravega.storage.hdfs.HDFSIntegrationTest' - } - } -} - -jacoco { - applyTo run -} - -task applicationCodeCoverageReport(type:JacocoReport) { - jacocoTestReport { - reports { - xml.enabled true - csv.enabled false - html.enabled true - } - } - executionData run - sourceSets sourceSets.main -}