-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Don't default 'defaultJVMServer'. Add more tests covering bundle part…
… overrides
- Loading branch information
1 parent
253004c
commit 95f7742
Showing
42 changed files
with
1,156 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
cics-bundle-maven-plugin/src/it/test-bundle-war-no-jvmserver/invoker.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| ### | ||
| # #%L | ||
| # CICS Bundle Maven Plugin | ||
| # %% | ||
| # Copyright (C) 2019 IBM Corp. | ||
| # %% | ||
| # This program and the accompanying materials are made | ||
| # available under the terms of the Eclipse Public License 2.0 | ||
| # which is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| # | ||
| # SPDX-License-Identifier: EPL-2.0 | ||
| # #L% | ||
| ### | ||
| # The expected result of the build, possible values are "success" (default) and "failure" | ||
| invoker.buildResult = failure |
68 changes: 68 additions & 0 deletions
68
cics-bundle-maven-plugin/src/it/test-bundle-war-no-jvmserver/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| <!-- | ||
| #%L | ||
| CICS Bundle Maven Plugin | ||
| %% | ||
| Copyright (C) 2019 IBM Corp. | ||
| %% | ||
| This program and the accompanying materials are made | ||
| available under the terms of the Eclipse Public License 2.0 | ||
| which is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| SPDX-License-Identifier: EPL-2.0 | ||
| #L% | ||
| --> | ||
| <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> | ||
| <groupId>com.ibm.cics.test-bundle-war-no-jvmserver</groupId> | ||
| <artifactId>test-bundle-war-no-jvmserver</artifactId> | ||
| <version>0.0.1-SNAPSHOT</version> | ||
| <packaging>war</packaging> | ||
|
|
||
| <dependencies> | ||
| <!-- provided --> | ||
| <dependency> | ||
| <groupId>javax.ws.rs</groupId> | ||
| <artifactId>javax.ws.rs-api</artifactId> | ||
| <version>2.0</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-war-plugin</artifactId> | ||
| <version>3.2.3</version> | ||
| <configuration> | ||
| <failOnMissingWebXml>false</failOnMissingWebXml> | ||
| <packagingExcludes>pom.xml</packagingExcludes> | ||
| <warName>test-war</warName> | ||
| </configuration> | ||
| </plugin> | ||
|
|
||
| <plugin> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <version>3.5.1</version> | ||
| <configuration> | ||
| <source>1.8</source> | ||
| <target>1.8</target> | ||
| </configuration> | ||
| </plugin> | ||
|
|
||
| <plugin> | ||
| <groupId>@project.groupId@</groupId> | ||
| <artifactId>@project.artifactId@</artifactId> | ||
| <version>@project.version@</version> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>bundle-war</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
17 changes: 17 additions & 0 deletions
17
cics-bundle-maven-plugin/src/it/test-bundle-war-no-jvmserver/postbuild.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| /*- | ||
| * #%L | ||
| * CICS Bundle Maven Plugin | ||
| * %% | ||
| * Copyright (C) 2024 IBM Corp. | ||
| * %% | ||
| * This program and the accompanying materials are made | ||
| * available under the terms of the Eclipse Public License 2.0 | ||
| * which is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * #L% | ||
| */ | ||
| File buildLog = new File(basedir, 'build.log') | ||
|
|
||
| assert buildLog.exists() | ||
| assert buildLog.text.contains("The parameters 'jvmserver' for goal ${pluginString}:bundle-war are missing or invalid") |
File renamed without changes.
50 changes: 50 additions & 0 deletions
50
cics-bundle-maven-plugin/src/it/test-reactor-ear-jvmserver/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| <!-- | ||
| #%L | ||
| CICS Bundle Maven Plugin | ||
| %% | ||
| Copyright (C) 2019 IBM Corp. | ||
| %% | ||
| This program and the accompanying materials are made | ||
| available under the terms of the Eclipse Public License 2.0 | ||
| which is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| SPDX-License-Identifier: EPL-2.0 | ||
| #L% | ||
| --> | ||
| <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> | ||
|
|
||
| <groupId>test-reactor-ear-jvmserver</groupId> | ||
| <artifactId>parent</artifactId> | ||
| <version>0.0.1-SNAPSHOT</version> | ||
|
|
||
| <packaging>pom</packaging> | ||
|
|
||
| <modules> | ||
| <module>test-ear</module> | ||
| <module>test-bundle</module> | ||
| </modules> | ||
|
|
||
| <build> | ||
| <pluginManagement> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-ear-plugin</artifactId> | ||
| <version>3.0.1</version> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-war-plugin</artifactId> | ||
| <version>3.2.2</version> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <version>3.8.1</version> | ||
| </plugin> | ||
| </plugins> | ||
| </pluginManagement> | ||
| </build> | ||
|
|
||
| </project> |
1 change: 1 addition & 0 deletions
1
cics-bundle-maven-plugin/src/it/test-reactor-ear-jvmserver/postbuild.bsh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| com.ibm.cics.cbmp.PostBuildEar.assertOutput(basedir); |
55 changes: 55 additions & 0 deletions
55
cics-bundle-maven-plugin/src/it/test-reactor-ear-jvmserver/test-bundle/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| <!-- | ||
| #%L | ||
| CICS Bundle Maven Plugin | ||
| %% | ||
| Copyright (C) 2019 IBM Corp. | ||
| %% | ||
| This program and the accompanying materials are made | ||
| available under the terms of the Eclipse Public License 2.0 | ||
| which is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| SPDX-License-Identifier: EPL-2.0 | ||
| #L% | ||
| --> | ||
| <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>test-reactor-ear-jvmserver</groupId> | ||
| <artifactId>parent</artifactId> | ||
| <version>0.0.1-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>test-bundle</artifactId> | ||
| <packaging>cics-bundle</packaging> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>${project.groupId}</groupId> | ||
| <artifactId>test-ear</artifactId> | ||
| <version>${project.version}</version> | ||
| <type>ear</type> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>@project.groupId@</groupId> | ||
| <artifactId>@project.artifactId@</artifactId> | ||
| <version>@project.version@</version> | ||
| <extensions>true</extensions> | ||
| <configuration> | ||
| <bundleParts> | ||
| <bundlePart implementation="com.ibm.cics.cbmp.Earbundle"> | ||
| <artifact> | ||
| <artifactId>test-ear</artifactId> | ||
| </artifact> | ||
| <jvmserver>EYUCMCIJ</jvmserver> | ||
| </bundlePart> | ||
| </bundleParts> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
55 changes: 55 additions & 0 deletions
55
cics-bundle-maven-plugin/src/it/test-reactor-ear-jvmserver/test-ear/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| <!-- | ||
| #%L | ||
| CICS Bundle Maven Plugin | ||
| %% | ||
| Copyright (C) 2019 IBM Corp. | ||
| %% | ||
| This program and the accompanying materials are made | ||
| available under the terms of the Eclipse Public License 2.0 | ||
| which is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| SPDX-License-Identifier: EPL-2.0 | ||
| #L% | ||
| --> | ||
| <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>test-reactor-ear-jvmserver</groupId> | ||
| <artifactId>parent</artifactId> | ||
| <version>0.0.1-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>test-ear</artifactId> | ||
| <packaging>ear</packaging> | ||
|
|
||
| <dependencies> | ||
| <!-- provided --> | ||
| <dependency> | ||
| <groupId>javax.ws.rs</groupId> | ||
| <artifactId>javax.ws.rs-api</artifactId> | ||
| <version>2.0</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.ibm.cics</groupId> | ||
| <artifactId>test-war</artifactId> | ||
| <version>1.0.0</version> | ||
| <type>war</type> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-ear-plugin</artifactId> | ||
| <configuration> | ||
| <failOnMissingWebXml>false</failOnMissingWebXml> | ||
| <packagingExcludes>pom.xml</packagingExcludes> | ||
| <earName>test-ear</earName> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| </project> |
15 changes: 15 additions & 0 deletions
15
cics-bundle-maven-plugin/src/it/test-reactor-ear-nodefaultjvmserver/invoker.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| ### | ||
| # #%L | ||
| # CICS Bundle Maven Plugin | ||
| # %% | ||
| # Copyright (C) 2019 IBM Corp. | ||
| # %% | ||
| # This program and the accompanying materials are made | ||
| # available under the terms of the Eclipse Public License 2.0 | ||
| # which is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| # | ||
| # SPDX-License-Identifier: EPL-2.0 | ||
| # #L% | ||
| ### | ||
| # The expected result of the build, possible values are "success" (default) and "failure" | ||
| invoker.buildResult = failure |
50 changes: 50 additions & 0 deletions
50
cics-bundle-maven-plugin/src/it/test-reactor-ear-nodefaultjvmserver/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| <!-- | ||
| #%L | ||
| CICS Bundle Maven Plugin | ||
| %% | ||
| Copyright (C) 2019 IBM Corp. | ||
| %% | ||
| This program and the accompanying materials are made | ||
| available under the terms of the Eclipse Public License 2.0 | ||
| which is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| SPDX-License-Identifier: EPL-2.0 | ||
| #L% | ||
| --> | ||
| <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> | ||
|
|
||
| <groupId>test-reactor-ear-nodefaultjvmserver</groupId> | ||
| <artifactId>parent</artifactId> | ||
| <version>0.0.1-SNAPSHOT</version> | ||
|
|
||
| <packaging>pom</packaging> | ||
|
|
||
| <modules> | ||
| <module>test-ear</module> | ||
| <module>test-bundle</module> | ||
| </modules> | ||
|
|
||
| <build> | ||
| <pluginManagement> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-ear-plugin</artifactId> | ||
| <version>3.0.1</version> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-war-plugin</artifactId> | ||
| <version>3.2.2</version> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <version>3.8.1</version> | ||
| </plugin> | ||
| </plugins> | ||
| </pluginManagement> | ||
| </build> | ||
|
|
||
| </project> |
17 changes: 17 additions & 0 deletions
17
cics-bundle-maven-plugin/src/it/test-reactor-ear-nodefaultjvmserver/postbuild.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| /*- | ||
| * #%L | ||
| * CICS Bundle Maven Plugin | ||
| * %% | ||
| * Copyright (C) 2024 IBM Corp. | ||
| * %% | ||
| * This program and the accompanying materials are made | ||
| * available under the terms of the Eclipse Public License 2.0 | ||
| * which is available at https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * #L% | ||
| */ | ||
| File buildLog = new File(basedir, 'build.log') | ||
|
|
||
| assert buildLog.exists() | ||
| assert buildLog.text.contains("[ERROR] Failed to execute goal ${pluginString}:build (default-build) on project test-bundle: Bundle part for artifact test-reactor-ear-nodefaultjvmserver:test-ear:ear:0.0.1-SNAPSHOT:compile did not specify a JVM server explicitly, and no default was configured") |
Oops, something went wrong.