Skip to content

Commit

Permalink
Merge pull request #199 from Sahil2712/master
Browse files Browse the repository at this point in the history
Changed Throntail application to Quarkus appication
  • Loading branch information
xstefank authored May 27, 2020
2 parents 77165b7 + 000519c commit 298d25b
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 20 deletions.
23 changes: 14 additions & 9 deletions microservice-session/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,17 @@

<plugins>
<plugin>
<groupId>io.thorntail</groupId>
<artifactId>thorntail-maven-plugin</artifactId>
</plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${version.quarkus}</version>
<executions>
<execution>
<goals>
<goal>build</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand All @@ -49,7 +57,6 @@
<activation>
<activeByDefault>false</activeByDefault>
</activation>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -80,7 +87,6 @@
<goals>
<goal>resource</goal>
<goal>build</goal>
<!--<goal>deploy</goal>-->
</goals>
</execution>
</executions>
Expand Down Expand Up @@ -151,24 +157,23 @@
</build>
</profile>
</profiles>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.8.2</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>io.microprofile.showcase</groupId>
<artifactId>demo-bootstrap</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>io.thorntail</groupId>
<artifactId>microprofile</artifactId>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-resteasy-jsonb</artifactId>
</dependency>
</dependencies>
</project>
21 changes: 10 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<version.jackson>2.8.2</version.jackson>

<!-- App servers -->
<version.thorntail>2.6.0.Final</version.thorntail>
<version.quarkus>1.3.2.Final</version.quarkus>
<version.payara>4.1.2.173</version.payara>
<version.payara.embedded>4.1.2.173.0.1</version.payara.embedded>
<version.tomee>7.0.1</version.tomee>
Expand Down Expand Up @@ -148,15 +148,16 @@
<scope>provided</scope>
</dependency>

<!-- THORNTAIL -->
<!-- Quarkus -->
<dependency>
<groupId>io.thorntail</groupId>
<artifactId>bom-all</artifactId>
<version>${version.thorntail}</version>
<scope>import</scope>
<type>pom</type>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bom</artifactId>
<version>${version.quarkus}</version>
<type>pom</type>
<scope>import</scope>
</dependency>



<!-- TOMEE -->
<dependency>
<groupId>org.apache.tomee</groupId>
Expand Down Expand Up @@ -255,7 +256,6 @@
<artifactId>jackson-databind</artifactId>
<version>${version.jackson}</version>
</dependency>

<!-- TEST -->
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -317,7 +317,7 @@
<artifactId>maven-dependency-plugin</artifactId>
<version>${version.dependency.plugin}</version>
<configuration>
<!-- Perfs improvements - PAR-191 -->
<!-- Perfs improvements - PAR-191 -->
<useJvmChmod>true</useJvmChmod>
</configuration>
</plugin>
Expand Down Expand Up @@ -400,7 +400,6 @@
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
</manifestEntries>
</archive>
<!--<warName>${project.artifactId}</warName>-->
<warName>${warfile.name}</warName>
</configuration>
</plugin>
Expand Down

0 comments on commit 298d25b

Please sign in to comment.