Skip to content

[WIP] testing whether integration-tests as module works for plugins #1708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bmarwell wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[WIP] testing whether integration-tests as module works for plugins #1708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
142 changes: 142 additions & 0 deletions liberty-maven-plugin-integration-tests/assembly-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>io.openliberty.tools.it</groupId>
<artifactId>liberty-maven-plugin-integration-tests</artifactId>
<version>3.8.3-SNAPSHOT</version>
</parent>

<artifactId>assembly-server</artifactId>
<packaging>pom</packaging>

<properties>
<!-- Specify Liberty profile server installation directory -->
<liberty.install.dir>${libertyInstallDir}</liberty.install.dir>
</properties>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.1.1</version>
</plugin>
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>${project.version}</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<!-- install the liberty server zip the local maven repo. This is used
by the liberty-packaging-test and liberty-packaging-it tests -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
<id>install-liberty-to-repo</id>
<phase>compile</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<file>${basedir}/target/liberty.zip</file>
<groupId>${project.groupId}</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<packaging>zip</packaging>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>offline-its</id>
<build>
<plugins>
<plugin>
<!-- zip up the liberty server to deploy it to the local maven repo
(next plugin) -->
<!-- I would expect the server is already available as a zip, but I
can't find it -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>generate-resources</phase>
<configuration>
<target>
<zip basedir="${liberty.install.dir}" destfile="${basedir}/target/liberty.zip"
excludes="usr/servers/**" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>online-its</id>
<build>
<plugins>
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<executions>
<execution>
<id>downloading-wlp</id>
<phase>generate-resources</phase>
<goals>
<goal>status</goal>
</goals>
<configuration>
<assemblyArtifact>
<groupId>${runtimeGroupId}</groupId>
<artifactId>${runtimeArtifactId}</artifactId>
<version>${runtimeVersion}</version>
<type>zip</type>
</assemblyArtifact>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>process-resources</phase>
<configuration>
<target>
<zip basedir="${basedir}/target/liberty/wlp" destfile="${basedir}/target/liberty.zip" />
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
25 changes: 18 additions & 7 deletions ...plugin/src/it/config-directory-it/pom.xml → ...gration-tests/config-directory-it/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,26 @@

<parent>
<groupId>io.openliberty.tools.it</groupId>
<artifactId>tests</artifactId>
<version>1.0-SNAPSHOT</version>
<artifactId>liberty-maven-plugin-integration-tests</artifactId>
<version>3.8.3-SNAPSHOT</version>
</parent>

<artifactId>config-directory-it</artifactId>
<packaging>war</packaging>

<dependencies>
<dependency>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>${project.version}</version>
<type>maven-plugin</type>
</dependency>
<dependency>
<groupId>io.openliberty.tools.it</groupId>
<artifactId>assembly-server</artifactId>
<version>${project.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_3.0_spec</artifactId>
Expand Down Expand Up @@ -68,8 +80,7 @@
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>@pom.version@</version>
<extensions>true</extensions>
<version>${project.version}</version>
<configuration>
<stripVersion>true</stripVersion>
<assemblyArtifact>
Expand Down Expand Up @@ -156,7 +167,7 @@
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>${project.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -183,7 +194,7 @@
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>${project.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -205,7 +216,7 @@
<plugin>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>@pom.version@</version>
<version>${project.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down
0 ...ig-directory-it/src/main/webapp/index.jsp → ...ig-directory-it/src/main/webapp/index.jsp
View file
Open in desktop
File renamed without changes.
0 ...p/maven/test/app/ConfigDirectoryTest.java → ...p/maven/test/app/ConfigDirectoryTest.java
View file
Open in desktop
File renamed without changes.
0 .../maven/test/app/KeystorePasswordTest.java → .../maven/test/app/KeystorePasswordTest.java
View file
Open in desktop
File renamed without changes.
0 ...est/app/LibertySettingsDirectoryTest.java → ...est/app/LibertySettingsDirectoryTest.java
View file
Open in desktop
File renamed without changes.
0 ...p/maven/test/app/MicroCleanAfterTest.java → ...p/maven/test/app/MicroCleanAfterTest.java
View file
Open in desktop
File renamed without changes.
0 .../maven/test/app/MicroCleanBeforeTest.java → .../maven/test/app/MicroCleanBeforeTest.java
View file
Open in desktop
File renamed without changes.
0 ...dev/wlp/maven/test/support/HttpUtils.java → ...dev/wlp/maven/test/support/HttpUtils.java
View file
Open in desktop
File renamed without changes.
0 ...y-it/src/test/resources/invalidDirPom.xml → ...y-it/src/test/resources/invalidDirPom.xml
View file
Open in desktop
File renamed without changes.
0 ...irectory-it/src/test/resources/server.xml → ...irectory-it/src/test/resources/server.xml
View file
Open in desktop
File renamed without changes.
0 ...src/test/resources/testConfig/server1.xml → ...src/test/resources/testConfig/server1.xml
View file
Open in desktop
File renamed without changes.
0 .../testConfig/testDir/bootstrap1.properties → .../testConfig/testDir/bootstrap1.properties
View file
Open in desktop
File renamed without changes.
0 ...s/testLibertyConfig/repository.properties → ...s/testLibertyConfig/repository.properties
View file
Open in desktop
File renamed without changes.
51 changes: 51 additions & 0 deletions liberty-maven-plugin-integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>io.openliberty.tools</groupId>
<artifactId>liberty-maven</artifactId>
<version>3.8.3-SNAPSHOT</version>
</parent>

<groupId>io.openliberty.tools.it</groupId>
<artifactId>liberty-maven-plugin-integration-tests</artifactId>
<version>3.8.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Liberty Maven Plugin :: ITs</name>

<modules>
<module>assembly-server</module>
<module>config-directory-it</module>
</modules>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.3.0</version>
<inherited>true</inherited>
<executions>
<execution>
<id>portnumber</id>
<phase>pre-integration-test</phase>
<goals>
<goal>reserve-network-port</goal>
</goals>
<configuration>
<portNames>
<name>liberty.port</name>
</portNames>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>

</project>
1 change: 1 addition & 0 deletions liberty-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@
</profiles>
<streamLogs>true</streamLogs>
<mavenOpts>-Dfile.encoding=UTF-8</mavenOpts>
<skipInvocation>${skipPluginIts}</skipInvocation>
</configuration>
<executions>
<execution>
Expand Down
5 changes: 0 additions & 5 deletions liberty-maven-plugin/src/it/config-directory-it/invoker.properties
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<modules>
<module>liberty-maven-app-parent</module>
<module>liberty-maven-plugin</module>
<module>liberty-maven-plugin-integration-tests</module>
</modules>

<build>
Expand Down