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.

Sign up for GitHub

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

1303-update-main-version-to-10300 #1304

Merged
merged 1 commit into from
Dec 16, 2024
Merged

1303-update-main-version-to-10300 #1304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion installation/build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
<dependency>
<groupId>com.gip.xyna</groupId>
<artifactId>xynafactory</artifactId>
<version>10.2.0.0</version>
<version>10.3.0.0</version>
</dependency>
<dependency>
<groupId>com.gip.xyna</groupId>
Expand Down
2 changes: 1 addition & 1 deletion installation/delivery/delivery.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ delivery.name=Xyna
#directory to store the delivery item
delivery.dir=/tmp
#release number of the delivery item
release.number=v10.2.0.0
release.number=v10.3.0.0
2 changes: 1 addition & 1 deletion server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.gip.xyna</groupId>
<artifactId>xynafactory</artifactId>
<version>10.2.0.0</version>
<version>10.3.0.0</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down
6 changes: 6 additions & 0 deletions server/src/com/gip/xyna/update/Updater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1810,6 +1810,12 @@ private void init() {
ud.addFollowingBranchVersionsAsAllowedForUpdate(3); //10.1.x.x darf hier drauf updaten
updates.add(ud);

// 10.3.0.0
Version v474 = new Version(v473).increaseToMajorVersion(2, 1);
ud = new UpdateJustVersion(v473, v474);
ud.addFollowingBranchVersionsAsAllowedForUpdate(3); //10.2.x.x darf hier drauf updaten
updates.add(ud);

//ACHTUNG: bei updates in einem branch muss gewährleistet werden, dass alle späteren versionen (trunk, spätere branches)
// auf dem branch updaten können. bei updates, die in späteren versionen dann sonderbehandlungen im update-
// prozess benötigen, müssen die versionen, auf denen die updates passieren sollen, oben genau angegeben werden.
Expand Down
Loading