You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2021/11/01 08:34:59 UTC
[plc4x] 01/02: - Made plc4c code-generation testsuite run again
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/mspec-ng
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 5545adf78298a83e3fc40459016dbfebd2c2e1a5
Author: cdutz <ch...@c-ware.de>
AuthorDate: Mon Nov 1 08:19:48 2021 +0100
- Made plc4c code-generation testsuite run again
---
code-generation/language-c/pom.xml | 39 +++++++++++++++++++
.../src/test/resources/integration-test/pom.xml | 44 ++--------------------
2 files changed, 43 insertions(+), 40 deletions(-)
diff --git a/code-generation/language-c/pom.xml b/code-generation/language-c/pom.xml
index 8838984..2a8f589 100644
--- a/code-generation/language-c/pom.xml
+++ b/code-generation/language-c/pom.xml
@@ -34,6 +34,45 @@
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <version>3.2.2</version>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <!-- Install the current project artifacts into the maven local repo, so they can be used in the test -->
+ <goal>install</goal>
+ <!-- Execute the maven builds defines in src/test/resources -->
+ <goal>integration-test</goal>
+ <!-- Checks the results of the maven builds -->
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <debug>true</debug>
+ <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+ <projectsDirectory>src/test/resources</projectsDirectory>
+ <cloneProjectsTo>${project.build.directory}/integration-tests</cloneProjectsTo>
+ <settingsFile>src/test/resources/settings.xml</settingsFile>
+ <extraArtifacts>
+ <extraArtifact>org.apache.plc4x.plugins:plc4x-code-generation-language-base:${plc4x-code-generation.version}</extraArtifact>
+ <extraArtifact>org.apache.plc4x.plugins:plc4x-maven-plugin:${plc4x-code-generation.version}</extraArtifact>
+ <extraArtifact>org.apache.plc4x.plugins:plc4x-code-generation-protocol-base:${plc4x-code-generation.version}</extraArtifact>
+ <extraArtifact>org.apache.plc4x.plugins:plc4x-code-generation-types-base:${plc4x-code-generation.version}</extraArtifact>
+ <extraArtifact>org.apache.plc4x.plugins:plc4x-code-generation-types-base:${plc4x-code-generation.version}</extraArtifact>
+ </extraArtifacts>
+ <pomIncludes>
+ <pomInclude>*/pom.xml</pomInclude>
+ </pomIncludes>
+ <!-- The goals we will be executing in the test-projects -->
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/code-generation/language-c/src/test/resources/integration-test/pom.xml b/code-generation/language-c/src/test/resources/integration-test/pom.xml
index 5e778ba..023be47 100644
--- a/code-generation/language-c/src/test/resources/integration-test/pom.xml
+++ b/code-generation/language-c/src/test/resources/integration-test/pom.xml
@@ -320,54 +320,18 @@
<dependencies>
<dependency>
<groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-api</artifactId>
- <version>@project.version@</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-spi</artifactId>
- <version>@project.version@</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-transport-tcp</artifactId>
- <version>@project.version@</version>
- </dependency>
-
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-buffer</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-utils-test-utils</artifactId>
- <version>@project.version@</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-code-generation-language-c</artifactId>
<version>@project.version@</version>
+ <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4x-code-generation-protocol-test</artifactId>
<version>@project.version@</version>
+ <!-- Scope is 'provided' as this way it's not shipped with the driver -->
+ <scope>provided</scope>
</dependency>
<dependency>