[PAYARA-4150] - Micro Container Updates #27
Conversation
| Properties microProperties = new Properties(); | ||
| microProperties.load(microJarFile.getInputStream(pomProperties)); | ||
| this.microVersion = new PayaraVersion(microProperties.getProperty("version")); | ||
| this.microVersion = new PayaraVersion(microProperties.getProperty("major_version") + microProperties.getProperty("minor_version")); |
There was a problem hiding this comment.
Shouldn't there be a dot between major and minor?
| ZipEntry pomProperties = microJarFile | ||
| .getEntry("META-INF/maven/fish.payara.micro/payara-micro-boot/pom.properties"); | ||
|
|
||
| zipEntryDir = "MICRO-INF/domain/branding/glassfish-version.properties"; |
There was a problem hiding this comment.
This is a file, not a directory, so also the exception below is bit misleading
| Properties microProperties = new Properties(); | ||
| microProperties.load(microJarFile.getInputStream(pomProperties)); | ||
| this.microVersion = new PayaraVersion(microProperties.getProperty("version")); | ||
| this.microVersion = new PayaraVersion(microProperties.getProperty("major_version") + "." + microProperties.getProperty("minor_version")); |
There was a problem hiding this comment.
Missing update_version, payara_version and payara_update_version as in the case of Payara 4.1.2.191.4 following properties are listed too in glassfish-version.properties.
major_version=4
minor_version=1
update_version=2
payara_version=191
payara_update_version=4
There was a problem hiding this comment.
Do you mean payara 4 micro? 😉 I don't think we'll return to this versioning scheme, so major and minor are enough
There was a problem hiding this comment.
Payara 4 is an example in the above comment, https://github.com/payara/Payara/blob/master/appserver/packager/appserver-base/src/main/resources/config/branding/glassfish-version.properties includes all of the above properties
Another example:
major_version=5
minor_version=191
update_version=5
There was a problem hiding this comment.
So it looks like PayaraVersion needs a factory method fromBrandingProperties then, because this is getting complicated.
There was a problem hiding this comment.
I think I want to mark this as a void point, I'm open to discussion on it but as far as I'm aware Payara 4 versions aren't affected by the package changes in core server and so wouldn't (arguably shouldn't) use the newest container release; they could stick on 1.1/1.2
Update: re-read this and understand the issue is present in Payara 5 versions as well, I'll look into a viable solution
There was a problem hiding this comment.
Made an implementation to accommodate this - all input is very welcome
| ZipEntry pomProperties = microJarFile | ||
| .getEntry("META-INF/maven/fish.payara.micro/payara-micro-boot/pom.properties"); | ||
|
|
||
| zipEntryFileDir = "MICRO-INF/domain/branding/glassfish-version.properties"; |
There was a problem hiding this comment.
Constant can be declared for the path.
payara-common/src/main/java/fish/payara/arquillian/container/payara/PayaraVersion.java
Outdated
Show resolved
Hide resolved
A recent update to the package naming within Payara Server caused a full break to the micro-managed container caused by the directory of the file with micro boot properties not being the same anymore. This PR updates the container to use the glassfish domain properties which have a consistent directory for the time being.
Tested against Payara 5.193 and 5.194-SNAPSHOT on EE7 and EE8 samples