Skip to content
This repository has been archived by the owner on Jun 19, 2024. It is now read-only.

added Java11 base images for docker builds #1652

Merged
merged 3 commits into from
Jul 24, 2019
Merged

added Java11 base images for docker builds #1652

merged 3 commits into from
Jul 24, 2019

Conversation

devang-gaur
Copy link
Contributor

fixes #1647

@devang-gaur devang-gaur added the pr/wip Work in Progress, do not merge label Jun 12, 2019
rohanKanojia
rohanKanojia reviewed Jun 17, 2019
View reviewed changes
generator/api/src/main/java/io/fabric8/maven/generator/api/FromSelector.java
@@ -81,6 +85,40 @@ public boolean isRedHat() {
return REDHAT_VERSION_PATTERN.matcher(version).matches();
}

public boolean isJava11() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't System.getProperty("java.version") suffice to give you jdk version?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if the user has java11 on their Dev environment/machine but needs Java 8 on prod ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please elaborate your point? I'm not sure what you mean, properties are read from jvm and would always give correct output regardless of dev/prod environment.

@rohanKanojia
Copy link
Member

@dev-gaur : Could you please resolve conflicts?

@devang-gaur
Copy link
Contributor Author

@dev-gaur : Could you please resolve conflicts?

working on it

@devang-gaur devang-gaur added the jkube/pending The issue/PR has to be taken care of in JKube https://github.com/eclipse/jkube label Jul 5, 2019
@devang-gaur devang-gaur force-pushed the java11-base-image branch 4 times, most recently from d8cfcdb to 703eb9f Compare July 22, 2019 12:27
@devang-gaur devang-gaur added cat/feature Feature request and removed pr/wip Work in Progress, do not merge labels Jul 22, 2019
rohanKanojia
rohanKanojia reviewed Jul 23, 2019
View reviewed changes
Copy link
Member

@rohanKanojia rohanKanojia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good with minor comments. Also, Could you please add some documentation/sample also?

generator/api/src/test/java/io/fabric8/maven/generator/api/FromSelectorTest.java
import io.fabric8.maven.core.config.ProcessorConfig;
import io.fabric8.maven.core.config.RuntimeMode;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unused import

Copy link
Contributor Author

@devang-gaur devang-gaur Jul 23, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, RuntimeMode Class is required.

generator/api/src/main/java/io/fabric8/maven/generator/api/support/BaseGenerator.java Outdated
@@ -34,6 +29,11 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.utils.StringUtils;

import java.util.Collections;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What changes are done here?

Copy link
Contributor Author

@devang-gaur devang-gaur Jul 23, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

goddamn intellij!!

generator/api/src/main/java/io/fabric8/maven/generator/api/FromSelector.java Outdated
@@ -66,9 +71,12 @@ public String getFrom() {
abstract protected String getS2iBuildFrom();
abstract protected String getIstagFrom();

Plugin plugin;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

access can be private/protected

@devang-gaur devang-gaur added the pr/changelog-entry-please Please add a changelog entry for this PR label Jul 24, 2019
@devang-gaur devang-gaur removed the pr/changelog-entry-please Please add a changelog entry for this PR label Jul 24, 2019
@devang-gaur devang-gaur merged commit d4c586a into fabric8io:master Jul 24, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rohanKanojia rohanKanojia rohanKanojia approved these changes

@lordofthejars lordofthejars lordofthejars approved these changes

Assignees
No one assigned
Labels
cat/feature Feature request jkube/pending The issue/PR has to be taken care of in JKube https://github.com/eclipse/jkube
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support for zero-config jdk 11 Docker base image
3 participants
@devang-gaur @rohanKanojia @lordofthejars