Merge pull request #817 from JustMeErazem/master

Remove OpenJDK 7 from software list and update changelog
AnarchyLinux · Aug 12, 2019 · b37ddc0 · b37ddc0
2 parents 5617d7e + f3e05a9
commit b37ddc0
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * Add yay info to [README](README.md)
 * Add `openssh` to Server and Server-LTS installs (@JustMeErazem)
 * Remove broken `du` alias (@JustMeErazem)
+* Remove OpenJDK 7 from software list (@JustMeErazem)
 
 ## 1.0.4 - June 8, 2019
 

diff --git a/etc/anarchy.conf b/etc/anarchy.conf
@@ -377,7 +377,6 @@ prg2="The dart programming language SDK"
 prg3="The Go programming language"
 prg4="Developer tools for Go language"
 prg5="Java Runtime Environments"
-prg6="OpenJDK Java 7 development kit"
 prg7="OpenJDK Java 8 development kit"
 prg8="OpenJFX 8 client application platform"
 prg9="A feature-rich programming language"

diff --git a/lib/configure_base.sh b/lib/configure_base.sh
@@ -541,7 +541,6 @@ add_software() {
 						"go"			"$prg3" OFF \
 						"go-tools"		"$prg4" OFF \
 						"java-runtime-common"	"$prg5" OFF \
-						"java-openjdk-7"	"$prg6" OFF \
 						"jdk8-openjdk"	"$prg7" OFF \
 						"java-openjfx-8"	"$prg8" OFF \
 						"jdk11-openjdk" "$prg14" OFF \