Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 21

- name: 'Cache Gradle packages'
uses: actions/cache@v4
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,7 @@ gradle-app.setting

# Demo data sets
yelp_json
yelp_graph
yelp_graph

# For some reason this directory is created when running the tests
/morpheus-testing/target/
9 changes: 8 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ allprojects {
mavenCentral()
mavenLocal()
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
vendor = JvmVendorSpec.ADOPTIUM // Gradle constant for Temurin
}
}
}

apply from: 'build.licenses.gradle'
Expand Down Expand Up @@ -138,7 +145,7 @@ subprojects {
description = 'Run a custom Scala app (use -PmainClass=com.my.package.App)'

classpath = sourceSets.main.runtimeClasspath
mainClass = project.getProperty("mainClass")
mainClass = project.provider { project.findProperty('mainClass') }
}

tasks.named('runApp').configure {
Expand Down
21 changes: 20 additions & 1 deletion build.licenses.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
// Define a resolvable configuration for license reporting
configurations {
licenseReportRuntimeClasspath {
extendsFrom configurations.runtimeClasspath
canBeResolved = true
canBeConsumed = false
description = 'Resolvable configuration for license reporting.'
}
}

// All licenses that we accept, and their aliases
def allowList = [
[name: 'BSD-2-Clause', url: 'http://opensource.org/licenses/BSD-2-Clause', aliases: [
Expand Down Expand Up @@ -69,12 +79,21 @@ subprojects { proj ->

// Dependency license reporting
downloadLicenses {
dependencyConfiguration = 'runtimeClasspath'
dependencyConfiguration = 'licenseReportRuntimeClasspath'
aliases = allowList.collectEntries { lic ->
def actual = license(lic.name, lic.url)
def alternatives = lic.aliases.collect { it.url ? license(it.name, it.url) : it.name }
[(actual): alternatives]
}

report {
json.enabled = true
json.destination = file("build/reports/license")
xml.enabled = false
xml.destination = file("build/reports/license")
html.enabled = false
html.destination = file("build/reports/license")
}
}

tasks.downloadLicenses.ext.licenseToDependencyJson = { ->
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.hierynomus.license</groupId>
<artifactId>com.github.hierynomus.license.gradle.plugin</artifactId>
<version>0.16.2-37dde1f</version>
<version>0.16.3-63da64d</version>
<packaging>pom</packaging>
<name>License plugin for Gradle</name>
<description>Applies a header to files, typically a license</description>
<dependencies>
<dependency>
<groupId>com.hierynomus.gradle.plugins</groupId>
<artifactId>license-gradle-plugin</artifactId>
<version>0.16.2-37dde1f</version>
<version>0.16.3-63da64d</version>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>com.github.hierynomus.license</groupId>
<artifactId>com.github.hierynomus.license.gradle.plugin</artifactId>
<versioning>
<latest>0.16.2-37dde1f</latest>
<release>0.16.2-37dde1f</release>
<versions>
<version>0.16.2-37dde1f</version>
</versions>
<lastUpdated>20220128142712</lastUpdated>
</versioning>
<groupId>com.github.hierynomus.license</groupId>
<artifactId>com.github.hierynomus.license.gradle.plugin</artifactId>
<versioning>
<latest>0.16.3-63da64d</latest>
<release>0.16.3-63da64d</release>
<versions>
<version>0.16.3-63da64d</version>
</versions>
<lastUpdated>20251015064240</lastUpdated>
</versioning>
</metadata>
Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading