Merge pull request #9565 from github/post-release-prep/codeql-cli-2.9.4

Post-release preparation for codeql-cli-2.9.4
Merge pull request #9591 from smowton/smowton/admin/cherry-pick-kotlin-1.7-ci-fixes
2026-05-20 22:27:18 +02:00 · 2022-06-21 11:51:29 +02:00 · 2022-06-17 14:14:28 +01:00 · 2022-06-17 12:36:26 +01:00 · 2022-06-15 13:25:20 +00:00
19 changed files with 21 additions and 21 deletions
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 0.2.3
+version: 0.2.4-dev
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-queries
-version: 0.1.4
+version: 0.1.5-dev
 groups: 
  - cpp
  - queries
--- a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-all
-version: 1.1.4
+version: 1.1.5-dev
 groups:
    - csharp
    - solorigate
--- a/csharp/ql/campaigns/Solorigate/src/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-queries
-version: 1.1.4
+version: 1.1.5-dev
 groups:
    - csharp
    - solorigate
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 0.2.3
+version: 0.2.4-dev
 groups: csharp
 dbscheme: semmlecode.csharp.dbscheme
 extractor: csharp
--- a/csharp/ql/src/qlpack.yml
+++ b/csharp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-queries
-version: 0.1.4
+version: 0.1.5-dev
 groups: 
  - csharp
  - queries
--- a/go/ql/lib/qlpack.yml
+++ b/go/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-all
-version: 0.1.4
+version: 0.1.5-dev
 groups: go
 dbscheme: go.dbscheme
 extractor: go
--- a/go/ql/src/qlpack.yml
+++ b/go/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-queries
-version: 0.1.4
+version: 0.1.5-dev
 groups:
  - go
  - queries
--- a/java/kotlin-extractor/kotlin_plugin_versions.py
+++ b/java/kotlin-extractor/kotlin_plugin_versions.py
@@ -15,11 +15,11 @@ def is_windows():
    return False

 def version_tuple_to_string(version):
-    return f'{version[0]}.{version[1]}.{version[2]}'
+    return f'{version[0]}.{version[1]}.{version[2]}{version[3]}'

 def version_string_to_tuple(version):
-    m = re.match(r'([0-9]+)\.([0-9]+)\.([0-9]+)', version)
-    return tuple([int(m.group(i)) for i in range(1, 4)])
+    m = re.match(r'([0-9]+)\.([0-9]+)\.([0-9]+)(.*)', version)
+    return tuple([int(m.group(i)) for i in range(1, 4)] + [m.group(4)])

 many_versions = [ '1.4.32', '1.5.0', '1.5.10', '1.5.21', '1.5.31', '1.6.10', '1.7.0-RC', '1.6.20' ]

--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 0.2.3
+version: 0.2.4-dev
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-queries
-version: 0.1.4
+version: 0.1.5-dev
 groups: 
  - java
  - queries
--- a/javascript/ql/experimental/adaptivethreatmodeling/src/codeql-pack.lock.yml
+++ b/javascript/ql/experimental/adaptivethreatmodeling/src/codeql-pack.lock.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
  codeql/javascript-experimental-atm-model:
-    version: 0.2.0
+    version: 0.1.0
 compiled: false
 lockVersion: 1.0.0
--- a/javascript/ql/experimental/adaptivethreatmodeling/src/qlpack.yml
+++ b/javascript/ql/experimental/adaptivethreatmodeling/src/qlpack.yml
@@ -8,4 +8,4 @@ groups:
    - experimental
 dependencies:
    codeql/javascript-experimental-atm-lib: "*"
-    codeql/javascript-experimental-atm-model: "0.2.0"
+    codeql/javascript-experimental-atm-model: "0.1.0"
--- a/javascript/ql/lib/qlpack.yml
+++ b/javascript/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-all
-version: 0.1.4
+version: 0.1.5-dev
 groups: javascript
 dbscheme: semmlecode.javascript.dbscheme
 extractor: javascript
--- a/javascript/ql/src/qlpack.yml
+++ b/javascript/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-queries
-version: 0.1.4
+version: 0.1.5-dev
 groups: 
  - javascript
  - queries
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-all
-version: 0.4.1
+version: 0.4.2-dev
 groups: python
 dbscheme: semmlecode.python.dbscheme
 extractor: python
--- a/python/ql/src/qlpack.yml
+++ b/python/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-queries
-version: 0.1.4
+version: 0.1.5-dev
 groups: 
  - python
  - queries
--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-all
-version: 0.2.3
+version: 0.2.4-dev
 groups: ruby
 extractor: ruby
 dbscheme: ruby.dbscheme
--- a/ruby/ql/src/qlpack.yml
+++ b/ruby/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-queries
-version: 0.1.4
+version: 0.1.5-dev
 groups: 
  - ruby
  - queries
Author	SHA1	Message	Date
Anders Schack-Mulligen	d7d409f125	Merge pull request #9565 from github/post-release-prep/codeql-cli-2.9.4 Post-release preparation for codeql-cli-2.9.4	2022-06-21 11:51:29 +02:00
Chris Smowton	91ec8a3447	Merge pull request #9591 from smowton/smowton/admin/cherry-pick-kotlin-1.7-ci-fixes Cherry-pick: Fix Kotlin single-version build when the best candidate has trailing version info	2022-06-17 14:14:28 +01:00
Chris Smowton	95982d2587	Fix Kotlin single-version build when the best candidate has trailing version info For example, 1.7.0-RC would previously be truncated to 1.7.0 resulting in failure to build the single-version distro as all candidate alternate-version kotlin files would be ignored.	2022-06-17 12:36:26 +01:00
github-actions[bot]	1ed70d51d7	Post-release preparation for codeql-cli-2.9.4	2022-06-15 13:25:20 +00:00