From 11f2b324d3a12ab01377e885a8e62a3a0a7770d8 Mon Sep 17 00:00:00 2001
From: Toshihiro Suzuki <brfrn169@gmail.com>
Date: Wed, 21 Jul 2021 19:44:39 +0900
Subject: [PATCH] Some changes related to release

---
 archive.gradle | 13 ++++++++++++-
 build.gradle   | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/archive.gradle b/archive.gradle
index 9b399f7d7a..ab39d0c409 100644
--- a/archive.gradle
+++ b/archive.gradle
@@ -2,13 +2,19 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 
 artifacts {
-    archives javadocJar, sourcesJar, testJar
+    archives javadocJar, sourcesJar, testJar, testSourcesJar
 }
 
 signing {
     sign configurations.archives
 }
 
+configurations.archives.artifacts.removeAll {
+    // exclude from the archives configuration all artifacts that were generated by distZip & distTar
+    def depTasks = it.getBuildDependencies().getDependencies()
+    depTasks.contains(distZip) || depTasks.contains(distTar)
+}
+
 uploadArchives {
     repositories {
         mavenDeployer {
@@ -48,6 +54,11 @@ uploadArchives {
                         name 'Hiroyuki Yamada'
                         email 'hiroyuki.yamada@scalar-labs.com'
                     }
+                    developer {
+                        id 'brfrn169'
+                        name 'Toshihiro Suzuki'
+                        email 'brfrn169@gmail.com'
+                    }
                 }
             }
         }
diff --git a/build.gradle b/build.gradle
index 183249320f..f2ba50f04d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -49,7 +49,7 @@ dependencies {
     compile group: 'com.azure', name: 'azure-cosmos', version: '4.8.0'
     compile group: 'org.jooq', name: 'jooq', version: '3.13.2'
     compile group: 'software.amazon.awssdk', name: 'dynamodb', version: "${awssdkVersion}"
-    compile group: 'software.amazon.awssdk', name:'core', version: "${awssdkVersion}"
+    compile group: 'software.amazon.awssdk', name: 'core', version: "${awssdkVersion}"
 
     compile group: 'org.apache.commons', name: 'commons-dbcp2', version: '2.8.0'
     compile group: 'mysql', name: 'mysql-connector-java', version: '8.0.22'
@@ -85,8 +85,13 @@ task javadocJar(type: Jar) {
 }
 
 task testJar(type: Jar) {
-  classifier = 'tests'
-  from sourceSets.test.output
+    classifier = 'tests'
+    from sourceSets.test.output
+}
+
+task testSourcesJar(type: Jar) {
+    classifier = 'test-sources'
+    from sourceSets.test.allSource
 }
 
 task integrationTestCassandra(type: Test) {
@@ -127,4 +132,7 @@ archivesBaseName = "scalardb"
 //version = "3.0.0"
 
 // for archiving and uploading to maven central
-//apply from: 'archive.gradle'
+if (!project.gradle.startParameter.taskNames.isEmpty() &&
+        project.gradle.startParameter.taskNames[0].endsWith('uploadArchives')) {
+    apply from: 'archive.gradle'
+}