Install default JDK and update Gradle version

amrabed · May 18, 2020 · f47096d · f47096d
1 parent b2788d8
commit f47096d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,4 @@
 language: java
-jdk: oraclejdk8
 
 addons:
   sonarcloud:

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ task createJar(type: Jar) {
         attributes 'Implementation-Title': 'rhids',
                 'Main-Class': mainClassName
     }
-    baseName = project.name
+    archivesBaseName = project.name
     from { configurations.extralibs.collect { it.isDirectory() ? it : zipTree(it) } }
     with jar
 }
@@ -26,4 +26,4 @@ repositories {
 dependencies {
     implementation 'info.picocli:picocli:3.8.0'
     extralibs 'info.picocli:picocli:3.8.0'
-}
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
diff --git a/install b/install
@@ -6,16 +6,10 @@ APP_NAME="rhids"
 
 # Install Java 8 (if not installed)
 if ! type java > /dev/null; then
-    apt-get install -y software-properties-common
-    add-apt-repository -y ppa:webupd8team/java
-    apt-get update
-    echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
-    echo debconf shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections
-    apt-get install -y oracle-java8-installer
+  apt install -y default-jre
 fi
 
 # Build and install project
 ./gradlew createJar && cp build/libs/*.jar $APP_NAME/$APP_NAME.jar
-cp -r $APP_NAME /usr/bin
-sed -i "/^PATH/s/\"$/:\/usr\/bin\/$APP_NAME\"/g" /etc/environment
+cp -r $APP_NAME/* /usr/bin
 mkdir /var/log/$APP_NAME