Skip to content

Commit

Permalink
Fix #483 Flatten the integration-tests hierarchy and remove camel-qua…
Browse files Browse the repository at this point in the history 
…rkus-test-list.xml from git
  • Loading branch information
@ppalaga @lburgazzoli
ppalaga authored and lburgazzoli committed Nov 29, 2019
1 parent b04680f commit 9f0689f
Show file tree
Hide file tree
Showing 35 changed files with 397 additions and 526 deletions.
153 changes: 132 additions & 21 deletions integration-tests/core-main/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,27 +23,138 @@
<artifactId>camel-quarkus-integration-tests</artifactId>
<version>0.4.1-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>

<artifactId>camel-quarkus-integration-test-core-main-parent</artifactId>
<name>Camel Quarkus :: Integration Tests :: Core Main :: Parent</name>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-core-main-ext</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<modules>
<module>runtime</module>
<module>deployment</module>
<module>test</module>
</modules>

<artifactId>camel-quarkus-integration-test-core-main</artifactId>
<name>Camel Quarkus :: Integration Tests :: Core Main :: Tests</name>
<description>The camel integration tests</description>

<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-core-xml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-reactive-executor</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-log</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-timer</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-support-core-main-ext</artifactId>
</dependency>

<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jsonb</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-jsonb</artifactId>
</dependency>

<!-- test dependencies -->
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
<quarkus.test.profile>staging</quarkus.test.profile>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>native</id>
<activation>
<property>
<name>native</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
<configuration>
<systemProperties>
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
</systemProperties>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<executions>
<execution>
<id>native-image</id>
<goals>
<goal>native-image</goal>
</goals>
<configuration>
<cleanupServer>true</cleanupServer>
<enableHttpUrlHandler>true</enableHttpUrlHandler>
<enableServer>false</enableServer>
<dumpProxies>false</dumpProxies>
<enableJni>false</enableJni>
<disableReports>true</disableReports>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>


</project>
0 ...apache/camel/quarkus/core/CamelRoute.java → ...apache/camel/quarkus/core/CamelRoute.java
View file
File renamed without changes.
0 ...amel/quarkus/core/CamelRouteFiltered.java → ...amel/quarkus/core/CamelRouteFiltered.java
View file
File renamed without changes.
0 ...ache/camel/quarkus/core/CamelServlet.java → ...ache/camel/quarkus/core/CamelServlet.java
View file
File renamed without changes.
0 ...src/main/resources/application.properties → ...src/main/resources/application.properties
View file
File renamed without changes.
0 ...pache/camel/quarkus/core/CamelITCase.java → ...pache/camel/quarkus/core/CamelITCase.java
View file
File renamed without changes.
0 .../apache/camel/quarkus/core/CamelTest.java → .../apache/camel/quarkus/core/CamelTest.java
View file
File renamed without changes.
0 ...ain/test/src/test/resources/my-routes.xml → ...ore-main/src/test/resources/my-routes.xml
View file
File renamed without changes.
160 changes: 0 additions & 160 deletions integration-tests/core-main/test/pom.xml
View file

This file was deleted.

0 comments on commit 9f0689f

Please sign in to comment.