Skip to content
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.

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

OZ-468: Do not substitute the Maven Parent snapshot version in archetype resources #61

Closed
wants to merge 3 commits into from
Closed
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
Original file line number Diff line number Diff line change
Expand Up @@ -86,18 +86,3 @@ new FileOutputStream(wrapperDir.resolve("maven-wrapper.properties").toFile()).wi
it << "distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/${mavenVersion}/apache-maven-${mavenVersion}-bin.zip\n"
it << "wrapperUrl=${wrapperJarUrl}\n"
}

def isWindows = System.properties["os.name"].toLowerCase().contains("windows")
if (!isWindows) {
run("chmod +x ${projectDirectory.resolve("scripts").resolve("mvnw").toString()}")
run("chmod +x ${projectDirectory.resolve("scripts").resolve("mvnwDebug").toString()}")
}
Comment on lines -91 to -94
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should still be left in! Otherwise mvnw won't end up as a executable.


// set the version of the parent to the version of the archetype
// NB at this point, we just use the Maven wrapper to do things
def mvnwCommand = isWindows ?
projectDirectory.resolve("scripts").resolve("mvnw.cmd").toString() :
projectDirectory.resolve("scripts").resolve("mvnw").toString()

run("${mvnwCommand} versions:update-parent -DskipResolution -DparentVersion=${request.archetypeVersion} -DgenerateBackupPoms=false")

Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# Ozone ${distributionName}
# ${distributionName}

**Ozone ${distributionName}** is a distribution of [Ozone HIS](https://www.ozone-his.com).
**${distributionName}** is a distribution of [Ozone HIS](https://www.ozone-his.com).

## Implementer Guide
A technical guide to help implementers building and running the project can be found [here](readme/impl-guide.md).
Please refer to the online Ozone documentation for instructions how to run the project: https://docs.ozone-his.com/create-distro/#available-commands

## Release Notes

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# Ozone basicDistribution
# basicDistribution

**Ozone basicDistribution** is a distribution of [Ozone HIS](https://www.ozone-his.com).
**basicDistribution** is a distribution of [Ozone HIS](https://www.ozone-his.com).

A technical guide to help implementers building and running the project can be found [here](readme/impl-guide.md).
Please refer to the online Ozone documentation for instructions how to run the project: https://docs.ozone-his.com/create-distro/#available-commands

## Release Notes

### 1.0.0-SNAPSHOT (in progress)

This file was deleted.

Loading