Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@openi40
openi40 committed Jun 7, 2024
2 parents a03f581 + fbd1858 commit 2763e9f
Show file tree
Hide file tree
Showing 105 changed files with 140 additions and 2,043 deletions.
30 changes: 30 additions & 0 deletions change-version-branch.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/bash
export CURRENT_BRANCH=`git branch --show-current`
if [ "$CURRENT_BRANCH" = "develop" ]; then
echo "We are correctly in develop branch"
else
echo "We are in the $CURRENT_BRANCH but this script can be run only from develop branch"
exit -1
fi
if [ -n "$1" ]
then
echo "Old version: $1"
else
echo "Required actual version as 1st parameter"
exit 1
fi
if [ -n "$2" ]
then
echo "New version: $2"
else
echo "Required New version as 2nd parameter"
exit 1
fi
echo "Changing from version $1 to $2"
export NEW_VERSION_BRANCH="feature/change-version-$2"
echo "Create new version branch $NEW_VERSION_BRANCH"
git checkout -b $NEW_VERSION_BRANCH
find . -name pom.xml | xargs sed -i s/"$1"/"$2"/
find . -name pom.xml | xargs git stage
git commit -m"Changed version from $1 to $2"

20 changes: 0 additions & 20 deletions change-version.sh
View file

This file was deleted.

2 changes: 1 addition & 1 deletion com.openi40.logistics.parent/opemi40-operational-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.openi40.logistics.parent</groupId>
<artifactId>com.openi40.logistics.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>opemi40-operational-model</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion com.openi40.logistics.parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.openi40</groupId>
<artifactId>com.openi40.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<groupId>com.openi40.logistics.parent</groupId>
<artifactId>com.openi40.logistics.parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion openi40.commons/Mapper/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.commons</groupId>
<artifactId>com.openi40.commons.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>

</parent>
<artifactId>Mapper</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion openi40.commons/WebConfigs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.openi40.commons</groupId>
<artifactId>com.openi40.commons.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>WebConfigs</artifactId>
</project>
2 changes: 1 addition & 1 deletion openi40.commons/multithreading-config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.openi40.commons</groupId>
<artifactId>com.openi40.commons.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>multithreading-config</artifactId>
</project>
2 changes: 1 addition & 1 deletion openi40.commons/openi40-tests-support/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.commons</groupId>
<artifactId>com.openi40.commons.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40-tests-support</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.commons/persistence-datamodel-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.commons</groupId>
<artifactId>com.openi40.commons.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>persistence-datamodel-utils</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.commons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40</groupId>
<artifactId>com.openi40.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<groupId>com.openi40.commons</groupId>
<artifactId>com.openi40.commons.parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion openi40.mes/openi40-mes-shared-assets/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.mes</groupId>
<artifactId>com.openi40.mes.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40-mes-shared-assets</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.mes/openi40-mes-shared-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.mes</groupId>
<artifactId>com.openi40.mes.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40-mes-shared-model</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.mes/openi40.mes.iiot/openi40-mes-integrations-ifaces/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.mes.iiot</groupId>
<artifactId>com.openi40.mes.iiot.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40-mes-integrations-ifaces</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.mes/openi40.mes.iiot/openi40-mes-io/openi40-mes-aps-broker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.mes.io</groupId>
<artifactId>openi40-mes-io</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40-mes-aps-broker</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.mes/openi40.mes.iiot/openi40-mes-io/openi40-mes-generical-mqtt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.mes.io</groupId>
<artifactId>openi40-mes-io</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40-mes-generical-mqtt</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.mes/openi40.mes.iiot/openi40-mes-io/openi40-mes-generical-rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.openi40.mes.io</groupId>
<artifactId>openi40-mes-io</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40-mes-generical-rest</artifactId>
</project>
2 changes: 1 addition & 1 deletion openi40.mes/openi40.mes.iiot/openi40-mes-io/openi40-mes-rabbitmq/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.mes.io</groupId>
<artifactId>openi40-mes-io</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40-mes-rabbitmq</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.mes/openi40.mes.iiot/openi40-mes-io/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.openi40.mes.iiot</groupId>
<artifactId>com.openi40.mes.iiot.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<groupId>com.openi40.mes.io</groupId>
<artifactId>openi40-mes-io</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion openi40.mes/openi40.mes.iiot/openi40-mes-logical-kernel.app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.mes.iiot</groupId>
<artifactId>com.openi40.mes.iiot.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40-mes-logical-kernel.app</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.mes/openi40.mes.iiot/openi40-mes-logicalmsg-ifaces/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.openi40.mes.iiot</groupId>
<artifactId>com.openi40.mes.iiot.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40-mes-logicalmsg-ifaces</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.mes/openi40.mes.iiot/openi40-mes-logicalmsg-kernel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.mes.iiot</groupId>
<artifactId>com.openi40.mes.iiot.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40-mes-logicalmsg-kernel</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.mes/openi40.mes.iiot/openi40-mes-logicalmsg-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.mes.iiot</groupId>
<artifactId>com.openi40.mes.iiot.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40-mes-logicalmsg-model</artifactId>
</project>
2 changes: 1 addition & 1 deletion openi40.mes/openi40.mes.iiot/openi40-mes-logicalmsg-persistence/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.mes.iiot</groupId>
<artifactId>com.openi40.mes.iiot.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>

<artifactId>openi40-mes-logicalmsg-persistence</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion openi40.mes/openi40.mes.iiot/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.mes</groupId>
<artifactId>com.openi40.mes.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>com.openi40.mes.iiot.parent</artifactId>
<groupId>com.openi40.mes.iiot</groupId>
Expand Down
2 changes: 1 addition & 1 deletion openi40.mes/openi40.mes.workstation/openi40-mes-asset-workstation-angular-app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.mes.workstation</groupId>
<artifactId>com.openi40.mes.workstation.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40-mes-asset-workstation-angular-app</artifactId>

Expand Down
2 changes: 1 addition & 1 deletion openi40.mes/openi40.mes.workstation/openi40-mes-asset-workstation-app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.openi40.mes.workstation</groupId>
<artifactId>com.openi40.mes.workstation.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40-mes-asset-workstation-app</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.mes/openi40.mes.workstation/openi40-mes-asset-workstation-support/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.mes.workstation</groupId>
<artifactId>com.openi40.mes.workstation.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40-mes-asset-workstation-support</artifactId>
<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions openi40.mes/openi40.mes.workstation/openi40-mes-task-tracking-model/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.mes.workstation</groupId>
<artifactId>com.openi40.mes.workstation.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40-mes-task-tracking-model</artifactId>
<dependencies>
Expand All @@ -22,7 +22,7 @@
<dependency>
<groupId>com.openi40.mes.workstation</groupId>
<artifactId>openi40-mes-asset-workstation-support</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion openi40.mes/openi40.mes.workstation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.mes</groupId>
<artifactId>com.openi40.mes.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<groupId>com.openi40.mes.workstation</groupId>
<artifactId>com.openi40.mes.workstation.parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion openi40.mes/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40</groupId>
<artifactId>com.openi40.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>com.openi40.mes.parent</artifactId>
<groupId>com.openi40.mes</groupId>
Expand Down
2 changes: 1 addition & 1 deletion openi40.platform/IOMessages.Processing/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.openi40.platform</groupId>
<artifactId>com.openi40.platform.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>IOMessages.Processing</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.platform/Persistence.Config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.platform</groupId>
<artifactId>com.openi40.platform.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>Persistence.Config</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.platform/Persistence.IOMessages.Controllers/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.openi40.platform</groupId>
<artifactId>com.openi40.platform.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>Persistence.IOMessages.Controllers</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.platform/Persistence.IOMessages.Spooling/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.openi40.platform</groupId>
<artifactId>com.openi40.platform.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>Persistence.IOMessages.Spooling</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.platform/Persistence.Input.Channel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.openi40.platform</groupId>
<artifactId>com.openi40.platform.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>Persistence.Input.Channel</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.platform/Persistence.Output.Channel/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.platform</groupId>
<artifactId>com.openi40.platform.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>Persistence.Output.Channel</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.platform/openi40.app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.openi40.platform</groupId>
<artifactId>com.openi40.platform.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40.app</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.platform/openi40.backoffice/openi40.backoffice.app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.openi40.platform</groupId>
<artifactId>openi40.backoffice</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40.backoffice.app</artifactId>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion openi40.platform/openi40.backoffice/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.openi40.platform</groupId>
<artifactId>com.openi40.platform.parent</artifactId>
<version>00.42.BETA-SNAPSHOT</version>
<version>00.42.00-SNAPSHOT</version>
</parent>
<artifactId>openi40.backoffice</artifactId>
<packaging>pom</packaging>
Expand Down
Loading

0 comments on commit 2763e9f

Please sign in to comment.