Skip to content

Commit

Permalink
chore(version): update to version 'v0.14.0'.
Browse files Browse the repository at this point in the history
  • Loading branch information
tchiotludo committed Jan 18, 2024
2 parents ece64c9 + 381869b commit f3a6210
Show file tree
Hide file tree
Showing 381 changed files with 11,851 additions and 6,467 deletions.
15 changes: 9 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,28 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every weekday
interval: "daily"
# Check for updates to GitHub Actions every week
interval: "weekly"
labels:
- "dependency-upgrade"
open-pull-requests-limit: 50

# Maintain dependencies for Gradle modules
- package-ecosystem: "gradle"
directory: "/"
schedule:
# Check for updates to Go modules every weekday
interval: "daily"
# Check for updates to Gradle modules every week
interval: "weekly"
labels:
- "dependency-upgrade"
open-pull-requests-limit: 50

# Maintain dependencies for Npm modules
- package-ecosystem: "npm"
directory: "/ui"
schedule:
# Check for updates to Go modules every weekday
interval: "daily"
# Check for updates to Npm modules every week
interval: "weekly"
labels:
- "dependency-upgrade"
open-pull-requests-limit: 50
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -50,15 +50,15 @@ jobs:

# Set up JDK
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -72,4 +72,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
25 changes: 19 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ on:
type: string
default: "false"

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
check:
env:
Expand All @@ -36,7 +40,7 @@ jobs:
with:
fetch-depth: 0

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.x'
architecture: 'x64'
Expand Down Expand Up @@ -86,7 +90,7 @@ jobs:

# JDK
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
Expand All @@ -105,6 +109,13 @@ jobs:
export GOOGLE_APPLICATION_CREDENTIALS=$HOME/.gcp-service-account.json
./gradlew check jacoco javadoc --no-daemon --priority=normal
# report test
- name: Test Report
uses: mikepenz/action-junit-report@v4
if: success() || failure()
with:
report_paths: '**/build/test-results/**/TEST-*.xml'

- name: Analyze with Sonar
if: ${{ env.SONAR_TOKEN != 0 }}
env:
Expand All @@ -124,13 +135,13 @@ jobs:

# Upload artifacts
- name: Upload jar
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: jar
path: build/libs/

- name: Upload Executable
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: exe
path: build/executable/
Expand Down Expand Up @@ -186,6 +197,7 @@ jobs:
io.kestra.plugin:plugin-hightouch:LATEST
io.kestra.plugin:plugin-jdbc-clickhouse:LATEST
io.kestra.plugin:plugin-jdbc-duckdb:LATEST
io.kestra.plugin:plugin-jdbc-druid:LATEST
io.kestra.plugin:plugin-jdbc-mysql:LATEST
io.kestra.plugin:plugin-jdbc-oracle:LATEST
io.kestra.plugin:plugin-jdbc-pinot:LATEST
Expand Down Expand Up @@ -221,6 +233,7 @@ jobs:
io.kestra.plugin:plugin-script-powershell:LATEST
io.kestra.plugin:plugin-script-python:LATEST
io.kestra.plugin:plugin-script-r:LATEST
io.kestra.plugin:plugin-script-ruby:LATEST
io.kestra.plugin:plugin-script-shell:LATEST
io.kestra.plugin:plugin-serdes:LATEST
io.kestra.plugin:plugin-servicenow:LATEST
Expand All @@ -243,7 +256,7 @@ jobs:

# Artifact
- name: Download executable
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: exe
path: build/executable
Expand Down Expand Up @@ -338,7 +351,7 @@ jobs:
# JDK
- name: Set up JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ out/
### Configurations
docker-compose.override.yml
cli/src/main/resources/application-*.yml
*/src/test/resources/application-test.yml
/local

### Javascript
Expand Down
22 changes: 12 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ plugins {
id 'jacoco-report-aggregation'

// helper
id "com.github.ben-manes.versions" version "0.49.0"
id "com.github.ben-manes.versions" version "0.50.0"

// front
id 'org.siouan.frontend-jdk11' version '8.0.0' apply false
Expand Down Expand Up @@ -79,11 +79,11 @@ allprojects {
force("com.google.protobuf:protobuf-java-util:3.23.3")

// ugly bug for elastic plugins
force("org.apache.httpcomponents:httpclient:4.5.13")
force("org.apache.httpcomponents:httpclient:4.5.14")

// ugly bug on crypto plugin
force('org.bouncycastle:bcprov-jdk15on:1.70')
force('org.bouncycastle:bcpg-jdk15on:1.70')
force('org.bouncycastle:bcprov-jdk18on:1.77')
force('org.bouncycastle:bcpg-jdk18on:1.77')

// ugly bug for jackson
force("com.fasterxml.jackson:jackson-bom:" + jacksonVersion)
Expand Down Expand Up @@ -127,7 +127,7 @@ allprojects {
implementation group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: '2.19.0'
implementation group: 'org.slf4j', name: 'jul-to-slf4j', version: '1.7.36'
implementation group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.36'
implementation group: 'org.fusesource.jansi', name: 'jansi', version: '2.4.0'
implementation group: 'org.fusesource.jansi', name: 'jansi', version: '2.4.1'

// jackson
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind'
Expand All @@ -141,9 +141,9 @@ allprojects {
implementation group: 'net.thisptr', name: 'jackson-jq', version: '1.0.0-preview.20230409'

// exposed utils
api group: 'com.google.guava', name: 'guava', version: '32.1.2-jre'
api group: 'commons-io', name: 'commons-io', version: '2.14.0'
api group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0'
api group: 'com.google.guava', name: 'guava', version: '33.0.0-jre'
api group: 'commons-io', name: 'commons-io', version: '2.15.1'
api group: 'org.apache.commons', name: 'commons-lang3', version: '3.14.0'
api "io.swagger.core.v3:swagger-annotations"
}
}
Expand Down Expand Up @@ -171,7 +171,7 @@ subprojects {
testImplementation "io.micronaut.test:micronaut-test-junit5"
testImplementation "org.junit.jupiter:junit-jupiter-engine"
testImplementation "org.junit.jupiter:junit-jupiter-params"
testImplementation "org.junit-pioneer:junit-pioneer:2.1.0"
testImplementation "org.junit-pioneer:junit-pioneer:2.2.0"

// hamcrest
testImplementation 'org.hamcrest:hamcrest:2.2'
Expand Down Expand Up @@ -311,7 +311,7 @@ subprojects {
}

jacoco {
toolVersion = "0.8.9"
toolVersion = "0.8.11"
}

jacocoTestReport {
Expand Down Expand Up @@ -460,6 +460,8 @@ subprojects {
}

signing {
// only sign JARs that we publish to Sonatype
required { gradle.taskGraph.hasTask("publishSonatypePublicationPublicationToSonatypeRepository") }
sign publishing.publications.sonatypePublication
}
}
Expand Down
2 changes: 0 additions & 2 deletions cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ dependencies {
exclude group: 'org.eclipse.sisu'
}

implementation 'nl.basjes.gitignore:gitignore-reader:0.3.1'

// modules
implementation project(":core")

Expand Down
6 changes: 3 additions & 3 deletions cli/src/main/java/io/kestra/cli/AbstractApiCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
import java.util.Map;

public abstract class AbstractApiCommand extends AbstractCommand {
@CommandLine.Option(names = {"--server"}, description = " Kestra server url", defaultValue = "http://localhost:8080")
@CommandLine.Option(names = {"--server"}, description = "Kestra server url", defaultValue = "http://localhost:8080")
protected URL server;

@CommandLine.Option(names = {"--headers"}, description = "Headers to add to the request")
@CommandLine.Option(names = {"--headers"}, paramLabel = "<name=value>", description = "Headers to add to the request")
protected Map<CharSequence, CharSequence> headers;

@CommandLine.Option(names = {"--user"}, description = "<user:password> Server user and password")
@CommandLine.Option(names = {"--user"}, paramLabel = "<user:password>", description = "Server user and password")
protected String user;

@CommandLine.Option(names = {"--tenant"}, description = "Tenant identifier (EE only, when multi-tenancy is enabled)")
Expand Down
13 changes: 7 additions & 6 deletions cli/src/main/java/io/kestra/cli/AbstractCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
import jakarta.inject.Inject;

@CommandLine.Command(
mixinStandardHelpOptions = true
mixinStandardHelpOptions = true,
showDefaultValues = true
)
@Slf4j
@Introspected
Expand All @@ -45,19 +46,19 @@ abstract public class AbstractCommand implements Callable<Integer> {
@Inject
private StartupHookInterface startupHook;

@CommandLine.Option(names = {"-v", "--verbose"}, description = "Change log level. Multiple -v options increase the verbosity.")
@CommandLine.Option(names = {"-v", "--verbose"}, description = "Change log level. Multiple -v options increase the verbosity.", showDefaultValue = CommandLine.Help.Visibility.NEVER)
private boolean[] verbose = new boolean[0];

@CommandLine.Option(names = {"-l", "--log-level"}, description = "Change log level (values: ${COMPLETION-CANDIDATES}; default: ${DEFAULT-VALUE})")
@CommandLine.Option(names = {"-l", "--log-level"}, description = "Change log level (values: ${COMPLETION-CANDIDATES})")
private LogLevel logLevel = LogLevel.INFO;

@CommandLine.Option(names = {"--internal-log"}, description = "Change also log level for internal log, default: ${DEFAULT-VALUE})")
@CommandLine.Option(names = {"--internal-log"}, description = "Change also log level for internal log")
private boolean internalLog = false;

@CommandLine.Option(names = {"-c", "--config"}, description = "Path to a configuration file, default: ${DEFAULT-VALUE})")
@CommandLine.Option(names = {"-c", "--config"}, description = "Path to a configuration file")
private Path config = Paths.get(System.getProperty("user.home"), ".kestra/config.yml");

@CommandLine.Option(names = {"-p", "--plugins"}, description = "Path to plugins directory , default: ${DEFAULT-VALUE})")
@CommandLine.Option(names = {"-p", "--plugins"}, description = "Path to plugins directory")
protected Path pluginsPath = System.getenv("KESTRA_PLUGINS_PATH") != null ? Paths.get(System.getenv("KESTRA_PLUGINS_PATH")) : null;

public enum LogLevel {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package io.kestra.cli.commands.flows.namespaces;

import io.kestra.cli.App;
import io.micronaut.configuration.picocli.PicocliRunner;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import io.kestra.cli.AbstractCommand;
import picocli.CommandLine;
Expand All @@ -14,5 +17,13 @@
)
@Slf4j
public class FlowNamespaceCommand extends AbstractCommand {
@SneakyThrows
@Override
public Integer call() throws Exception {
super.call();

PicocliRunner.call(App.class, "flow", "namespace", "--help");

return 0;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class NamespaceCommand extends AbstractCommand {
public Integer call() throws Exception {
super.call();

PicocliRunner.call(App.class, "namespaces", "--help");
PicocliRunner.call(App.class, "namespace", "--help");

return 0;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package io.kestra.cli.commands.namespaces.files;

import io.kestra.cli.AbstractCommand;
import io.kestra.cli.App;
import io.micronaut.configuration.picocli.PicocliRunner;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import picocli.CommandLine;

Expand All @@ -14,5 +17,13 @@
)
@Slf4j
public class NamespaceFilesCommand extends AbstractCommand {
@SneakyThrows
@Override
public Integer call() throws Exception {
super.call();

PicocliRunner.call(App.class, "namespace", "files", "--help");

return 0;
}
}
Loading

0 comments on commit f3a6210

Please sign in to comment.