Skip to content
This repository has been archived by the owner on Jul 27, 2023. It is now read-only.

java-microprofile Revert "#364 improve pom.xml by adopting agreed best practices" #418

Merged
merged 3 commits into from
Oct 8, 2019
Merged

java-microprofile Revert "#364 improve pom.xml by adopting agreed best practices" #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e7283b
Revert "#364 improve pom.xml by adopting agreed best practices (#397)"
neeraj-laad Oct 8, 2019
7f5c29e
Update pom.xml
neeraj-laad Oct 8, 2019
ff2a812
Update stack.yaml
neeraj-laad Oct 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions incubator/java-microprofile/image/project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<groupId>dev.appsody</groupId>
<artifactId>java-microprofile</artifactId>
<version>0.2.16</version>
<version>0.2.17</version>
<packaging>pom</packaging>

<properties>
Expand All @@ -31,7 +31,6 @@
<liberty.groupId>io.openliberty</liberty.groupId>
<liberty.artifactId>openliberty-runtime</liberty.artifactId>
<version.openliberty-runtime>19.0.0.8</version.openliberty-runtime>
<openliberty.maven.version>3.0.1</openliberty.maven.version>
<http.port>9080</http.port>
<https.port>9443</https.port>
<packaging.type>usr</packaging.type>
Expand Down
2 changes: 1 addition & 1 deletion incubator/java-microprofile/stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Eclipse MicroProfile®
version: 0.2.16
version: 0.2.17
description: Eclipse MicroProfile on Open Liberty & OpenJ9 using Maven
license: Apache-2.0
language: java
Expand Down
103 changes: 75 additions & 28 deletions incubator/java-microprofile/templates/default/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,11 @@
<packaging>war</packaging>

<dependencies>
<!-- MicroProfile BOM -->
<!-- Open Liberty Features -->
<dependency>
<groupId>org.eclipse.microprofile</groupId>
<artifactId>microprofile</artifactId>
<version>3.0</version>
<type>pom</type>
<scope>provided</scope>
<groupId>io.openliberty.features</groupId>
<artifactId>microProfile-3.0</artifactId>
<type>esa</type>
</dependency>
<!-- For tests -->
<dependency>
Expand Down Expand Up @@ -58,6 +56,24 @@
<version>2.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1.1</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand All @@ -74,23 +90,8 @@
</plugin>
<!-- Enable liberty-maven plugin -->
<plugin>
<groupId>io.openliberty.tools</groupId>
<groupId>net.wasdev.wlp.maven.plugins</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>${openliberty.maven.version}</version>
<executions>
<execution>
<id>package-server</id>
<phase>package</phase>
<goals>
<goal>create</goal>
<goal>deploy</goal>
<goal>package</goal>
</goals>
<configuration>
<outputDirectory>target/wlp-package</outputDirectory>
</configuration>
</execution>
</executions>
<configuration>
<assemblyArtifact>
<groupId>${liberty.groupId}</groupId>
Expand All @@ -99,6 +100,9 @@
<type>zip</type>
</assemblyArtifact>
<serverName>defaultServer</serverName>
<stripVersion>true</stripVersion>
<configFile>src/main/liberty/config/server.xml</configFile>
<looseApplication>true</looseApplication>
<packageFile>${package.file}</packageFile>
<include>${packaging.type}</include>
<bootstrapProperties>
Expand All @@ -112,19 +116,62 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${version.maven-surefire-plugin}</version>
<version>${version.maven-surefire-plugin}</version>
<executions>
<execution>
<phase>test</phase>
<id>default-test</id>
<configuration>
<excludes>
<exclude>**/it/**</exclude>
</excludes>
<reportsDirectory>
${project.build.directory}/test-reports/unit
</reportsDirectory>
</configuration>
</execution>
</executions>
<configuration>
<skipTests>${skipTests}</skipTests>
</configuration>
</plugin>
<!-- Plugin to run functional tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${version.maven-failsafe-plugin}</version>
<executions>
<execution>
<phase>integration-test</phase>
<id>integration-test</id>
<goals>
<goal>integration-test</goal>
</goals>
<configuration>
<includes>
<include>**/it/**</include>
</includes>
<systemPropertyVariables>
<liberty.test.port>${http.port}</liberty.test.port>
<war.name>${app.name}</war.name>
</systemPropertyVariables>
</configuration>
</execution>
<execution>
<id>verify-results</id>
<goals>
<goal>verify</goal>
</goals>
</execution>
</executions>
<configuration>
<systemPropertyVariables>
<liberty.test.port>${http.port}</liberty.test.port>
<war.name>${app.name}</war.name>
</systemPropertyVariables>
</configuration>
<summaryFile>
${project.build.directory}/test-reports/it/failsafe-summary.xml
</summaryFile>
<reportsDirectory>
${project.build.directory}/test-reports/it
</reportsDirectory>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion ...dev/appsody/starter/HealthEndpointIT.java → ...v/appsody/starter/HealthEndpointTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.junit.BeforeClass;
import org.junit.Test;

public class HealthEndpointIT {
public class HealthEndpointTest {

private static String baseUrl;
private static final String LIVENESS_ENDPOINT = "/health/live";
Expand Down