Skip to content

Commit

Permalink
[Upd] Add test module, pom adjustment
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthew-Kulich authored and blcham committed May 17, 2022
1 parent 9a24943 commit b1342f8
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 76 deletions.
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<module>s-pipes-modules</module>
<module>s-pipes-modules-registry</module>
<module>s-pipes-forms</module>
<module>s-pipes-test</module>
</modules>

<build>
Expand Down
6 changes: 6 additions & 0 deletions s-pipes-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
<artifactId>s-pipes-model</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>cz.cvut.kbss</groupId>
<artifactId>s-pipes-test</artifactId>
<version>${version}</version>
<scope>test</scope>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
2 changes: 1 addition & 1 deletion s-pipes-forms/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.0</version>
<version>${org.codehaus.mojo.version}</version>
<configuration>
<complianceLevel>${jdk.version}</complianceLevel>
<source>${jdk.version}</source>
Expand Down
2 changes: 1 addition & 1 deletion s-pipes-model/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.0</version>
<version>${org.codehaus.mojo.version}</version>
<configuration>
<complianceLevel>${jdk.version}</complianceLevel>
<source>${jdk.version}</source>
Expand Down
6 changes: 6 additions & 0 deletions s-pipes-modules/module-form/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,11 @@
<artifactId>jena-core</artifactId>
<version>${org.apache.jena}</version>
</dependency>
<dependency>
<groupId>cz.cvut.kbss</groupId>
<artifactId>s-pipes-test</artifactId>
<version>${version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
80 changes: 6 additions & 74 deletions s-pipes-modules/module-tabular/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,80 +13,6 @@
<name>SPipes Modules - Tabular</name>
<packaging>jar</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jdk.version>1.8</jdk.version>
<maven.compiler.source>${jdk.version}</maven.compiler.source>
<maven.compiler.target>${jdk.version}</maven.compiler.target>
<org.aspectj.version>1.9.7</org.aspectj.version>
<cz.cvut.kbss.jopa.version>0.18.5</cz.cvut.kbss.jopa.version>
<cz.cvut.kbss.jb4jsonld.version>0.9.0</cz.cvut.kbss.jb4jsonld.version>
<org.eclipse.rdf4j.version>3.7.6</org.eclipse.rdf4j.version>
<ch.qos.logback.version>1.2.11</ch.qos.logback.version>
<com.github.galigator.openllet.version>2.6.4</com.github.galigator.openllet.version>
<com.github.ledsoft.jopa-spring-transactions.version>0.1.2</com.github.ledsoft.jopa-spring-transactions.version>

<org.springframework.version>5.3.17</org.springframework.version>
<org.springframework.boot.version>2.6.5</org.springframework.boot.version>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>9</source>
<target>9</target>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<version>1.14.0</version>
<configuration>
<complianceLevel>${jdk.version}</complianceLevel>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
<aspectLibraries>
<aspectLibrary>
<groupId>cz.cvut.kbss.jopa</groupId>
<artifactId>jopa-impl</artifactId>
</aspectLibrary>
</aspectLibraries>
</configuration>
<dependencies>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
<version>${org.aspectj.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>${org.aspectj.version}</version>
</dependency>
</dependencies>
<executions>
<execution>
<phase>process-classes</phase>
<goals>
<goal>compile</goal>
<!-- use this goal to weave all your main classes -->
<goal>test-compile</goal>
<!-- use this goal to weave all your test classes -->
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.7</version>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>cz.cvut.kbss</groupId>
Expand All @@ -106,5 +32,11 @@
<groupId>cz.cvut.kbss.jopa</groupId>
<artifactId>ontodriver-jena</artifactId>
</dependency>
<dependency>
<groupId>cz.cvut.kbss</groupId>
<artifactId>s-pipes-test</artifactId>
<version>${version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
2 changes: 2 additions & 0 deletions s-pipes-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
<org.mockito.version>2.21.0</org.mockito.version>
<commons.io.version>2.6</commons.io.version>
<maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
<org.codehaus.mojo.version>1.14.0</org.codehaus.mojo.version>
<org.codehaus.mojo.plugin.version>1.14.0</org.codehaus.mojo.plugin.version>
</properties>

<dependencyManagement>
Expand Down
35 changes: 35 additions & 0 deletions s-pipes-test/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<parent>
<relativePath>../s-pipes-parent</relativePath>
<groupId>cz.cvut.kbss</groupId>
<artifactId>s-pipes-parent</artifactId>
<version>0.3.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>s-pipes-test</artifactId>
<name>SPipes - Test</name>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
</configuration>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
<version>${org.apache.jena}</version>
</dependency>
</dependencies>
</project>

0 comments on commit b1342f8

Please sign in to comment.