Merge pull request #4148 from atlanhq/java17squashstaghelper

[stag] MLH-40 Upgrade Atlas to use java 17

.github/workflows/maven.yml

@@ -22,7 +22,13 @@ name: Java CI with Maven
 on:
   push:
     branches:
-      - staging
+      - alpha
+      - beta
+      - development
+      - master
+      - lineageondemand
+      - makerlogic
+      - java17squashstaghelper
 
 jobs:
   build:
@@ -32,10 +38,13 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 17
+
+      - name: Print JDK version
+        run: java -version
 
       - name: Cache Maven packages
         uses: actions/cache@v2

Dockerfile

@@ -29,36 +29,25 @@ RUN apt-get update \
     && apt-get -y install \
         wget \
         python2 \
-        openjdk-8-jdk-headless \
+        openjdk-17-jdk-headless \
         patch \
         netcat \
         curl \
     && cd / \
     && export MAVEN_OPTS="-Xms2g -Xmx2g" \
-    && export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64" \
+    && export JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64" \
     && tar -xzvf /apache-atlas-3.0.0-SNAPSHOT-server.tar.gz -C /opt \
     && mv /opt/apache-atlas-${VERSION} /opt/apache-atlas \
     && apt-get clean \
     && rm -rf /apache-atlas-3.0.0-SNAPSHOT-server.tar.gz
 
-# Copy the repair index jar file
-RUN cd / \
-    && wget https://atlan-build-artifacts.s3.ap-south-1.amazonaws.com/atlas/atlas-index-repair-tool-${VERSION}.tar.gz \
-    && tar -xzvf /atlas-index-repair-tool-${VERSION}.tar.gz \
-    && mkdir /opt/apache-atlas/libext \
-    && mv /atlas-index-repair-tool-${VERSION}.jar /opt/apache-atlas/libext/ \
-    && rm -rf /atlas-index-repair-tool-${VERSION}.tar.gz
-
 RUN ln -s /usr/bin/python2 /usr/bin/python
 
-COPY atlas-hub/repair_index.py /opt/apache-atlas/bin/
-
-RUN chmod +x /opt/apache-atlas/bin/repair_index.py
-
 COPY atlas-hub/atlas_start.py.patch atlas-hub/atlas_config.py.patch /opt/apache-atlas/bin/
 COPY atlas-hub/pre-conf/atlas-logback.xml /opt/apache-atlas/conf/
 COPY atlas-hub/pre-conf/atlas-auth/ /opt/apache-atlas/conf/
 
+RUN mkdir /opt/apache-atlas/libext
 RUN curl https://repo1.maven.org/maven2/org/jolokia/jolokia-jvm/1.6.2/jolokia-jvm-1.6.2-agent.jar -o /opt/apache-atlas/libext/jolokia-jvm-agent.jar
 
 RUN cd /opt/apache-atlas/bin \