Merge branch 'version_9_6_0' into 'master'

version 9.6.0 See merge request codekeeper/codekeeper!837
pgcodekeeper · May 14, 2024 · cb719ee · cb719ee
2 parents 4be3318 + 7a1454a
commit cb719ee
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+### Changed
+
+### Fixed
+
+## [9.6.0] - 2024-05-14
+
+### Added
+
 - Added support for POLICY object in ClickHouse.
 
 ### Changed
@@ -24,7 +32,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
-- Fixed behaviours of domain field in DB settings.
+- Fixed behaviour of domain field in DB settings.
 - Fixed an error while read ClickHouse DB.
 
 ## [9.5.0] - 2024-04-09
@@ -1915,7 +1923,8 @@ We increment major version in this release due to decision to shift our developm
 
 - ORDER BY parsing has been added to the aggregate functions.
 
-[Unreleased]: https://github.com/pgcodekeeper/pgcodekeeper/compare/v9.5.1...HEAD
+[Unreleased]: https://github.com/pgcodekeeper/pgcodekeeper/compare/v9.6.0...HEAD
+[9.6.0]: https://github.com/pgcodekeeper/pgcodekeeper/compare/v9.5.1...v9.6.0
 [9.5.1]: https://github.com/pgcodekeeper/pgcodekeeper/compare/v9.5.0...v9.5.1
 [9.5.0]: https://github.com/pgcodekeeper/pgcodekeeper/compare/v9.4.3...v9.5.0
 [9.4.3]: https://github.com/pgcodekeeper/pgcodekeeper/compare/v9.4.2...v9.4.3

diff --git a/CHANGELOG.ru.md b/CHANGELOG.ru.md
@@ -9,6 +9,14 @@
 
 ### Добавлено
 
+### Изменено
+
+### Исправлено
+
+## [9.6.0] - 2024-05-14
+
+### Добавлено
+
 - Добавлена поддержка объекта POLICY в ClickHouse.
 
 ### Изменено
@@ -1916,7 +1924,8 @@
 
 - Добавлен парсинг ORDER BY для агрегатных функции.
 
-[Новое]: https://github.com/pgcodekeeper/pgcodekeeper/compare/v9.5.1...HEAD
+[Новое]: https://github.com/pgcodekeeper/pgcodekeeper/compare/v9.6.0...HEAD
+[9.6.0]: https://github.com/pgcodekeeper/pgcodekeeper/compare/v9.5.1...v9.6.0
 [9.5.1]: https://github.com/pgcodekeeper/pgcodekeeper/compare/v9.5.0...v9.5.1
 [9.5.0]: https://github.com/pgcodekeeper/pgcodekeeper/compare/v9.4.3...v9.5.0
 [9.4.3]: https://github.com/pgcodekeeper/pgcodekeeper/compare/v9.4.2...v9.4.3

diff --git a/pom.xml b/pom.xml
@@ -31,8 +31,8 @@
     </modules>
 
     <properties>
-        <revision>9.5.1-SNAPSHOT</revision>
-        <ui.revision>4.10.1-SNAPSHOT</ui.revision>
+        <revision>9.6.0-SNAPSHOT</revision>
+        <ui.revision>4.11.0-SNAPSHOT</ui.revision>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

diff --git a/ru.taximaxim.codekeeper.cli/META-INF/MANIFEST.MF b/ru.taximaxim.codekeeper.cli/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: ru.taximaxim.codekeeper.cli;singleton:=true
-Bundle-Version: 9.5.1.qualifier
+Bundle-Version: 9.6.0.qualifier
 Import-Package: org.slf4j;version="[1.7.0,2.0.0)",
  org.slf4j.spi;version="[1.7.0,2.0.0)"
 Bundle-Activator: ru.taximaxim.codekeeper.cli.Activator

diff --git a/ru.taximaxim.codekeeper.cli/pom.xml b/ru.taximaxim.codekeeper.cli/pom.xml
@@ -11,6 +11,6 @@
 
     <groupId>ru.taximaxim.codeKeeper</groupId>
     <artifactId>ru.taximaxim.codekeeper.cli</artifactId>
-    <version>9.5.1-SNAPSHOT</version>
+    <version>9.6.0-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/ru.taximaxim.codekeeper.core/META-INF/MANIFEST.MF b/ru.taximaxim.codekeeper.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: ru.taximaxim.codekeeper.core;singleton:=true
-Bundle-Version: 9.5.1.qualifier
+Bundle-Version: 9.6.0.qualifier
 Export-Package: ru.taximaxim.codekeeper.core,
  ru.taximaxim.codekeeper.core.fileutils,
  ru.taximaxim.codekeeper.core.formatter,

diff --git a/ru.taximaxim.codekeeper.core/pom.xml b/ru.taximaxim.codekeeper.core/pom.xml
@@ -14,7 +14,7 @@
 
     <groupId>ru.taximaxim.codeKeeper</groupId>
     <artifactId>ru.taximaxim.codekeeper.core</artifactId>
-    <version>9.5.1-SNAPSHOT</version>
+    <version>9.6.0-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
     <properties>

diff --git a/ru.taximaxim.codekeeper.mainapp/META-INF/MANIFEST.MF b/ru.taximaxim.codekeeper.mainapp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: ru.taximaxim.codekeeper.mainapp;singleton:=true
-Bundle-Version: 9.5.1.qualifier
+Bundle-Version: 9.6.0.qualifier
 Bundle-Activator: ru.taximaxim.codekeeper.mainapp.Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
  ru.taximaxim.codekeeper.core;bundle-version="[9.0.0,10.0.0)"

diff --git a/ru.taximaxim.codekeeper.mainapp/feature/feature.xml b/ru.taximaxim.codekeeper.mainapp/feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="ru.taximaxim.codekeeper.feature"
       label="%feature.label"
-      version="9.5.1.qualifier"
+      version="9.6.0.qualifier"
       provider-name="%feature.provider-name"
       plugin="ru.taximaxim.codekeeper.mainapp">
 

diff --git a/ru.taximaxim.codekeeper.mainapp/feature/pom.xml b/ru.taximaxim.codekeeper.mainapp/feature/pom.xml
@@ -11,6 +11,6 @@
 
     <groupId>ru.taximaxim.codeKeeper</groupId>
     <artifactId>ru.taximaxim.codekeeper.feature</artifactId>
-    <version>9.5.1-SNAPSHOT</version>
+    <version>9.6.0-SNAPSHOT</version>
     <packaging>eclipse-feature</packaging>
 </project>
diff --git a/ru.taximaxim.codekeeper.mainapp/pom.xml b/ru.taximaxim.codekeeper.mainapp/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>ru.taximaxim.codeKeeper</groupId>
     <artifactId>ru.taximaxim.codekeeper.mainapp</artifactId>
-    <version>9.5.1-SNAPSHOT</version>
+    <version>9.6.0-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
     <build>

diff --git a/ru.taximaxim.codekeeper.mainapp/product/rcp/pom.xml b/ru.taximaxim.codekeeper.mainapp/product/rcp/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>ru.taximaxim.codeKeeper</groupId>
     <artifactId>ru.taximaxim.codekeeper.rcp.product</artifactId>
-    <version>9.5.1-SNAPSHOT</version>
+    <version>9.6.0-SNAPSHOT</version>
     <packaging>eclipse-repository</packaging>
 
     <repositories>

diff --git a/ru.taximaxim.codekeeper.mainapp/product/rcp/ru.taximaxim.codekeeper.rcp.product b/ru.taximaxim.codekeeper.mainapp/product/rcp/ru.taximaxim.codekeeper.rcp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="pgCodeKeeper" uid="ru.taximaxim.codekeeper.rcp.product" id="ru.taximaxim.codekeeper.mainapp.product" application="org.eclipse.ui.ide.workbench" version="9.5.1.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="pgCodeKeeper" uid="ru.taximaxim.codekeeper.rcp.product" id="ru.taximaxim.codekeeper.mainapp.product" application="org.eclipse.ui.ide.workbench" version="9.6.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>

diff --git a/ru.taximaxim.codekeeper.mainapp/product/standalone/pom.xml b/ru.taximaxim.codekeeper.mainapp/product/standalone/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>ru.taximaxim.codeKeeper</groupId>
     <artifactId>ru.taximaxim.codekeeper.standalone.product</artifactId>
-    <version>9.5.1-SNAPSHOT</version>
+    <version>9.6.0-SNAPSHOT</version>
     <packaging>eclipse-repository</packaging>
 
     <properties>

diff --git a/...aximaxim.codekeeper.mainapp/product/standalone/ru.taximaxim.codekeeper.standalone.product b/...aximaxim.codekeeper.mainapp/product/standalone/ru.taximaxim.codekeeper.standalone.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="pgCodeKeeper cli" uid="ru.taximaxim.codekeeper.standalone.product" id="ru.taximaxim.codekeeper.cli.product-codekeeper-standalone" application="ru.taximaxim.codekeeper.cli.application-standalone" version="9.5.1.qualifier" useFeatures="false" includeLaunchers="false">
+<product name="pgCodeKeeper cli" uid="ru.taximaxim.codekeeper.standalone.product" id="ru.taximaxim.codekeeper.cli.product-codekeeper-standalone" application="ru.taximaxim.codekeeper.cli.application-standalone" version="9.6.0.qualifier" useFeatures="false" includeLaunchers="false">
 
    <configIni use="default">
    </configIni>

diff --git a/ru.taximaxim.codekeeper.ui/META-INF/MANIFEST.MF b/ru.taximaxim.codekeeper.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: ru.taximaxim.codekeeper.ui;singleton:=true
-Bundle-Version: 4.10.1.qualifier
+Bundle-Version: 4.11.0.qualifier
 Bundle-Activator: ru.taximaxim.codekeeper.ui.Activator
 Require-Bundle: ru.taximaxim.codekeeper.core;bundle-version="[9.0.0,10.0.0)",
  ru.taximaxim.codekeeper.mainapp,

diff --git a/ru.taximaxim.codekeeper.ui/pom.xml b/ru.taximaxim.codekeeper.ui/pom.xml
@@ -11,6 +11,6 @@
 
     <groupId>ru.taximaxim.codeKeeper</groupId>
     <artifactId>ru.taximaxim.codekeeper.ui</artifactId>
-    <version>4.10.1-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 </project>