Skip to content

Commit d6b21b8

Browse files
fjtiradofjtirado
authored
Merge pull request #476 from fjtirado/Fix_#473
[Fix #473] Refactor project structure
2 parents 076911a + fa3d1d3 commit d6b21b8

File tree

64 files changed

+535
-245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+535
-245
lines changed

‎api/pom.xml

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -121,77 +121,6 @@
121121
</execution>
122122
</executions>
123123
</plugin>
124-
<plugin>
125-
<groupId>org.apache.maven.plugins</groupId>
126-
<artifactId>maven-checkstyle-plugin</artifactId>
127-
<configuration>
128-
<checkstyleRules>
129-
<module name="Checker">
130-
<module name="RegexpHeader">
131-
<property name="header" value="${checkstyle.header.template}" />
132-
<property name="fileExtensions" value="${checkstyle.header.extensions}" />
133-
</module>
134-
<module name="TreeWalker">
135-
<module name="RegexpSinglelineJava">
136-
<property name="format" value="@author" />
137-
<property name="message" value="No @author tag allowed" />
138-
</module>
139-
</module>
140-
</module>
141-
</checkstyleRules>
142-
<outputFile>${project.build.directory}/checkstyle.log</outputFile>
143-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
144-
<includeResources>true</includeResources>
145-
<includeTestResources>true</includeTestResources>
146-
<consoleOutput>false</consoleOutput>
147-
<failsOnError>false</failsOnError>
148-
<logViolationsToConsole>${checkstyle.logViolationsToConsole}</logViolationsToConsole>
149-
<failOnViolation>${checkstyle.failOnViolation}</failOnViolation>
150-
<sourceDirectories>
151-
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
152-
<sourceDirectory>${project.build.testSourceDirectory}</sourceDirectory>
153-
</sourceDirectories>
154-
</configuration>
155-
<executions>
156-
<execution>
157-
<phase>compile</phase>
158-
<goals>
159-
<goal>check</goal>
160-
</goals>
161-
</execution>
162-
</executions>
163-
</plugin>
164-
<plugin>
165-
<groupId>com.spotify.fmt</groupId>
166-
<artifactId>fmt-maven-plugin</artifactId>
167-
<configuration>
168-
<sourceDirectory>src/main/java</sourceDirectory>
169-
<testSourceDirectory>src/test/java</testSourceDirectory>
170-
<verbose>false</verbose>
171-
<filesNamePattern>.*\.java</filesNamePattern>
172-
<skip>false</skip>
173-
<skipSortingImports>false</skipSortingImports>
174-
<style>google</style>
175-
</configuration>
176-
<executions>
177-
<execution>
178-
<goals>
179-
<goal>format</goal>
180-
</goals>
181-
</execution>
182-
</executions>
183-
</plugin>
184-
<plugin>
185-
<groupId>org.apache.maven.plugins</groupId>
186-
<artifactId>maven-jar-plugin</artifactId>
187-
<executions>
188-
<execution>
189-
<goals>
190-
<goal>test-jar</goal>
191-
</goals>
192-
</execution>
193-
</executions>
194-
</plugin>
195124
</plugins>
196125
</build>
197126
</project>

‎impl/bom/pom.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<modelVersion>4.0.0</modelVersion>
3+
<parent>
4+
<groupId>io.serverlessworkflow</groupId>
5+
<artifactId>serverlessworkflow-impl</artifactId>
6+
<version>7.0.0-SNAPSHOT</version>
7+
</parent>
8+
<artifactId>serverlessworkflow-impl-bom</artifactId>
9+
<packaging>pom</packaging>
10+
<dependencies>
11+
<dependency>
12+
<groupId>io.serverlessworkflow</groupId>
13+
<artifactId>serverlessworkflow-impl-core</artifactId>
14+
</dependency>
15+
<dependency>
16+
<groupId>io.serverlessworkflow</groupId>
17+
<artifactId>serverlessworkflow-impl-http</artifactId>
18+
</dependency>
19+
</dependencies>
20+
</project>

‎impl/core/.checkstyle

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
4+
<local-check-config name="maven-checkstyle-plugin default" location="file:/home/ftirados/kogito_new/.metadata/.plugins/com.basistech.m2e.code.quality.checkstyle/serverlessworkflow-impl-core_inline_checkstyle.xml" type="remote" description="maven-checkstyle-plugin configuration default">
5+
<property name="checkstyle.header.file" value="/home/ftirados/kogito_new/.metadata/.plugins/org.eclipse.core.resources/.projects/serverlessworkflow-impl-core/com.basistech.m2e.code.quality.checkstyleConfigurator/checkstyle-header-default.txt"/>
6+
<property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
7+
</local-check-config>
8+
<fileset name="java-sources-default" enabled="true" check-config-name="maven-checkstyle-plugin default" local="true">
9+
<file-match-pattern match-pattern="^src/test/java/.*\/.*\.java" include-pattern="true"/>
10+
<file-match-pattern match-pattern="^src/main/java/.*\/.*\.java" include-pattern="true"/>
11+
<file-match-pattern match-pattern="^src/main/resources/.*\.properties" include-pattern="true"/>
12+
<file-match-pattern match-pattern="^src/test/resources/.*\.properties" include-pattern="true"/>
13+
</fileset>
14+
</fileset-config>

‎impl/core/pom.xml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<modelVersion>4.0.0</modelVersion>
3+
<parent>
4+
<groupId>io.serverlessworkflow</groupId>
5+
<artifactId>serverlessworkflow-impl</artifactId>
6+
<version>7.0.0-SNAPSHOT</version>
7+
</parent>
8+
<artifactId>serverlessworkflow-impl-core</artifactId>
9+
<properties>
10+
<version.net.thisptr>1.1.0</version.net.thisptr>
11+
</properties>
12+
<dependencies>
13+
<dependency>
14+
<groupId>io.serverlessworkflow</groupId>
15+
<artifactId>serverlessworkflow-api</artifactId>
16+
<version>7.0.0-SNAPSHOT</version>
17+
</dependency>
18+
<dependency>
19+
<groupId>com.networknt</groupId>
20+
<artifactId>json-schema-validator</artifactId>
21+
</dependency>
22+
<dependency>
23+
<groupId>net.thisptr</groupId>
24+
<artifactId>jackson-jq</artifactId>
25+
<version>${version.net.thisptr}</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>org.junit.jupiter</groupId>
29+
<artifactId>junit-jupiter-api</artifactId>
30+
<scope>test</scope>
31+
</dependency>
32+
<dependency>
33+
<groupId>org.junit.jupiter</groupId>
34+
<artifactId>junit-jupiter-engine</artifactId>
35+
<scope>test</scope>
36+
</dependency>
37+
<dependency>
38+
<groupId>org.junit.jupiter</groupId>
39+
<artifactId>junit-jupiter-params</artifactId>
40+
<scope>test</scope>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.assertj</groupId>
44+
<artifactId>assertj-core</artifactId>
45+
<scope>test</scope>
46+
</dependency>
47+
</dependencies>
48+
</project>

‎impl/src/main/java/io/serverlessworkflow/impl/DefaultWorkflowPosition.java renamed to ‎impl/core/src/main/java/io/serverlessworkflow/impl/DefaultWorkflowPosition.java

File renamed without changes.

‎impl/src/main/java/io/serverlessworkflow/impl/TaskContext.java renamed to ‎impl/core/src/main/java/io/serverlessworkflow/impl/TaskContext.java

File renamed without changes.

‎impl/src/main/java/io/serverlessworkflow/impl/WorkflowApplication.java renamed to ‎impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowApplication.java

File renamed without changes.

‎impl/src/main/java/io/serverlessworkflow/impl/WorkflowContext.java renamed to ‎impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowContext.java

File renamed without changes.

‎impl/src/main/java/io/serverlessworkflow/impl/WorkflowDefinition.java renamed to ‎impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowDefinition.java

File renamed without changes.

‎impl/src/main/java/io/serverlessworkflow/impl/WorkflowExecutionListener.java renamed to ‎impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowExecutionListener.java

File renamed without changes.

0 commit comments

Comments
 (0)