-
Notifications
You must be signed in to change notification settings - Fork 215
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
re-enabled executing Junit4 tests in modules which have both Junit4 a…
…nd -5 tests * fixed broken tests in modules "ditto-things-model", "ditto-things-service", "ditto-concierge-service" * performed module refactoring of "ditto-rql-parser", pulled out "things-search" dependency to another new module "ditto-rql-search-option-parser" in order to prevent a transitive dependency from "ditto-things-model" to "ditto-things-search-model" Signed-off-by: Thomas Jaeckle <thomas.jaeckle@bosch.io>
- Loading branch information
Showing
21 changed files
with
269 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,191 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ Copyright (c) 2021 Contributors to the Eclipse Foundation | ||
| ~ | ||
| ~ See the NOTICE file(s) distributed with this work for additional | ||
| ~ information regarding copyright ownership. | ||
| ~ | ||
| ~ This program and the accompanying materials are made available under the | ||
| ~ terms of the Eclipse Public License 2.0 which is available at | ||
| ~ http://www.eclipse.org/legal/epl-2.0 | ||
| ~ | ||
| ~ SPDX-License-Identifier: EPL-2.0 | ||
| --> | ||
| <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.eclipse.ditto</groupId> | ||
| <artifactId>ditto-rql</artifactId> | ||
| <version>${revision}</version> | ||
| </parent> | ||
|
|
||
| <artifactId>ditto-rql-search-option-parser</artifactId> | ||
| <packaging>bundle</packaging> | ||
| <name>Eclipse Ditto :: RQL :: search option parser</name> | ||
|
|
||
| <properties> | ||
| <javac.source>1.8</javac.source> | ||
| <javac.target>1.8</javac.target> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <!-- ### Compile ### --> | ||
| <dependency> | ||
| <groupId>org.eclipse.ditto</groupId> | ||
| <artifactId>ditto-thingsearch-model</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.ditto</groupId> | ||
| <artifactId>ditto-rql-model</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.ditto</groupId> | ||
| <artifactId>ditto-rql-parser</artifactId> | ||
| </dependency> | ||
|
|
||
| <dependency> | ||
| <groupId>com.typesafe.akka</groupId> | ||
| <artifactId>akka-parsing_${scala.version}</artifactId> | ||
| </dependency> | ||
|
|
||
| <!-- ### Testing ### --> | ||
| <dependency> | ||
| <groupId>org.eclipse.ditto</groupId> | ||
| <artifactId>ditto-base-model</artifactId> | ||
| <type>test-jar</type> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.eclipse.ditto</groupId> | ||
| <artifactId>ditto-json</artifactId> | ||
| <type>test-jar</type> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <configuration> | ||
| <source>${javac.source}</source> | ||
| <target>${javac.target}</target> | ||
| </configuration> | ||
| </plugin> | ||
|
|
||
| <plugin> | ||
| <groupId>net.alchim31.maven</groupId> | ||
| <artifactId>scala-maven-plugin</artifactId> | ||
| <configuration> | ||
| <source>${javac.source}</source> | ||
| <target>${javac.target}</target> | ||
| <scalaVersion>${scala.full.version}</scalaVersion> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>compile</id> | ||
| <goals> | ||
| <goal>compile</goal> | ||
| </goals> | ||
| <phase>compile</phase> | ||
| </execution> | ||
| <execution> | ||
| <id>test-compile</id> | ||
| <goals> | ||
| <goal>testCompile</goal> | ||
| </goals> | ||
| <phase>test-compile</phase> | ||
| </execution> | ||
| <execution> | ||
| <phase>process-resources</phase> | ||
| <goals> | ||
| <goal>compile</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
|
|
||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-enforcer-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>enforce-banned-dependencies</id> | ||
| <goals> | ||
| <goal>enforce</goal> | ||
| </goals> | ||
| <configuration> | ||
| <rules> | ||
| <bannedDependencies> | ||
| <excludes> | ||
| <!-- as this is a model and thus a minimal dependencies-rules applies, | ||
| we don't want to have a slf4j dependency --> | ||
| <exclude>org.slf4j</exclude> | ||
| </excludes> | ||
| <includes> | ||
| <include>org.slf4j:*:*:jar:test</include> | ||
| </includes> | ||
| </bannedDependencies> | ||
| </rules> | ||
| <fail>true</fail> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
|
|
||
| <plugin> | ||
| <groupId>org.apache.felix</groupId> | ||
| <artifactId>maven-bundle-plugin</artifactId> | ||
| <extensions>true</extensions> | ||
| <configuration> | ||
| <instructions> | ||
| <Import-Package> | ||
| !org.eclipse.ditto.utils.jsr305.annotations, | ||
| akka*, | ||
| scala*, | ||
| org.eclipse.ditto.* | ||
| </Import-Package> | ||
| <Export-Package> | ||
| !org.eclipse.ditto.rql.parser.thingsearch.internal, | ||
| org.eclipse.ditto.rql.parser.* | ||
| </Export-Package> | ||
| </instructions> | ||
| </configuration> | ||
| </plugin> | ||
|
|
||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-javadoc-plugin</artifactId> | ||
| <configuration> | ||
| <excludePackageNames>org.eclipse.ditto.rql.parser.thingsearch</excludePackageNames> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>attach-javadocs</id> | ||
| <phase>none</phase> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
|
|
||
| <plugin> | ||
| <groupId>com.github.siom79.japicmp</groupId> | ||
| <artifactId>japicmp-maven-plugin</artifactId> | ||
| <configuration> | ||
| <skip>true</skip> <!-- TODO TJ unskip once 2.3.0 was released --> | ||
| <parameter> | ||
| <excludes> | ||
| <!-- Always exclude the 'internal' package --> | ||
| <exclude>org.eclipse.ditto.rql.parser.thingsearch.internal</exclude> | ||
| <!-- Don't add excludes here before checking with the whole Ditto team --> | ||
| <!--<exclude></exclude>--> | ||
| </excludes> | ||
| </parameter> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Placeholder to ensure META-INF is present |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.