Skip to content

Commit

Permalink
Merge pull request #9 from turing85/feature/switch-to-vertx
Browse files Browse the repository at this point in the history 
Did someone say vert.x?
  • Loading branch information
@christophd
christophd authored Sep 4, 2024
2 parents a3415cb + 212fb04 commit fef261e
Show file tree
Hide file tree
Showing 6 changed files with 246 additions and 253 deletions.
40 changes: 27 additions & 13 deletions citrus-remote-sample/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<properties>
<citrus.version>4.3.1</citrus.version>
<spring.version>6.1.12</spring.version>

<docker>false</docker>
</properties>

<build>
Expand Down Expand Up @@ -96,6 +98,9 @@
<goal>verify</goal>
</goals>
<phase>verify</phase>
<configuration>
<skip>${docker}</skip>
</configuration>
</execution>
</executions>
</plugin>
Expand All @@ -104,81 +109,88 @@

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.citrusframework</groupId>
<artifactId>citrus-bom</artifactId>
<version>${citrus.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
<version>${log4j2.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- We need to override the default from the parent -->
<!-- For normal projects, this is not necessary. -->
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.1.0</version>
</dependency>

<!-- Citrus remote -->
<dependency>
<groupId>org.citrusframework</groupId>
<artifactId>citrus-remote-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<!-- Spring-Boot -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
<scope>test</scope>
</dependency>

<!-- Logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-iostreams</artifactId>
<version>${log4j2.version}</version>
<scope>test</scope>
</dependency>

<!-- Citrus -->
<dependency>
<groupId>org.citrusframework</groupId>
<artifactId>citrus-base</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.citrusframework</groupId>
<artifactId>citrus-spring</artifactId>
<version>${citrus.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.citrusframework</groupId>
<artifactId>citrus-endpoint-catalog</artifactId>
<version>${citrus.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.citrusframework</groupId>
<artifactId>citrus-testng</artifactId>
<version>${citrus.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.citrusframework</groupId>
<artifactId>citrus-http</artifactId>
<version>${citrus.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.citrusframework</groupId>
<artifactId>citrus-validation-text</artifactId>
<version>${citrus.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

Expand All @@ -193,7 +205,9 @@
<docker.remove.skip>false</docker.remove.skip>
<docker.start.skip>false</docker.start.skip>
<docker.stop.skip>false</docker.stop.skip>
<docker>true</docker>
</properties>

<build>
<plugins>
<plugin>
Expand Down
77 changes: 2 additions & 75 deletions citrus-remote-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,83 +13,10 @@
<name>Citrus :: Tools :: Remote Server</name>
<description>Citrus Remote Server</description>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<includes>
<include>org.eclipse.jetty*</include>
<include>jakarta.servlet:jakarta.servlet-api</include>
<include>com.sparkjava*</include>
<include>org.citrusframework:citrus-remote</include>
</includes>
</artifactSet>
<dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<relocations>
<relocation>
<pattern>org.eclipse.jetty</pattern>
<shadedPattern>shaded.org.eclipse.jetty</shadedPattern>
<excludes>
<exclude>META-INF/*.MF</exclude>
</excludes>
</relocation>
<relocation>
<pattern>javax.servlet</pattern>
<shadedPattern>shaded.javax.servlet</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>org.eclipse.jetty*</artifact>
<excludes>
<exclude>META-INF/*.MF</exclude>
<exclude>META-INF/LICENSE</exclude>
<exclude>META-INF/NOTICE.txt</exclude>
<exclude>about.html</exclude>
</excludes>
</filter>
<filter>
<artifact>jakarta.servlet</artifact>
<excludes>
<exclude>META-INF/*.MF</exclude>
</excludes>
</filter>
<filter>
<artifact>com.sparkjava*</artifact>
<excludes>
<exclude>META-INF/*.MF</exclude>
</excludes>
</filter>
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
<useDependencyReducedPomInJar>true</useDependencyReducedPomInJar>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>com.sparkjava</groupId>
<artifactId>spark-core</artifactId>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<groupId>io.vertx</groupId>
<artifactId>vertx-web</artifactId>
</dependency>

<dependency>
Expand Down
Loading

0 comments on commit fef261e

Please sign in to comment.