Skip to content

Commit

Permalink
Merge pull request #75 from OpenLiberty/update-pom
Browse files Browse the repository at this point in the history 
Updated pom
  • Loading branch information
@gkwan-ibm
gkwan-ibm authored May 11, 2020
2 parents 7f829aa + 845d35d commit aa066f2
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 36 deletions.
28 changes: 10 additions & 18 deletions finish/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,19 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<failOnMissingWebXml>false</failOnMissingWebXml>
<!-- Plugin versions -->
<version.liberty-maven-plugin>3.2</version.liberty-maven-plugin>
<version.maven-failsafe-plugin>2.22.2</version.maven-failsafe-plugin>
<version.maven-war-plugin>3.2.3</version.maven-war-plugin>
<version.maven-surefire-plugin>2.22.2</version.maven-surefire-plugin>
<version.maven-dependency-plugin>3.1.2</version.maven-dependency-plugin>
<version.hazelcast>3.12.6</version.hazelcast>
<!-- Liberty configuration -->
<hazelcast.path>${user.home}/.m2/repository/com/hazelcast/hazelcast/</hazelcast.path>
<liberty.var.default.http.port>9080</liberty.var.default.http.port>
<liberty.var.default.https.port>9443</liberty.var.default.https.port>
<liberty.var.app.context.root>${project.artifactId}</liberty.var.app.context.root>
<liberty.var.hazelcast.lib>${hazelcast.path}/${version.hazelcast}/hazelcast-${version.hazelcast}.jar</liberty.var.hazelcast.lib>
<liberty.var.hazelcast.lib>${hazelcast.path}/3.12.6/hazelcast-3.12.6.jar</liberty.var.hazelcast.lib>
</properties>

<dependencies>
<!-- Provided dependencies -->
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-web-api</artifactId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>8.0.0</version>
<scope>provided</scope>
</dependency>
Expand All @@ -47,14 +39,14 @@
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
<version>${version.hazelcast}</version>
<version>3.12.6</version>
<scope>test</scope>
</dependency>

<!-- For tests -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<artifactId>junit-jupiter</artifactId>
<version>5.6.2</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -110,21 +102,21 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${version.maven-war-plugin}</version>
<version>3.2.3</version>
</plugin>

<!-- Enable Liberty Maven plugin -->
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>${version.liberty-maven-plugin}</version>
<version>3.2</version>
</plugin>

<!-- Copy the hazelcast library -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>${version.maven-dependency-plugin}</version>
<version>3.1.2</version>
<executions>
<execution>
<id>copy</id>
Expand All @@ -139,7 +131,7 @@
<artifactItem>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
<version>${hazelcast.version}</version>
<version>3.12.6</version>
<type>jar</type>
</artifactItem>
</artifactItems>
Expand All @@ -152,14 +144,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.maven-surefire-plugin}</version>
<version>2.22.2</version>
</plugin>

<!-- Plugin to run functional tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${version.maven-failsafe-plugin}</version>
<version>2.22.2</version>
<configuration>
<systemPropertyVariables>
<http.port>${liberty.var.default.http.port}</http.port>
Expand Down
28 changes: 10 additions & 18 deletions start/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,19 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<failOnMissingWebXml>false</failOnMissingWebXml>
<!-- Plugin versions -->
<version.liberty-maven-plugin>3.2</version.liberty-maven-plugin>
<version.maven-failsafe-plugin>2.22.2</version.maven-failsafe-plugin>
<version.maven-war-plugin>3.2.3</version.maven-war-plugin>
<version.maven-surefire-plugin>2.22.2</version.maven-surefire-plugin>
<version.maven-dependency-plugin>3.1.2</version.maven-dependency-plugin>
<version.hazelcast>3.12.6</version.hazelcast>
<!-- Liberty configuration -->
<hazelcast.path>${user.home}/.m2/repository/com/hazelcast/hazelcast/</hazelcast.path>
<liberty.var.default.http.port>9080</liberty.var.default.http.port>
<liberty.var.default.https.port>9443</liberty.var.default.https.port>
<liberty.var.app.context.root>${project.artifactId}</liberty.var.app.context.root>
<liberty.var.hazelcast.lib>${hazelcast.path}/${version.hazelcast}/hazelcast-${version.hazelcast}.jar</liberty.var.hazelcast.lib>
<liberty.var.hazelcast.lib>${hazelcast.path}/3.12.6/hazelcast-3.12.6.jar</liberty.var.hazelcast.lib>
</properties>

<dependencies>
<!-- Provided dependencies -->
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-web-api</artifactId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>8.0.0</version>
<scope>provided</scope>
</dependency>
Expand All @@ -47,14 +39,14 @@
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
<version>${version.hazelcast}</version>
<version>3.12.6</version>
<scope>test</scope>
</dependency>

<!-- For tests -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<artifactId>junit-jupiter</artifactId>
<version>5.6.2</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -110,21 +102,21 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${version.maven-war-plugin}</version>
<version>3.2.3</version>
</plugin>

<!-- Enable Liberty Maven plugin -->
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>${version.liberty-maven-plugin}</version>
<version>3.2</version>
</plugin>

<!-- Copy the hazelcast library -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>${version.maven-dependency-plugin}</version>
<version>3.1.2</version>
<executions>
<execution>
<id>copy</id>
Expand All @@ -139,7 +131,7 @@
<artifactItem>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast</artifactId>
<version>${hazelcast.version}</version>
<version>3.12.6</version>
<type>jar</type>
</artifactItem>
</artifactItems>
Expand All @@ -152,14 +144,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.maven-surefire-plugin}</version>
<version>2.22.2</version>
</plugin>

<!-- Plugin to run functional tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${version.maven-failsafe-plugin}</version>
<version>2.22.2</version>
<configuration>
<systemPropertyVariables>
<http.port>${liberty.var.default.http.port}</http.port>
Expand Down

0 comments on commit aa066f2

Please sign in to comment.