Skip to content

Commit

Permalink
Merge pull request #76 from mulderbaba/MP-38-Upgrade-default-Payara-v…
Browse files Browse the repository at this point in the history
…ersion-to-5.184-in-payara-micro-maven-plugin

MP-38-Upgrade-default-Payara-version-to-5.184-in-payara-micro-maven-plugin
  • Loading branch information
mulderbaba authored Dec 6, 2018
2 parents 5092da8 + b2c44c1 commit 633d38b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions payara-micro-maven-plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ This goal bundles the attached project's artifact into uber jar with specified c
- __autoDeployArtifact__ (optional | default: true): If the extension of the produced artifact is <b>war</b>, it will be copied automatically to ```MICRO-INF/deploy``` folder when this property is set to true.
- __startClass__ (optional): Replaces ```Start-Class``` definition that resides in MANIFEST.MF file with the provided class.
- __appendSystemProperties__ (optional | default: true): Appends all system properties defined into the ```payara-boot.properties``` file.
- __payaraVersion__ (optional | default: 5.183): By default ```bundle``` mojo fetches payara-micro with version 5.183.
- __payaraVersion__ (optional | default: 5.184): By default ```bundle``` mojo fetches payara-micro with version 5.184.
- __deployArtifacts__ (optional): Can contain a list of artifactItems, which defines the dependencies with their GAVs to be copied under ```MICRO-INF/deploy``` folder.
- __customJars__ (optional): Can contain a list of artifactItems, which defines the dependencies with their GAVs to be copied under ```MICRO-INF/lib``` folder.

Expand All @@ -68,11 +68,11 @@ This goal start payara-micro with specified configurations. ```start``` is attac
<immediateExit>false</immediateExit>
<javaPath>/path/to/Java/Executable</javaPath>
<payaraMicroAbsolutePath>/path/to/payara-micro.jar</payaraMicroAbsolutePath>
<payaraVersion>5.183</payaraVersion>
<payaraVersion>5.184</payaraVersion>
<artifactItem>
<groupId>fish.payara.extras</groupId>
<artifactId>payara-micro</artifactId>
<version>5.183</version>
<version>5.184</version>
</artifactItem>
<deployWar>true</deployWar>
<javaCommandLineOptions>
Expand Down Expand Up @@ -106,7 +106,7 @@ If you want to execute the payara-micro plugin along with ```maven-toolchains-pl
- __immediateExit__ (optional | default: false): If payara-micro is executed in ```daemon``` mode, the executor thread will wait for the ready message before shutting down its process. By setting ```immediateExit``` to ```true``` you can skip this and instantly interrupt the executor thread.
- __javaPath__ (optional): Absolute path to the ```java``` executable. This has higher priority to the java executable identified via Maven toolchain.
- __payaraMicroAbsolutePath__ (optional): Absolute path to payara-micro executable.
- __payaraVersion__ (optional | default: "5.183"): The payara-micro version that will be used with ```start``` mojo.
- __payaraVersion__ (optional | default: "5.184"): The payara-micro version that will be used with ```start``` mojo.
- __artifactItem__ (optional): Defines payara-micro artifact with its coordinates. Specified artifact should be available in local maven repository.
- __deployWar__ (optional | default: false): If the attached project is of type WAR, it will automatically be deployed to payara-micro if ```deployWar``` is set to ```true```.
- __copySystemProperties__ (deprecated): System properties propagate to the payara-micro execution by default so we deprecated and are ignoring this property from now on.
Expand Down Expand Up @@ -135,7 +135,7 @@ If an ```artifactItem``` is defined, it will take precedence for identifying cur
<artifactItem>
<groupId>fish.payara.extras</groupId>
<artifactId>payara-micro</artifactId>
<version>5.183</version>
<version>5.184</version>
</artifactItem>
</configuration>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
/**
* Bundle mojo incorporates payara-micro with the produced artifact by following steps given as follows:
* <ul>
* <li>Fetch payara-micro from repository and open it to a folder. The default version is <i>5.183</i>. Specific
* <li>Fetch payara-micro from repository and open it to a folder. The default version is <i>5.184</i>. Specific
* version can be provided with @{code payaraVersion} parameter</li>
* <li>Fetch user specified jars from repository</li>
* <li>Copy any existing {@code domain.xml}, {@code keystore.jks}, {@code login.conf } and {@code login.properties} files from resources folder into /MICRO-INF/domain folder</li>
Expand Down Expand Up @@ -81,9 +81,9 @@
public class BundleMojo extends BasePayaraMojo {

/**
* By default this mojo fetches payara-micro with version 5.183. It can be overridden with this parameter.
* By default this mojo fetches payara-micro with version 5.184. It can be overridden with this parameter.
*/
@Parameter(property = "payaraVersion", defaultValue = "5.183")
@Parameter(property = "payaraVersion", defaultValue = "5.184")
private String payaraVersion;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public class StartMojo extends BasePayaraMojo {
@Parameter(property = "javaPath")
private String javaPath;

@Parameter(property = "payaraVersion", defaultValue = "5.183")
@Parameter(property = "payaraVersion", defaultValue = "5.184")
private String payaraVersion;

@Parameter(property = "payaraMicroAbsolutePath")
Expand Down Expand Up @@ -336,7 +336,7 @@ private void redirectStream(final InputStream inputStream, final PrintStream pri
printStream.println(line);
if (!immediateExit && sb.toString().contains(MICRO_READY_MESSAGE)) {
microProcessorThread.interrupt();
br.close()
br.close();
break;
}
}
Expand Down

0 comments on commit 633d38b

Please sign in to comment.