Skip to content

Bundled deps as provided in pom #1507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sergej-koscejev merged 3 commits into from
Nov 18, 2025
Merged

Bundled deps as provided in pom #1507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b6473f
build: add bundled dependencies as provided in pom.xml
sergej-koscejev Nov 12, 2025
28436f1
build: remove jarNameOverride, specify dependency type
sergej-koscejev Nov 12, 2025
42d584c
Merge branch 'maintenance/mps20241' into bundled-deps-as-provided-in-pom
arimer Nov 17, 2025
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ The project does _not_ follow Semantic Versioning and the changes are documented

## November 2025

### Added
- The Maven POM now contains all bundled JARs as dependencies with `provided` scope to help with automated license and
vulnerability scanning.


### Fixed
- A bug was fixed that caused the editor of NumberLiteral to break if a property macro was used for its value.

Expand Down
29 changes: 16 additions & 13 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,24 +134,19 @@ class BundledDep {
String libSolutionName
Closure configClosure = { transitive = false }
// in case a legacy dependency has a broken artifact name, e.g. w/o extension
String jarNameOverride
String getConfigName() {
name + '_bundled'
}
String getResolveTaskName() {
'resolve_' + this.configName
}
BundledDep overrideArtifactName(String artifactName) {
this.jarNameOverride = artifactName
this
}
}

def bundledDeps = [
new BundledDep('pcollections', ['org.pcollections:pcollections:4.0.2'], 'org.iets3.core.expr.base.collections.stubs'),
new BundledDep('bigMath', ['ch.obermuhlner:big-math:2.3.2'], 'org.iets3.core.expr.math.interpreter'),
new BundledDep('functionalJava', ['org.functionaljava:functionaljava:5.0'], 'org.iets3.core.expr.genjava.functionalJava'),
new BundledDep('cpsSuite', ['io.takari.junit:takari-cpsuite:1.2.7'], 'org.iets3.opensource.build.gentests.rt').overrideArtifactName('takari-cpsuite.jar')
new BundledDep('cpsSuite', ['io.takari.junit:takari-cpsuite:1.2.7@jar'], 'org.iets3.opensource.build.gentests.rt')
]

bundledDeps.each { dep ->
Expand All @@ -171,9 +166,7 @@ bundledDeps.each { dep ->
rename { filename ->
def ra = configurations.getByName(dep.configName).resolvedConfiguration.resolvedArtifacts.find { ResolvedArtifact ra -> ra.file.name == filename }
String finalName
if (dep.jarNameOverride != null) {
finalName = dep.jarNameOverride
} else if (ra.classifier != null) {
if (ra.classifier != null) {
finalName = "${ra.name}-${ra.classifier}.${ra.extension}"
} else {
finalName = "${ra.name}.${ra.extension}"
Expand Down Expand Up @@ -383,7 +376,7 @@ task packageDistroWithDependencies(type: Zip, dependsOn: buildDistroWithDependen

assemble.dependsOn packageLanguages, packageTests

static def addDependency(Object pom, Object groupId, Object artifactId, Object version, Object type = null) {
static def addDependency(Object pom, Object groupId, Object artifactId, Object version, Object type = null, String scope = null) {
pom.withXml { XmlProvider prov ->
Node root = prov.asNode()
Node deps = root.dependencies[0] ?: root.appendNode("dependencies")
Expand All @@ -394,14 +387,16 @@ static def addDependency(Object pom, Object groupId, Object artifactId, Object v
if (type != null) {
dep.appendNode("type", type)
}
if (scope != null) {
dep.appendNode("scope", scope)
}
}
}

static def addDependency(Object pom, Configuration config) {
static def addDependency(MavenPom pom, Configuration config, String scope = null) {
config.resolvedConfiguration.firstLevelModuleDependencies.each {
addDependency(pom, it.moduleGroup, it.moduleName, it.moduleVersion, it.moduleArtifacts[0].type)
addDependency(pom, it.moduleGroup, it.moduleName, it.moduleVersion, it.moduleArtifacts[0].type, scope)
}

}

ext.additionalPomInfo = {
Expand All @@ -425,6 +420,12 @@ ext.additionalPomInfo = {
}
}

ext.addBundledDependencies = { MavenPom pom ->
bundledDeps.each {
addDependency(pom, configurations[it.configName], 'provided')
}
}

publishing {
repositories {
maven {
Expand Down Expand Up @@ -458,6 +459,8 @@ publishing {

addDependency(pom, configurations.languageLibs)

pom addBundledDependencies

pom additionalPomInfo
}

Expand Down