chore: release 1.5.0 (#103)

* chore: prepared 1.5.0-SNAPSHOT * chore: migration to iom 4.4.0 + postgres 15 (#91) (#93) * migrated to iom 4.4.0 (#91) * use postgres 15, removed 2 obsolte image properties in project properties (#91) * cleanup (#91) * use WildFly 27.0.1.Final #(91) * ci: fix ADO sync race condition * feat: enhance view of custom positions view (#94) * chore: formatting in 008_ProductImport.sql * added product images for demo purposes * moved product images into dedicated folder + links to knowledge base in sql-config * additional configs * chore: upgrade to IOM 4.4.4 (#85475) * Update README.md * Update README.md * chore: use TFW release 4.5.0 (#82507) * chore: uses iom 4.5.0 * feat: added custom information to be dispayed on login (#99) * fix: project description is shown now too, if built locally (#85749) (#100) Co-authored-by: Andreas Herold <[email protected]> * chore: iom 4.5.1 + dbaccount 1.7.0 (#85901) * chore: use TFW 5.1, remove deprecations for tfw12 (#85544) (#101) * chore: remove deprecations from TFW#12 (#85544) * chore: remove deprecations from TFW#12 (#85544) * test: switch to TFW 5.1.0 --------- Co-authored-by: Götz Tänzer <[email protected]> * feature/opentrans example transformer (#102) * feat: add example transformer for ICM product data, openTRANS * feat: added config for example transformer for ICM product data * feat: added config for example transformer for openTrans dispatches pulled from ftp + some other adjustments * feat: both transformers are working + example files --------- Co-authored-by: Philipp Borchert <[email protected]> * chore: based on IOM 4.7.0 (#81800 ) --------- Co-authored-by: Götz Tänzer <[email protected]> Co-authored-by: Andreas Herold <[email protected]> Co-authored-by: Andreas Herold <[email protected]> Co-authored-by: Philipp Borchert <[email protected]>
intershop · Nov 10, 2023 · f820497 · f820497
1 parent 2942360
commit f820497
Show file tree

Hide file tree

Showing 89 changed files with 49,097 additions and 351 deletions.
diff --git a/.github/workflows/sync-to-azure-boards.yml b/.github/workflows/sync-to-azure-boards.yml
@@ -8,6 +8,8 @@ on:
 jobs:
   alert:
     runs-on: ubuntu-latest
+    concurrency:
+      group: sync-to-azure-boards
     steps:
       - uses: danhellem/github-actions-issue-to-work-item@master
         env:

diff --git a/README.md b/README.md
@@ -15,4 +15,4 @@ Checkout [How to Start](https://support.intershop.com/kb/index.php/Display/30097
 
 ## License
 
-The Intershop Order Management Blueprint Project is published as [MIT license](./LICENSE).
+The Intershop Order Management Blueprint Project is published as [MIT license](./LICENSE).
diff --git a/devenv.project.properties b/devenv.project.properties
@@ -42,43 +42,21 @@ IMAGE_PULL_POLICY=IfNotPresent
 IMAGE_PULL_SECRET=
 
 # postgres image (name:tag)
-# example:                  postgres:11
-DOCKER_DB_IMAGE=postgres:14
+DOCKER_DB_IMAGE=postgres:15
 
 # mailhog image (name:tag)
-# example:                  mailhog/mailhog
 MAILHOG_IMAGE=mailhog/mailhog
 
 # iom dbaccount image (name:tag)
-# examples:
-# local image:                      iom-dbaccount:1.3.0.0
-# release from ISH Docker registry: docker.intershop.de/intershophub/iom-dbaccount:1.3.0.0
-IOM_DBACCOUNT_IMAGE=docker.tools.intershop.com/iom/intershophub/iom-dbaccount:1.6.0
-
-# iom config image (name:tag)
-# examples:
-# local image:                      iom-config:3.7.0.0
-# locally built project image:      prj-iom-config:3.7.0.0-1.2.0.0-SNAPSHOT
-# IOM release from ISH registry:    docker.intershop.de/intershophub/iom-config:3.7.0.0
-IOM_CONFIG_IMAGE=
-
-# iom app image (name:tag)
-# examples:
-# local image:                      iom-app:3.7.0.0
-# locally built project image:      prj-iom-app:3.7.0.0-1.2.0.0-SNAPSHOT
-# IOM release from ISH registry:    docker.intershop.de/intershophub/iom-app:3.7.0.0
-IOM_APP_IMAGE=
+# release from ISH Docker registry
+IOM_DBACCOUNT_IMAGE=docker.tools.intershop.com/iom/intershophub/iom-dbaccount:1.7.0
 
 # iom image (name:tag)
-# beginning with IOM 4 the distribution model of IOM was changed from two to one
-# docker image. devenv-4-iom can be used with both types of IOM, double and
-# single image distribution.
-# If IOM_IMAGE is set, the properties IOM_CONFIG_IMAGE and IOM_APP_IMAGE will
-# be ignored.
 # examples:
 # local image:                      iom:4.1.2
+# locally built project image:      prj-iom:4.1.2-1.2.0.0-SNAPSHOT
 # IOM release from ISH registry:    docker.intershop.de/intershophub/iom:4.1.2
-IOM_IMAGE=docker.io/library/iom-blueprint-project-iom:1.4.0
+IOM_IMAGE=docker.io/library/iom-blueprint-project-iom:1.5.0
 
 ################################################################################
 # Database Configuration

diff --git a/docs/product-images/7030019-3759.jpg b/docs/product-images/7030019-3759.jpg
diff --git a/docs/product-images/896737-2027.jpg b/docs/product-images/896737-2027.jpg
diff --git a/pom.xml b/pom.xml
@@ -6,26 +6,27 @@
 
     <groupId>com.intershop.oms.blueprint</groupId>
     <artifactId>iom-blueprint-project</artifactId>
-    <version>1.4.0</version>
+    <version>1.5.0</version>
     <packaging>war</packaging>
     <name>IOM iom-blueprint-project APPLICATION</name>
-    <description>IOM iom-blueprint-project APPLICATION</description>
+    <description>IOM blueprint-project</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <platform.version>4.3.3</platform.version>
+        <platform.version>4.7.0</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>
         <image.version>${project.version}${image.version.suffix}</image.version>
         <image.docker.opts>--docker-opts="--no-cache"</image.docker.opts>
         <ubuntu.mirror.x64>http://azure.archive.ubuntu.com/ubuntu/</ubuntu.mirror.x64>
         <maven.javadoc.skip>true</maven.javadoc.skip>
-        <wildfly.version>26.1.2.Final</wildfly.version>
+        <wildfly.version>27.0.1.Final</wildfly.version>
         <org.junit.version>5.7.2</org.junit.version>
         <org.mockito.version>4.6.1</org.mockito.version>
         <net.bytebuddy.version>1.12.10</net.bytebuddy.version>
         <org.apache.commons-lang.version>3.12.0</org.apache.commons-lang.version>
+        <testframework.version>6.0.0</testframework.version>
     </properties>
 
     <repositories>
@@ -45,7 +46,7 @@
         <dependencies>
             <dependency>
                 <groupId>org.wildfly.bom</groupId>
-                <artifactId>wildfly-jakartaee8-with-tools</artifactId>
+                <artifactId>wildfly-ee-with-tools</artifactId>
                 <scope>import</scope>
                 <type>pom</type>
                 <version>${wildfly.version}</version>
@@ -171,7 +172,7 @@
         <dependency>
             <groupId>com.intershop.oms</groupId>
             <artifactId>iom-test-framework</artifactId>
-            <version>4.1.1</version>
+            <version>${testframework.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -316,25 +317,36 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxb2-maven-plugin</artifactId>
-                <version>2.5.0</version>
+                <groupId>com.evolvedbinary.maven.jvnet</groupId>
+                <artifactId>jaxb30-maven-plugin</artifactId>
+                <version>0.15.0</version>
                 <executions>
                     <execution>
-                        <id>xjc_ubl</id>
+                        <id>generate-icm-schemas</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <schemaDirectory>src/main/resources/xsd</schemaDirectory>
+                            <schemaIncludes>
+                                <include>catalog.xsd</include>
+                            </schemaIncludes>
+                            <generateDirectory>${project.build.directory}/generated-sources/xjc_enfinity</generateDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>generate-opentrans-schemas</id>
                         <goals>
-                            <goal>xjc</goal>
+                            <goal>generate</goal>
                         </goals>
                         <configuration>
-                            <laxSchemaValidation>true</laxSchemaValidation>
-                            <target>2.2</target>
-                            <sources>
-                                <source>src/main/resources/xsd/catalog.xsd</source>
-                            </sources>
-                            <failOnNoSchemas>true</failOnNoSchemas>
-                            <generateEpisode>true</generateEpisode>
-                            <outputDirectory>${project.build.directory}/generated-sources/xjc_enfinity</outputDirectory>
+                            <schemaDirectory>src/main/resources/xsd/opentrans</schemaDirectory>
+                            <schemaIncludes>
+                                <include>opentrans_2_1.xsd</include>
+                            </schemaIncludes>
+                            <generateDirectory>${project.build.directory}/generated-sources/xjc_opentrans</generateDirectory>
                         </configuration>
                     </execution>
                 </executions>
@@ -428,6 +440,7 @@
                                     <environmentVariables>
                                         <IMAGE_BASE_NAME>${image.base.name}</IMAGE_BASE_NAME>
                                         <PROJECT_VERSION>${project.version}</PROJECT_VERSION>
+                                        <PROJECT_DESCRIPTION>${project.description}</PROJECT_DESCRIPTION>
                                         <IMAGE_TAG>${image.version}</IMAGE_TAG>
                                         <IOM_IMAGE_NAME>iom</IOM_IMAGE_NAME>
                                         <IOM_VERSION>${platform.version}</IOM_VERSION>

diff --git a/src/main/java/com/intershop/oms/blueprint/approval/CashOnDeliveryApprovalDecisionBean.java b/src/main/java/com/intershop/oms/blueprint/approval/CashOnDeliveryApprovalDecisionBean.java
@@ -1,8 +1,8 @@
 package com.intershop.oms.blueprint.approval;
 
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 import bakery.logic.service.util.AbstractExecutionDecider;
 import bakery.persistence.dataobject.common.PaymentDefDO;

diff --git a/src/main/java/com/intershop/oms/blueprint/approval/OrderValueApprovalDecisionBean.java b/src/main/java/com/intershop/oms/blueprint/approval/OrderValueApprovalDecisionBean.java
@@ -2,9 +2,9 @@
 
 import java.math.BigDecimal;
 
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 import bakery.logic.service.util.AbstractExecutionDecider;
 import bakery.persistence.dataobject.configuration.supplier.Shop2Supplier2ApprovalTypeDefDO;

diff --git a/src/main/java/com/intershop/oms/blueprint/approval/RmaApprovalDecisionBean.java b/src/main/java/com/intershop/oms/blueprint/approval/RmaApprovalDecisionBean.java
@@ -1,8 +1,8 @@
 package com.intershop.oms.blueprint.approval;
 
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
+import jakarta.ejb.Stateless;
+import jakarta.ejb.TransactionAttribute;
+import jakarta.ejb.TransactionAttributeType;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/src/main/java/com/intershop/oms/blueprint/email/SendEmailDecisionBean.java b/src/main/java/com/intershop/oms/blueprint/email/SendEmailDecisionBean.java
@@ -3,8 +3,8 @@
 import java.util.EnumSet;
 import java.util.List;
 
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
+import jakarta.ejb.EJB;
+import jakarta.ejb.Stateless;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

diff --git a/src/main/java/com/intershop/oms/blueprint/icmtransformer/BasicDataCSV.java b/src/main/java/com/intershop/oms/blueprint/icmtransformer/BasicDataCSV.java
@@ -0,0 +1,45 @@
+package com.intershop.oms.blueprint.icmtransformer;
+
+import com.intershop.oms.blueprint.upload.transform.CSVTable;
+import org.apache.commons.lang3.StringUtils;
+
+public enum BasicDataCSV implements CSVTable
+{
+    supplierArticleNo(StringUtils.EMPTY),
+    manufacturer("MyTrustedManufacturer"),
+    manufacturerArticleNo(StringUtils.EMPTY),
+    ISBN(StringUtils.EMPTY),
+    EAN(StringUtils.EMPTY),
+    articleName(StringUtils.EMPTY),
+    length(StringUtils.EMPTY),
+    height(StringUtils.EMPTY),
+    width(StringUtils.EMPTY),
+    weight(StringUtils.EMPTY),
+    assortmentName("Dummy"),
+    assortmentIdentifier("Dummy"),
+    deliveryForm(StringUtils.EMPTY),
+    customsTariffNo(StringUtils.EMPTY),
+    parentSupplierArticleNo(StringUtils.EMPTY),
+    articleForm(StringUtils.EMPTY),
+    immaterialUid(StringUtils.EMPTY),
+    articleLanguage(StringUtils.EMPTY),
+    supplierSalesCode(StringUtils.EMPTY),
+    supplierArticleIdentifier(StringUtils.EMPTY),
+    articleType("1"),
+    edition(StringUtils.EMPTY),
+    packagingUnit(StringUtils.EMPTY),
+    packagingUnitValue(StringUtils.EMPTY);
+
+    private String defaultValue;
+
+    private BasicDataCSV(String defaultValue)
+    {
+        this.defaultValue = defaultValue;
+    }
+
+    @Override
+    public String getDefaultValue()
+    {
+        return defaultValue;
+    }
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,4 @@ Checkout [How to Start](https://support.intershop.com/kb/index.php/Display/30097

		## License

		The Intershop Order Management Blueprint Project is published as [MIT license](./LICENSE).
		The Intershop Order Management Blueprint Project is published as [MIT license](./LICENSE).