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.

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

Update all non-conflicting dependencies from feature/untested-release branch #2977

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f49a074
Update tj-actions/changed-files action to v41 [SECURITY] (#2901)
renovate[bot] Jan 3, 2024
8cdb8c6
Update README.md
orchestr7 Jan 19, 2024
6e20e7a
Removed checksum for gradle-wrapper (#2928)
nulls Feb 28, 2024
a75784b
Update dependency gradle to v8.6 (#2869)
renovate[bot] Feb 28, 2024
1c5f3a9
Update gittools/actions action to v0.12.0 (#2921)
renovate[bot] Mar 1, 2024
36b5690
Update gittools/actions action to v0.13.2 (#2932)
renovate[bot] Mar 5, 2024
967f4db
Update Kotlin core dependencies (#2844)
renovate[bot] Nov 5, 2024
ea640b8
Update Kotlin core dependencies to v1.9.23 (#2937)
renovate[bot] Mar 11, 2024
b97b7c3
Update gittools/actions action to v0.13.4 (#2938)
renovate[bot] Mar 11, 2024
787e2a6
Update all github actions (#2942)
renovate[bot] Mar 18, 2024
0b83dbd
Added COSV diagram (#2957)
Cheshiriks Jul 8, 2024
0b458e4
Update dependency io.github.gradle-nexus:publish-plugin to v2 (#2950)
renovate[bot] Jul 31, 2024
be8154d
Update gittools/actions action to v1.2.0 (#2959)
renovate[bot] Jul 31, 2024
68e0807
Update all github actions (#2949)
renovate[bot] Jul 31, 2024
44db55f
Update dependency org.jetbrains:annotations to v26 (#2962)
renovate[bot] Oct 31, 2024
d31994b
Update tj-actions/changed-files action to v45 (#2960)
renovate[bot] Oct 31, 2024
7d575e1
Update dependency highlight.js to v11.10.0 (#2958)
renovate[bot] Oct 31, 2024
d556c77
Update dependency org.eclipse.jgit:org.eclipse.jgit to v7 (#2961)
renovate[bot] Oct 31, 2024
4912a2e
Update dependency gradle to v8.9 (#2948)
renovate[bot] Oct 31, 2024
e2c9f4f
Update Kotlin core dependencies (#2955)
renovate[bot] Oct 31, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/build-base-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Prepare formatted tags
run: |
echo FORMATTED_TAG=${{ matrix.base_image_tag }} | sed -e "s/-focal$//" | sed -e "s/20.04$/latest/" >> $GITHUB_ENV
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v6
with:
context: save-deploy/base-images
push: true
Expand All @@ -83,7 +83,7 @@ jobs:
registry: ghcr.io
username: saveourtool
password: ${{ secrets.GITHUB_TOKEN }}
- uses: docker/build-push-action@v4
- uses: docker/build-push-action@v6
with:
context: save-demo-cpg/builder
push: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
with:
fetch-depth: 2
- id: git-changed-files
uses: tj-actions/changed-files@v40
uses: tj-actions/changed-files@v45
with:
files_yaml: |
root_gradle:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/helm_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ jobs:
name: Prepare to build from branch
run: |
git switch --force-create ${{ inputs.branch }} origin/${{ inputs.branch }}
- uses: gittools/actions/gitversion/setup@v0.10.2
- uses: gittools/actions/gitversion/setup@v3.0.0
with:
versionSpec: 5.x
- uses: gittools/actions/gitversion/execute@v0.10.2
- uses: gittools/actions/gitversion/execute@v3.0.0
id: calculate-semver
with:
targetPath: ${{ env.CHARTS_DIR }}
Expand Down
18 changes: 14 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,28 @@ Our key focus is to make life of developers who analyze code easier.
- Use SAVE to create an **online demo for your analyzer** and set it up for your community's use;
- Benchmarks Archive with the **list of popular benchmarks** (with a reference to [awesome-benchmarks](https://github.com/saveourtool/awesome-benchmarks)).

2. **VULN** - A platform designed for the **reporting**, aggregation, and deduplication of one-day **vulnerabilities**.
2. **COSV** - A platform designed for the **reporting**, aggregation, and deduplication of one-day **vulnerabilities**.

Additionally, on our platform we host **contests** in the field of code analysis.
Additionally, on our platform we host **contests** in the field of code analysis.
This provides an opportunity for you to submit your automated solutions for bug detection, and compete with other innovative projects.

## Links
- Collection of Code Analyzers Demo: [Demo](https://saveourtool.com/demo)
- Benchmarks Archive: [Benchmarks](https://saveourtool.com/awesome-benchmarks)
- CI projects: [CI Projects](https://saveourtool.com/projects)
- Vulnerabilities Collection: [1-day Vulnerabilities](https://saveourtool.com/vuln/list)
- Vulnerabilities Collection: [1-day Vulnerabilities](https://cosv.gitlink.org.cn)

## Motivation
- [Motivation of **SAVE** and more details](info/SaveMotivation.md)
- Motivation of **VULN** and more details: TBD

## High-level perspective
#### SAVE
![SAVE processing](https://user-images.githubusercontent.com/58667063/146387903-24ba9c91-a2a3-45e7-a07a-cb7bc388e4aa.jpg)

#### COSV
<img width="1306" alt="image" src="https://github.com/saveourtool/save-cloud/assets/58667063/008b0976-98c2-4195-bdf5-570a70b07827">

## Build and deploy
To build the project and run all tests, execute `./gradlew build`.

Expand All @@ -44,4 +48,10 @@ For more detailed instructions, including **deployment instructions**, see [save
proxied as configured in [dev-server.js](../save-frontend/webpack.config.d/dev-server.js). User will be hardcoded with `admin` user.

## Architecture and design
<img src="/info/img/save-diagram.png" width="512px"/>
Save:

<img src="/info/img/save-diagram.png" width="768px"/>

COSV:

<img src="/info/img/cosv-diagram.PNG" width="768px"/>
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[versions]
kotlin = "1.9.10"
jetbrains-annotations = "24.0.1"
kotlin = "1.9.25"
jetbrains-annotations = "26.0.1"
save-cli = "0.3.10"
ktor = "2.3.6"
okio = "3.3.0"
serialization = "1.6.0"
kotlinx-datetime = "0.4.1"
kotlinx-coroutines = "1.7.3"
serialization = "1.6.3"
kotlinx-datetime = "0.5.0"
kotlinx-coroutines = "1.8.1"
kotlin-wrappers = "1.0.0-pre.634"
spring-boot = "2.7.17"
spring-cloud = "3.1.9"
Expand All @@ -18,7 +18,7 @@ diktat = "2.0.0"
detekt = "1.23.3"
liquibase-core = "4.24.0"
docker-java = "3.3.4"
jgit = "6.7.0.202309050840-r"
jgit = "7.0.0.202409031743-r"
mockito = "5.3.1"
mockito-kotlin = "5.0.0"
# only in save-cli
Expand All @@ -36,7 +36,7 @@ kotlinx-cli = "0.3.6"
spotless = "6.22.0"
fabric8 = "6.9.2"
arrow-kt = "1.2.1"
publish = "1.3.0"
publish = "2.0.0"
cpg = "7.1.2"
# should be taken from cpg
cpg-neo4j-ogm = { strictly = "4.0.6" }
Expand Down
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Binary file added info/img/cosv-diagram.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import kotlinx.cinterop.ExperimentalForeignApi
import kotlinx.cinterop.toKString

actual class AtomicLong actual constructor(value: Long) {
private val kotlinAtomicLong = kotlin.native.concurrent.AtomicLong(value)
private val kotlinAtomicLong = kotlin.concurrent.AtomicLong(value)

actual fun get(): Long = kotlinAtomicLong.value

Expand Down
2 changes: 1 addition & 1 deletion save-cosv-frontend/src/main/resources/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<meta name="msapplication-TileColor" content="#da532c">
<meta name="theme-color" content="#ffffff">
<!-- highlight.js for code highlighting -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/intellij-light.min.css" title="Intellij Light" >
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.10.0/styles/intellij-light.min.css" title="Intellij Light" >
</head>

<body style="background-color: #fcfcfc" id="main-body" class="save">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import io.ktor.utils.io.core.*
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlin.experimental.ExperimentalNativeApi
import kotlin.test.*

class ServerTest {
Expand All @@ -27,6 +28,7 @@ class ServerTest {
server.stop()
}

@OptIn(ExperimentalNativeApi::class)
@Test
fun testServerStartup() {
httpClient().use { client ->
Expand Down
10 changes: 5 additions & 5 deletions save-frontend-common/karma.config.d/custom-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
test: /\.js$/,
use: {loader: 'istanbul-instrumenter-loader'},
// fixme: need to exclude Kotlin dependencies
include: [path.resolve(__dirname, '../save-cloud-save-frontend-common/kotlin/')]
include: [path.resolve(__dirname, '../save-cloud-frontend-common/kotlin/')]
}
)
config.coverageIstanbulReporter = {
Expand All @@ -24,12 +24,12 @@ config.set({
}
},
proxies: {
// serving mockServiceWorker.js.js from location relative to base url
// serving mockServiceWorker.js from location relative to base url
// the file should be included into Karma's `files` to be served by server at all
'/mockServiceWorker.js': '/base/mockServiceWorker.js',
'/mockServiceWorker.js': '/base/node_modules/mockServiceWorker.js',
},
})

// http://karma-runner.github.io/6.3/config/files.html
// 'All of the relative patterns will get resolved using the basePath first.', where basePath is set by KGP to `node_modules`
config.files.push('./mockServiceWorker.js')
// 'All of the relative patterns will get resolved using the basePath first.', where basePath is NOT set by KGP to `node_modules` after migration to 1.9
config.files.push('./node_modules/mockServiceWorker.js')
8 changes: 4 additions & 4 deletions save-frontend/karma.config.d/custom-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ config.set({
}
},
proxies: {
// serving mockServiceWorker.js.js from location relative to base url
// serving mockServiceWorker.js from location relative to base url
// the file should be included into Karma's `files` to be served by server at all
'/mockServiceWorker.js': '/base/mockServiceWorker.js',
'/mockServiceWorker.js': '/base/node_modules/mockServiceWorker.js',
},
})

// http://karma-runner.github.io/6.3/config/files.html
// 'All of the relative patterns will get resolved using the basePath first.', where basePath is set by KGP to `node_modules`
config.files.push('./mockServiceWorker.js')
// 'All of the relative patterns will get resolved using the basePath first.', where basePath is NOT set by KGP to `node_modules` after migration to 1.9
config.files.push('./node_modules/mockServiceWorker.js')
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
@file:Suppress("FILE_NAME_MATCH_CLASS", "HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
@file:JsModule("@react-sigma/layout-circular")
@file:JsNonModule

package com.saveourtool.save.frontend.externals.graph.sigma.layouts

import react.*

/**
* @param settings
* @return [LayoutInstance] with positions and assign functions
*/
@JsName("useLayoutCircular")
@JsModule("@react-sigma/layout-circular")
@JsNonModule
@JsExport
external fun useLayoutCircular(settings: dynamic = definedExternally): LayoutInstance
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
@file:Suppress("FILE_NAME_MATCH_CLASS", "HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
@file:JsModule("@react-sigma/layout-forceatlas2")
@file:JsNonModule

package com.saveourtool.save.frontend.externals.graph.sigma.layouts

import react.*

/**
* @param settings
* @return [LayoutInstance] with positions and assign functions
*/
@JsName("useLayoutForceAtlas2")
@JsModule("@react-sigma/layout-forceatlas2")
@JsNonModule
@JsExport
external fun useLayoutForceAtlas2(settings: dynamic = definedExternally): LayoutInstance
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
@file:Suppress("FILE_NAME_MATCH_CLASS", "HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
@file:JsModule("@react-sigma/layout-random")
@file:JsNonModule

package com.saveourtool.save.frontend.externals.graph.sigma.layouts

import react.*

/**
* @param settings
* @return [LayoutInstance] with positions and assign functions
*/
@JsName("useLayoutRandom")
@JsModule("@react-sigma/layout-random")
@JsNonModule
@JsExport
external fun useLayoutRandom(settings: dynamic = definedExternally): LayoutInstance
2 changes: 1 addition & 1 deletion save-frontend/src/main/resources/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<meta name="msapplication-TileColor" content="#da532c">
<meta name="theme-color" content="#ffffff">
<!-- highlight.js for code highlighting -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/intellij-light.min.css" title="Intellij Light" >
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.10.0/styles/intellij-light.min.css" title="Intellij Light" >
</head>

<body style="background-color: #fcfcfc" id="main-body" class="save">
Expand Down
Loading