Skip to content

Commit

Permalink
#238: fixed extension (#239)
Browse files Browse the repository at this point in the history
#231: #238: fixed download_dir issue
#239: devon4j 3.1.1
#240: workaround for maven archetype-catalog bug
  • Loading branch information
hohwille authored Aug 30, 2019
1 parent cd07312 commit 61e7fab
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,12 @@ public static MigrationImpl devon4j() {
.replaceCommentNode(
"<!DOCTYPE mappings PUBLIC \"-//DOZER//DTD MAPPINGS//EN\" \"http://dozer.sourceforge.net/dtd/dozerbeanmapping.dtd\">",
"<!DOCTYPE mappings PUBLIC \"-//DOZER//DTD MAPPINGS//EN\" \"https://github.com/DozerMapper/DozerMapper.github.io/blob/master/dtd/bean-mapping.dtd\">")
.and().next().build();
.and() //
.next().to(VersionIdentifier.ofDevon4j("3.1.1")) //
.pom().replaceProperty("devon4j.version", "3.1.1") //
.replaceProperty("jackson.version", "2.9.9.20190727") //
.and() //
.next().build();
}

}
8 changes: 7 additions & 1 deletion scripts/src/main/resources/scripts/functions
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,11 @@ function doMavenArchetype() {
then
target_args+=("-Dversion=1.0.0-SNAPSHOT")
fi
if ! doArrayContainsItemWithPrefix "${target_args[@]}" "-DarchetypeVersion="
then
doMavenGetLatestVersion "https://repo.maven.apache.org/maven2/${ARCHETYPE_GROUP_ID//.//}/${ARCHETYPE_ARTIFACT_ID}"
target_args+=("-DarchetypeVersion=${LATEST_VERSION}")
fi
if [ -z "${target_artifact_id}" ]
then
for ((i=1; i < ${#}; i++)) {
Expand Down Expand Up @@ -762,6 +767,7 @@ function doInstall() {
fi
if [ -n "${DEVON_SOFTWARE_REPOSITORY}" ]
then
extension=".tgz"
download_url="${DEVON_SOFTWARE_REPOSITORY}/${software}/${version}/${filename}.tgz"
result=1
repo="${DEVON_SOFTWARE_REPOSITORY/*:\/\//}"
Expand Down Expand Up @@ -798,7 +804,7 @@ function doInstall() {
if [ ! -d "${install_path}" ] || [ "${install_path}" == "${target_path}" ]
then
doDownload "${download_url}" "${filename}" "${download_dir}"
doExtract "${DEVON_DOWNLOAD_DIR}/${filename}" "${dir}"
doExtract "${download_dir}/${filename}" "${dir}"
doReplaceExtracted "${DEVON_IDE_HOME}/updates/extracted/${dir}" "${install_path}"
if [ "${install_path}" != "${DEVON_IDE_HOME}" ]
then
Expand Down
2 changes: 1 addition & 1 deletion settings/src/main/settings

0 comments on commit 61e7fab

Please sign in to comment.