Merge pull request #1080 from turkeylurkey/issue-1048

Issue 1048, dev-it test failing
OpenLiberty · Jan 15, 2021 · 08787f6 · 08787f6
2 parents 5c24859 + 037a035
commit 08787f6
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 23 deletions.
diff --git a/liberty-maven-plugin/pom.xml b/liberty-maven-plugin/pom.xml
@@ -203,22 +203,6 @@
                 <runtimeKernelId>wlp-kernel</runtimeKernelId>
                 <runtimeVersion>${runtimeVersion}</runtimeVersion>
             </properties>
-            <!-- TEMPORARILY EXCLUDE dev-it for all platforms until issue 1048 is resolved. -->
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-invoker-plugin</artifactId>
-                            <configuration>
-                                <pomExcludes>
-                                    <pomExclude>dev-it/pom.xml</pomExclude>
-                                </pomExcludes>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
         </profile>
         <profile>
             <id>ol-its</id>
@@ -243,8 +227,6 @@
                             <artifactId>maven-invoker-plugin</artifactId>
                             <configuration>
                                 <pomExcludes>
-            <!-- TEMPORARILY EXCLUDE dev-it for all platforms until issue 1048 is resolved. -->
-                                    <pomExclude>dev-it/pom.xml</pomExclude>
                                     <pomExclude>basic-it/pom.xml</pomExclude>
                                     <pomExclude>assembly-it/pom.xml</pomExclude>
                                     <pomExclude>assembly-with-code-it/pom.xml</pomExclude>

diff --git a/liberty-maven-plugin/src/it/dev-it/resources/basic-dev-project/pom.xml b/liberty-maven-plugin/src/it/dev-it/resources/basic-dev-project/pom.xml
@@ -2,11 +2,6 @@
 <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-app-parent</artifactId>
-      <version>SUB_VERSION</version>
-  </parent>
 
   <groupId>dev-it-tests</groupId>
   <artifactId>dev-sample-proj</artifactId>