Skip to content

Commit 9e41c51

Browse files
committed
Merge branch 'main' into github-action-build-and-test
2 parents 4ad6ee7 + 728ef44 commit 9e41c51

File tree

3 files changed

+12
-15
lines changed

3 files changed

+12
-15
lines changed

build.gradle

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ plugins {
88
apply plugin: 'com.github.jk1.dependency-license-report'
99
apply plugin: 'com.adarshr.test-logger'
1010

11+
if (project.hasProperty('release') || project.hasProperty('ci')) {
12+
// todo add check for version ends with '-SNAPSHOT' after b/440037454
13+
if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
14+
throw new GradleException("The Dumper release and CI builds must be run with JDK 8 but was executed with JDK " + JavaVersion.current())
15+
}
16+
}
17+
1118
distributions {
1219
published {
1320
distributionBaseName = "dwh-migration-tools"
@@ -53,12 +60,12 @@ versionCatalogUpdate {
5360

5461
licenseReport {
5562
filters = [
56-
new com.github.jk1.license.filter.LicenseBundleNormalizer(bundlePath: rootProject.file("gradle/license-bundle-normalizer.json"), createDefaultTransformationRules: true)
63+
new com.github.jk1.license.filter.LicenseBundleNormalizer(bundlePath: rootProject.file("gradle/license-bundle-normalizer.json"), createDefaultTransformationRules: true)
5764
]
5865
renderers = [
59-
new com.google.edwmigration.dumper.build.licensereport.CsvReportRenderer(),
60-
new com.github.jk1.license.render.JsonReportRenderer('index.json', false),
61-
new com.github.jk1.license.render.InventoryHtmlReportRenderer("index.html", "Licenses of Third Party Dependencies")
66+
new com.google.edwmigration.dumper.build.licensereport.CsvReportRenderer(),
67+
new com.github.jk1.license.render.JsonReportRenderer('index.json', false),
68+
new com.github.jk1.license.render.InventoryHtmlReportRenderer("index.html", "Licenses of Third Party Dependencies")
6269
]
6370
allowedLicensesFile = rootProject.file("gradle/license-allowed.json")
6471
}

buildSrc/src/main/groovy/dwh-migration-dumper.java-common-conventions.gradle

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,10 @@ plugins {
2020
id 'java-test-fixtures'
2121
id 'com.diffplug.spotless'
2222
id 'nebula.info'
23-
id 'com.google.cloud.artifactregistry.gradle-plugin'
2423
}
2524

2625
repositories {
27-
if (project.hasProperty('profile') && project.property('profile') == 'google') {
28-
println("ACTIVE PROFILE: " + project.property('profile'))
29-
maven {
30-
url System.getenv("INTERNAL_REPOSITORY")
31-
}
32-
} else {
33-
println("ACTIVE PROFILE: DEFAULT")
34-
mavenCentral()
35-
}
26+
mavenCentral()
3627
}
3728

3829
configurations {

settings.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
plugins {
22
// Apply the foojay-resolver plugin to allow automatic download of JDKs
33
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0'
4-
id "com.google.cloud.artifactregistry.gradle-plugin" version "2.2.4"
54
}
65
rootProject.name = 'dwh-migration-tools'
76
include(

0 commit comments

Comments
 (0)