updated source and target versions handling according to comment https://bugs.gentoo.org/show_bug.cgi?id=564158#c2

2 files changed, 2 insertions, 25 deletions

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
index 587e1d7..876c1ff 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
@@ -269,7 +269,7 @@ public class MavenEbuilder {
 
         writer.println();
         writer.print("\t>=virtual/jdk-");
-        writer.print(mavenProject.getHigherVersion());
+        writer.print(mavenProject.getSourceVersion());
 
         if (!compileDependencies.isEmpty()) {
             compileDependencies.stream().
@@ -299,7 +299,7 @@ public class MavenEbuilder {
 
         writer.println();
         writer.print("\t>=virtual/jre-");
-        writer.print(mavenProject.getHigherVersion());
+        writer.print(mavenProject.getTargetVersion());
 
         if (!runtimeDependencies.isEmpty()) {
             runtimeDependencies.stream().
@@ -460,16 +460,6 @@ public class MavenEbuilder {
             final PrintWriter writer) {
         writer.println();
 
-        if (!mavenProject.getSourceVersion().equals(mavenProject.
-                getTargetVersion())) {
-            writer.print("JAVA_SOURCE_VERSION=\"");
-            writer.print(mavenProject.getSourceVersion());
-            writer.println('"');
-            writer.print("JAVA_TARGET_VERSION=\"");
-            writer.print(mavenProject.getTargetVersion());
-            writer.println('"');
-        }
-
         if (!commonDependencies.isEmpty() || !runtimeDependencies.isEmpty()) {
             final List<ResolvedDependency> dependencies
                     = new ArrayList<>(commonDependencies.size()
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
index 9c2d031..29642b3 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenProject.java
@@ -191,19 +191,6 @@ public class MavenProject {
     }
 
     /**
-     * Gets higher version of {@link #sourceVersion} and {@link #targetVersion}.
-     *
-     * @return version string
-     */
-    public String getHigherVersion() {
-        if (sourceVersion.compareTo(targetVersion) == -1) {
-            return targetVersion;
-        } else {
-            return sourceVersion;
-        }
-    }
-
-    /**
      * Getter for {@link #homepage}.
      *
      * @return {@link #homepage}