-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Upgrade Gradle to 8.11 (most recent version that works with JDK8)
- Update core dependencies to more recent versions - Remove unused NameService/NameServiceDescriptor implementations - Bump version to 1.54-SNAPSHOT
- Loading branch information
Showing
18 changed files
with
372 additions
and
426 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,16 +13,18 @@ | |
*/ | ||
|
||
plugins { | ||
id "com.github.hierynomus.license" version "0.11.0" | ||
id "com.github.hierynomus.license" version "0.16.1" | ||
id 'signing' | ||
id 'maven-publish' | ||
} | ||
|
||
apply plugin: 'idea' | ||
apply plugin: 'java' | ||
apply plugin: 'groovy' | ||
|
||
plugins.withType(JavaPlugin) { | ||
sourceCompatibility = 1.8 | ||
targetCompatibility = 1.8 | ||
java { | ||
sourceCompatibility = JavaVersion.VERSION_1_8 | ||
targetCompatibility = JavaVersion.VERSION_1_8 | ||
} | ||
|
||
ext.versions = [ | ||
|
@@ -32,7 +34,7 @@ ext.versions = [ | |
log4j : '1.2.17', | ||
testng : '7.5', | ||
junit : '4.12', | ||
spock : '1.0-groovy-2.4', | ||
spock : '2.3-groovy-4.0', | ||
slf4j : '1.7.12', | ||
hsqldb : '2.3.2', | ||
dbutils : '1.6', | ||
|
@@ -48,7 +50,7 @@ ext.versions = [ | |
hive : '3.0.0-2', | ||
presto : '0.181', | ||
reflections : '0.9.9', | ||
bytebuddy : '0.7-rc2', | ||
bytebuddy : '1.15.4', | ||
jsch : '0.1.55', | ||
mina_sshd : '0.14.0', | ||
freemarker : '2.3.22', | ||
|
@@ -113,7 +115,7 @@ ext.tempto_runner = project(':tempto-runner') | |
ext.tempto_ldap = project(':tempto-ldap') | ||
ext.tempto_kafka = project(':tempto-kafka') | ||
ext.expected_result_generator = project(':expected-result-generator') | ||
ext.tempto_version = '1.53' | ||
ext.tempto_version = '1.54-SNAPSHOT' | ||
ext.tempto_group = "io.prestodb.tempto" | ||
ext.isReleaseVersion = !tempto_version.endsWith("SNAPSHOT") | ||
|
||
|
@@ -141,23 +143,24 @@ subprojects { | |
configure(subprojects - expected_result_generator - tempto_examples) { | ||
apply plugin: 'signing' | ||
apply plugin: 'java' | ||
apply plugin: 'maven' | ||
apply plugin: 'maven-publish' | ||
|
||
// plugins configuration | ||
javadoc { | ||
failOnError = true | ||
} | ||
|
||
// javadoc.jar generation | ||
// javadoc.jar generation | ||
task javadocJar(type: Jar) { | ||
classifier = 'javadoc' | ||
from javadoc | ||
archiveClassifier.set('javadoc') | ||
from(javadoc) | ||
} | ||
|
||
|
||
// sources.jar generation | ||
task sourcesJar(type: Jar) { | ||
classifier = 'sources' | ||
from sourceSets.main.allJava | ||
archiveClassifier.set('sources') | ||
from(sourceSets.main.allJava) | ||
} | ||
|
||
signing { | ||
|
@@ -170,41 +173,37 @@ configure(subprojects - expected_result_generator - tempto_examples) { | |
} | ||
|
||
// publishing to sonatype | ||
uploadArchives { | ||
repositories { | ||
mavenDeployer { | ||
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } | ||
|
||
repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { | ||
authentication(userName: nexusUsername, password: nexusPassword) | ||
publishing { | ||
publications { | ||
maven(MavenPublication) { | ||
group tempto_group | ||
version tempto_version | ||
|
||
from components.java | ||
|
||
pom { | ||
packaging = 'jar' | ||
description = 'Tempto - test framework' | ||
url = 'https://github.com/prestodb/tempto' | ||
} | ||
} | ||
} | ||
|
||
snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { | ||
authentication(userName: nexusUsername, password: nexusPassword) | ||
repositories { | ||
maven { | ||
url = uri('https://oss.sonatype.org/service/local/staging/deploy/maven2/') | ||
credentials { | ||
username = System.getenv('NEXUS_USERNAME') | ||
password = System.getenv('NEXUS_PASSWORD') | ||
} | ||
} | ||
|
||
pom.project { | ||
packaging 'jar' | ||
description 'Tempto - test framework' | ||
url 'https://github.com/prestodb/tempto' | ||
scm { | ||
url '[email protected]:prestodb/tempto.git' | ||
connection 'scm:git:[email protected]:prestodb/tempto.git' | ||
developerConnection 'scm:git:[email protected]:prestodb/tempto.git' | ||
} | ||
licenses { | ||
license { | ||
name 'The Apache Software License, Version 2.0' | ||
url 'http://www.apache.org/license/LICENSE-2.0.txt' | ||
} | ||
} | ||
developers { | ||
developer { | ||
id 'thc' | ||
name 'Teradata Hadoop Center' | ||
email 'EB230060 aat teradata doot com' | ||
} | ||
} | ||
maven { | ||
url = uri('https://oss.sonatype.org/content/repositories/snapshots/') | ||
credentials { | ||
username = System.getenv('NEXUS_USERNAME') | ||
password = System.getenv('NEXUS_PASSWORD') | ||
} | ||
} | ||
} | ||
|
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,7 @@ | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https://services.gradle.org/distributions/gradle-6.6-all.zip | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip | ||
networkTimeout=10000 | ||
validateDistributionUrl=true | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists |
Oops, something went wrong.