Skip to content

Commit

Permalink
chore: release 1.7.0 (#114)
Browse files Browse the repository at this point in the history
* chore: migrated to latest archetype

* fix: velocity templates must not use removed api

* chore: prepared 1.7.0-SNAPSHOT

* Squashed 'devenv-4-iom/' changes from 43c9e254..03a5599f

03a5599f docs: added release notes for 2.6.1 (#45)
6fdbef94 chore: release version 2.6.1
0d82cce3 chore: release version 2.6.0 (#42)
e3cb313a chore: release version 2.5.0 (#40)

git-subtree-dir: devenv-4-iom
git-subtree-split: 03a5599f9720d64ae8deae24855fa71b48cf402f

* chore: consume IOM 5.1.6 (#100802)
  • Loading branch information
jlistemann-ish authored Oct 24, 2024
1 parent bac9ac4 commit 57e3fca
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 14 deletions.
6 changes: 6 additions & 0 deletions devenv-4-iom/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ you are currently using. To do so, please update _devenv-4-iom_ as often as poss
There exists no backward compatibility the other way around. There is no information available, which version of _devenv-4-iom_ is required by
a certain version of IOM.

# Release information 2.6.1

## Fixed Bugs

* _apply sql-scripts_ failed on Windows. <!-- #94870 -->

# Release information 2.6.0

### Access to Documentation of SOAP- and REST-APIs <!-- #92163 -->
Expand Down
2 changes: 1 addition & 1 deletion devenv-4-iom/bin/devenv-cli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2330,7 +2330,7 @@ create-postgres() {
log_msg INFO "create-postgres: successfully linked docker volume to database storage" < "$TMP_OUT"
fi
else
log_msg INFO "create-postges: no need to link docker volume to dabase storage" < /dev/null
log_msg INFO "create-postgres: no need to link docker volume to database storage" < /dev/null
fi
if [ "$SUCCESS" = 'true' ]; then
if ! kube_pod_started postgres; then
Expand Down
20 changes: 13 additions & 7 deletions devenv-4-iom/bin/template-variables
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DEVENV4IOM_VERSION=2.6.0
DEVENV4IOM_VERSION=2.6.1

################################################################################
# Defaults
Expand Down Expand Up @@ -393,11 +393,17 @@ fi
# A file or directory can be passed. It's necessary to split SQL_SRC into directory-
# and file-part, as these variables are required inside the job-template.
SQL_SRC="${SQL_SRC}"
if [ -d "$SQL_SRC" ]; then
sqlDir="$SQL_SRC"
else
sqlFile=$(basename "$SQL_SRC")
sqlDir=$(dirname "$SQL_SRC")
# define variable containing the according absolute path
sqlDirAbs=
if [ ! -z "$SQL_SRC" ]; then
if echo "$SQL_SRC" | grep -q '^/'; then
sqlDirAbs="$(realpath "$(dirname "$SQL_SRC")")"
else
sqlDirAbs="$(realpath "$(dirname "$PROJECT_DIR/$SQL_SRC")")"
fi
if [ -f "$SQL_SRC" ]; then
sqlFile=$(basename "$SQL_SRC")
fi
fi

OMS_LOGLEVEL_CONSOLE=${OMS_LOGLEVEL_CONSOLE:-WARN}
Expand All @@ -410,4 +416,4 @@ OMS_LOGLEVEL_SCRIPTS=${OMS_LOGLEVEL_SCRIPTS:-INFO}
OMS_LOGLEVEL_DEVENV=${OMS_LOGLEVEL_DEVENV:-INFO}
OMS_LOG_REST_IDS=${OMS_LOG_REST_IDS}

CREATE_TEST_CONFIG="${CREATE_TEST_CONFIG:-true}"
CREATE_TEST_CONFIG="${CREATE_TEST_CONFIG:-true}"
2 changes: 1 addition & 1 deletion devenv-4-iom/templates/apply-sql.yml.template
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ spec:
volumes:
- name: sql-dir-volume
hostPath:
path: "${sqlDir}"
path: "${MOUNT_PREFIX}${sqlDirAbs}"
backoffLimit: 0
6 changes: 3 additions & 3 deletions devenv.project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ IMAGE_PULL_POLICY=IfNotPresent
IMAGE_PULL_SECRET=

# postgres image (name:tag)
# example: postgres:11
DOCKER_DB_IMAGE=postgres:15
# example: postgres:15
DOCKER_DB_IMAGE=postgres:16

# mail-server image (name:tag)
# example: axllent/mailpit
Expand Down Expand Up @@ -82,7 +82,7 @@ IOM_APP_IMAGE=
# local image: iom:4.1.0
# locally built project image: prj-iom:1.2.0-SNAPSHOT
# IOM release from ISH registry: docker.tools.intershop.com/iom/intershophub/iom:4.1.0
IOM_IMAGE=docker.io/library/iom-blueprint-project-iom:1.6.0
IOM_IMAGE=docker.io/library/iom-blueprint-project-iom:1.7.0

################################################################################
# Database Configuration
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@

<groupId>com.intershop.oms.blueprint</groupId>
<artifactId>iom-blueprint-project</artifactId>
<version>1.6.0</version>
<version>1.7.0</version>
<packaging>war</packaging>
<name>IOM iom-blueprint-project APPLICATION</name>
<description>IOM blueprint-project</description>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<platform.version>5.0.0</platform.version>
<platform.version>5.1.6</platform.version>
<intershop.docker.repo>docker.tools.intershop.com/iom/intershophub/</intershop.docker.repo>
<image.base.name>iom-blueprint-project</image.base.name>
<image.version.suffix></image.version.suffix>
Expand Down

0 comments on commit 57e3fca

Please sign in to comment.