rename Java/1.8 to Java/8

easybuilders · Aug 19, 2018 · daca40e · daca40e
1 parent 1ed65a5
commit daca40e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/easybuild/easyconfigs/b/Bazel/Bazel-0.16.0-GCCcore-7.3.0.eb b/easybuild/easyconfigs/b/Bazel/Bazel-0.16.0-GCCcore-7.3.0.eb
@@ -12,6 +12,6 @@ sources = ['%(namelower)s-%(version)s-dist.zip']
 checksums = ['c730593916ef0ba62f3d113cc3a268e45f7e8039daf7b767c8641b6999bd49b1']
 
 builddependencies = [('binutils', '2.30')]
-dependencies = [('Java', '1.8', '', True)]
+dependencies = [('Java', '8', '', True)]
 
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/j/Java/Java-1.8.eb → easybuild/easyconfigs/j/Java/Java-8.eb b/easybuild/easyconfigs/j/Java/Java-1.8.eb → easybuild/easyconfigs/j/Java/Java-8.eb
@@ -3,7 +3,7 @@
 easyblock = 'Bundle'
 
 name = 'Java'
-version = '1.8'
+version = '8'
 
 homepage = 'http://gcc.gnu.org/'
 description = """
@@ -14,7 +14,7 @@ description = """
 toolchain = {'name': 'dummy', 'version': ''}
 
 dependencies = [
-    ('JDK', version + '.0_181'),
+    ('JDK', '1.%(version)s.0_181')
 ]
 
 altroot = 'JDK'

diff --git a/easybuild/easyconfigs/r/R/R-3.5.1-foss-2018b.eb b/easybuild/easyconfigs/r/R/R-3.5.1-foss-2018b.eb
@@ -28,7 +28,7 @@ dependencies = [
     ('libpng', '1.6.34'),  # for plotting in R
     ('libjpeg-turbo', '2.0.0'),  # for plottting in R
     ('LibTIFF', '4.0.9'),
-    ('Java', '1.8', '', True),
+    ('Java', '8', '', True),
     ('Tk', '8.6.8'),  # for tcltk
     ('cURL', '7.60.0'),  # for RCurl
     ('libxml2', '2.9.8'),  # for XML