Do not pin the Java version used to run maven
The EGit and EGit-Github maven builds have been made to be able to
use any Java >= 1.8 for running the maven build. They will execute
the tests on a Java version determined by the BREE specified in the
MANIFEST.MF files (currently JavaSE-1.8).
The mechanism relies on the CI infrastructure providing a maven
toolchain definition for at least that BREE.
Change-Id: Ie83f986e54ae11cef5ce363d404ddf137eccf714
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
diff --git a/vars/egitGithubProductBuild.groovy b/vars/egitGithubProductBuild.groovy
index 96b4bf2..f911e00 100644
--- a/vars/egitGithubProductBuild.groovy
+++ b/vars/egitGithubProductBuild.groovy
@@ -34,8 +34,7 @@
upstreamVersion: params.EGIT_VERSION,
p2project : 'org.eclipse.mylyn.github-site',
p2zip : 'github-updatesite-*.zip',
- publishRoot : 'egit/github',
- jdk : 'adoptopenjdk-hotspot-jdk8-latest'
+ publishRoot : 'egit/github'
]
productBuild(lib, tooling, config << cfg)
}
\ No newline at end of file
diff --git a/vars/egitGithubVerifyBuild.groovy b/vars/egitGithubVerifyBuild.groovy
index c03c671..007524c 100644
--- a/vars/egitGithubVerifyBuild.groovy
+++ b/vars/egitGithubVerifyBuild.groovy
@@ -31,8 +31,7 @@
upstreamRepoPath : 'egit',
upstreamRepo : 'egit',
upstreamVersion: params.EGIT_VERSION,
- p2project : 'org.eclipse.mylyn.github-site',
- jdk : 'adoptopenjdk-hotspot-jdk8-latest'
+ p2project : 'org.eclipse.mylyn.github-site'
]
verifyBuild(lib, tooling, config << cfg)
}
\ No newline at end of file
diff --git a/vars/egitProductBuild.groovy b/vars/egitProductBuild.groovy
index d9acbf5..5b6146d 100644
--- a/vars/egitProductBuild.groovy
+++ b/vars/egitProductBuild.groovy
@@ -33,8 +33,7 @@
// upstreamVersion from cfg or auto-determined
p2project : 'org.eclipse.egit.repository',
p2zip : 'org.eclipse.egit.repository-*.zip',
- publishRoot : 'egit',
- jdk : 'adoptopenjdk-hotspot-jdk8-latest'
+ publishRoot : 'egit'
// downstreamJob from cfg
]
productBuild(lib, tooling, config << cfg)
diff --git a/vars/egitVerifyBuild.groovy b/vars/egitVerifyBuild.groovy
index 30b2ef4..3f76b3b 100644
--- a/vars/egitVerifyBuild.groovy
+++ b/vars/egitVerifyBuild.groovy
@@ -31,8 +31,7 @@
upstreamRepoPath : 'jgit',
upstreamRepo : 'jgit',
// upstreamVersion from cfg or auto-determined
- p2project : 'org.eclipse.egit.repository',
- jdk : 'adoptopenjdk-hotspot-jdk8-latest'
+ p2project : 'org.eclipse.egit.repository'
]
verifyBuild(lib, tooling, config << cfg)
}
\ No newline at end of file
