Skip to content

Reorganize project structure #69

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

Merged
merged 1 commit into from
Apr 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 36 additions & 0 deletions functions/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright © 2024 DataSQRL (contact@datasqrl.com)

Licensed 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>com.datasqrl.flinkrunner</groupId>
<artifactId>flink-sql-runner-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>functions</artifactId>
<packaging>pom</packaging>

<modules>
<module>system-functions-discovery</module>
</modules>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<parent>
<groupId>com.datasqrl.flinkrunner</groupId>
<artifactId>flink-sql-runner-parent</artifactId>
<artifactId>functions</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

Expand Down
46 changes: 44 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
</developers>

<modules>
<module>system-functions-discovery</module>
<module>helpers</module>
<module>functions</module>
<module>testing</module>
<module>flink-sql-runner</module>
</modules>

Expand Down Expand Up @@ -121,6 +121,31 @@
</dependencies>
</dependencyManagement>

<dependencies>
<!-- General Dependencies -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -259,6 +284,22 @@
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.11</version>
<executions>
<execution>
<goals>
<goal>prepare-agent</goal>
<goal>prepare-agent-integration</goal>
<goal>report</goal>
<goal>report-integration</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -428,4 +469,5 @@
</build>
</profile>
</profiles>

</project>
68 changes: 68 additions & 0 deletions testing/coverage/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright © 2024 DataSQRL (contact@datasqrl.com)

Licensed 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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.datasqrl.flinkrunner</groupId>
<artifactId>testing</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>flink-sql-runner-coverage</artifactId>

<description>JaCoCo can’t actually aggregate test reposts, so we have to jump through a bunch of hoops. This is hoop numero uno.</description>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>flink-sql-runner</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>system-functions-discovery</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.11</version>
<executions>
<execution>
<id>report-aggregate</id>
<goals>
<goal>report-aggregate</goal>
</goals>
<phase>verify</phase>
<configuration>
<dataFileIncludes>
<dataFileInclude>**/jacoco.exec</dataFileInclude>
<dataFileInclude>**/jacoco-it.exec</dataFileInclude>
</dataFileIncludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
22 changes: 22 additions & 0 deletions testing/coverage/src/main/java/hoop/Code.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Copyright © 2024 DataSQRL (contact@datasqrl.com)
*
* Licensed 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.
*/
package hoop;

/**
* JaCoCo can’t actually aggregate test reposts, so we have to jump through a bunch of hoops. This
* is hoop numero tres.
*/
public class Code {}
28 changes: 28 additions & 0 deletions testing/coverage/src/test/java/packagereport/ReportTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*
* Copyright © 2024 DataSQRL (contact@datasqrl.com)
*
* Licensed 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.
*/
package packagereport;

import org.junit.Test;

/**
* JaCoCo can’t actually aggregate test reposts, so we have to jump through a bunch of hoops. This
* is hoop numero dos.
*/
public class ReportTest {

@Test
public void test() {}
}
3 changes: 2 additions & 1 deletion helpers/pom.xml → testing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,13 @@
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>helpers</artifactId>
<artifactId>testing</artifactId>
<packaging>pom</packaging>

<modules>
<module>system-functions-sample</module>
<module>udf-sample</module>
<module>coverage</module>
</modules>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<parent>
<groupId>com.datasqrl.flinkrunner</groupId>
<artifactId>helpers</artifactId>
<artifactId>testing</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion helpers/udf-sample/pom.xml → testing/udf-sample/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<parent>
<groupId>com.datasqrl.flinkrunner</groupId>
<artifactId>helpers</artifactId>
<artifactId>testing</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>

Expand Down