-
Notifications
You must be signed in to change notification settings - Fork 13
Dev/Release project support for Gradle #282
base: master
Are you sure you want to change the base?
Conversation
fcb4d4c
to
c9c57ea
Compare
|
||
if (project.war.version == null) { | ||
warName = project.war.baseName | ||
} else { | ||
warName = project.war.baseName + "-" + project.war.version | ||
} | ||
} else { | ||
warName = getWarNameFromBoostApps() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we be able to install multiple wars if we find them? Also install war both from the project and dependencies?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changed this to use a list of war names.
return dependencies | ||
} | ||
|
||
public static Map<String, String> getAllDependenciesFromConfiguration(Configuration configuration, BoostLogger logger) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this method should be private since it is only called from getAllDependencies
.
compile "io.openliberty.boosters:jaxrs" | ||
compile "io.openliberty.boosters:jdbc" | ||
compile("org.apache.httpcomponents:httpclient:4.5.6") | ||
compile("org.apache.httpcomponents:httpcore:4.4.10") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix indent
@@ -0,0 +1 @@ | |||
/META-INF/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can delete this file.
|
||
public static Map<String, String> getAllDependenciesFromConfiguration(Configuration configuration, BoostLogger logger) { | ||
Map<String, String> dependencies = new HashMap<String, String>() | ||
configuration.resolvedConfiguration.resolvedArtifacts.collect { it.moduleVersion.id }.each { ModuleVersionIdentifier id -> | ||
logger.debug("Found dependency while processing project: " + id.group.toString() + ":" | ||
+ id.name.toString() + ":" + id.version.toString()) | ||
|
||
dependencies.put(id.group.toString() + ":" + id.name.toString(), id.version.toString()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we will only want to add the "booster" dependencies of the boostApp. Any non-booster dependency of the build project (like a db2 or mysql driver) should't be pulled in since it will conflict with what the dev project might be using. This is just my opinion and what I added into the maven build/release support, but I think additional runtime dependencies like that should be determined by the release project.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated this to only return the boosters.
6c4c023
to
ffac928
Compare
ffac928
to
253a794
Compare
Added the
boostApp
configuration which can be used to specify files or Maven artifacts to be installed.Will pull in transitive dependencies from Maven artifacts.
Currently only supports wars.