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

[DSIP-16479][Master] Add more workflow Integration test cases in master. #16712

Closed
wants to merge 48 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
9887ee6
Removed Spring-boot-starter-cache dependencies
binitshrest Sep 5, 2024
9dfe630
Removed Spring-boot-starter-cache dependencies
binitshrest Sep 5, 2024
a2f3557
Merge remote-tracking branch 'origin/dev' into dev
binitshrest Sep 5, 2024
9d833b2
Merge branch 'dev' into dev
binitshrest Sep 5, 2024
12ea1d0
Merge remote-tracking branch 'origin/dev' into dev
binitshrest Sep 5, 2024
7fd1501
Merge remote-tracking branch 'origin/dev' into dev
binitshrest Sep 6, 2024
927560b
Removed cacheable and cacheconfig of spring-boot-starter-cache
binitshrest Sep 6, 2024
8f38773
Merge branch 'dev' into dev
binitshrest Sep 6, 2024
7e6f498
Removed cacheable and cacheconfig of removed spring-boot-starter-cach…
binitshrest Sep 6, 2024
5898102
Merge remote-tracking branch 'origin/dev' into dev
binitshrest Sep 6, 2024
e4f4a8d
Removed cacheable and cacheconfig of removed spring-boot-starter-cach…
binitshrest Sep 6, 2024
8c0ae9e
Removed cacheable and cacheconfig of removed spring-boot-starter-cach…
binitshrest Sep 9, 2024
cc81bbb
Removed cacheable and cacheconfig of removed spring-boot-starter-cach…
binitshrest Sep 9, 2024
1ab0f9f
Revert "Reverting some codes that is bugging"
binitshrest Sep 15, 2024
1ac7f40
Revert "Reverting some codes that is bugging"
binitshrest Sep 16, 2024
c1ab3e9
Merge branch 'dev' into dev
SbloodyS Sep 23, 2024
5ff15a1
Merge branch 'dev' into dev
binitshrest Sep 24, 2024
996a3a3
Merge branch 'dev' into dev
SbloodyS Oct 9, 2024
11d1050
renewed monaco-editor version
binitshrest Oct 9, 2024
2d3bc99
Merge remote-tracking branch 'origin/dev' into dev
binitshrest Oct 9, 2024
11f5d16
added some changes that was removed earlier
binitshrest Oct 9, 2024
2f4f8ed
reviewed some changes
binitshrest Oct 9, 2024
a166d16
reviewed some changes and updated it
binitshrest Oct 9, 2024
346b0f0
changes made that was asked
binitshrest Oct 9, 2024
e6506ca
read the documentatation of tools->release and implemented
binitshrest Oct 10, 2024
1d11fe7
kept some files in gitignore
binitshrest Oct 10, 2024
670f1b8
changing readme file
binitshrest Oct 10, 2024
0da86b4
made changes
binitshrest Oct 11, 2024
fd3a408
made changes
binitshrest Oct 11, 2024
3b9c48a
removed extra lines
binitshrest Oct 11, 2024
de40cb0
removed log4j-api mvn repo from dol-dist>release-docs>licence
binitshrest Oct 11, 2024
0fcd236
Removed log4j-api and log4j-to-slf4j from microbench pom.xml i.e tran…
binitshrest Oct 11, 2024
b7cdd41
Merge branch 'dev' into dev
SbloodyS Oct 12, 2024
a8da591
exlcuded all the transitive dependency that has log4j-api and log4j-t…
binitshrest Oct 13, 2024
27af1dd
changes are added
binitshrest Oct 13, 2024
3d13f4a
add some changes
binitshrest Oct 13, 2024
dce0895
optimize codes
binitshrest Oct 14, 2024
fc0b7f2
changes made
binitshrest Oct 14, 2024
beb21c6
made some changes
binitshrest Oct 14, 2024
de811ee
made some changes
binitshrest Oct 14, 2024
0f52a15
made some changes
binitshrest Oct 14, 2024
99321f6
removed duplicate codes
binitshrest Oct 14, 2024
cddfa31
Update pom.xml
binitshrest Oct 14, 2024
af490e2
removed two licence file log4j-api & log4j-to-slf4j as asked
binitshrest Oct 14, 2024
0689b5c
Merge branch 'dev' into dev
ruanwenjun Oct 14, 2024
d28de7e
wrote a testcases for switch task
binitshrest Oct 20, 2024
7db3e69
made some changes
binitshrest Oct 20, 2024
8836f76
made some changes
binitshrest Oct 20, 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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ dolphinscheduler-worker/logs
dolphinscheduler-master/logs
dolphinscheduler-api/logs
__pycache__
ds_schema_check_test
ds_schema_check_test
2 changes: 1 addition & 1 deletion deploy/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

version: "3.8"
#version: "3.8"

services:
dolphinscheduler-postgresql:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
~ this work for additional information regarding copyright ownership.
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-alert-plugins</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
<artifactId>dolphinscheduler-alert-email</artifactId>
<packaging>jar</packaging>

<properties>
<plugin.name>alert.email</plugin.name>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-alert-api</artifactId>
</dependency>

<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>shade</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
~ this work for additional information regarding copyright ownership.
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<configuration scan="true" scanPeriod="120 seconds">
<logger name="*" level="ERROR"/>
</configuration>
2 changes: 1 addition & 1 deletion dolphinscheduler-api/src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -246,4 +246,4 @@ spring:
password: root
quartz:
properties:
org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
org.quartz.jobStore.driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,14 @@

import java.util.List;

import org.springframework.cache.annotation.CacheConfig;
import org.springframework.cache.annotation.Cacheable;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

/**
* workflow definition log mapper interface
*/
@CacheConfig(cacheNames = "processDefinition", keyGenerator = "cacheKeyGenerator")

public interface WorkflowDefinitionLogMapper extends BaseMapper<WorkflowDefinitionLog> {

/**
Expand All @@ -43,7 +40,7 @@ public interface WorkflowDefinitionLogMapper extends BaseMapper<WorkflowDefiniti
* @param version version number
* @return the workflow definition version info
*/
@Cacheable(sync = true)

WorkflowDefinitionLog queryByDefinitionCodeAndVersion(@Param("code") long code, @Param("version") int version);

/**
Expand Down
3 changes: 0 additions & 3 deletions dolphinscheduler-dist/release-docs/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,6 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
kerby-xdr 1.0.1: https://mvnrepository.com/artifact/org.apache.kerby/kerby-xdr/1.0.1, Apache 2.0
libfb303 0.9.3: https://mvnrepository.com/artifact/org.apache.thrift/libfb303/0.9.3, Apache 2.0
libthrift 0.9.3: https://mvnrepository.com/artifact/org.apache.thrift/libthrift/0.9.3, Apache 2.0
log4j-api 2.11.2: https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api/2.11.2, Apache 2.0
log4j-core-2.11.2: https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core/2.11.2, Apache 2.0
log4j-1.2-api 2.17.2: https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-1.2-api/2.17.2, Apache 2.0
lz4 1.3.0: https://mvnrepository.com/artifact/net.jpountz.lz4/lz4/1.3.0, Apache 2.0
mybatis 3.5.10 https://mvnrepository.com/artifact/org.mybatis/mybatis/3.5.10, Apache 2.0
Expand Down Expand Up @@ -379,7 +377,6 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
spring-boot-starter-logging 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-logging/2.7.3, Apache 2.0
spring-boot-starter-quartz 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-quartz/2.7.3, Apache 2.0
spring-boot-starter-web 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web/2.7.3, Apache 2.0
spring-boot-starter-cache 2.7.3: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-cache/2.7.3, Apache 2.0
spring-context 5.3.22: https://mvnrepository.com/artifact/org.springframework/spring-context/5.3.22, Apache 2.0
spring-context-support 5.3.13: https://mvnrepository.com/artifact/org.springframework/spring-context-support/5.3.13, Apache 2.0
spring-core 5.3.22: https://mvnrepository.com/artifact/org.springframework/spring-core/5.3.22, Apache 2.0
Expand Down

This file was deleted.

Loading
Loading