Update with latest JDK and tomcat

Author: AntonKozlov

.github/workflows/mavenpublish.yml

@@ -3,8 +3,6 @@ name: Maven Package
 
 on:
  push:
- schedule:
- - cron: '0 0 * * *'
 
 jobs:
  build:
@@ -26,6 +24,8 @@ jobs:
  repository: CRaC/utils
  path: utils
 
+ - run: make -C utils
+
  - name: Set up JDK 1.8
  uses: actions/setup-java@v1
  with:
@@ -37,9 +37,7 @@ jobs:
  restore-keys: |
  ${{ runner.os }}-maven-
 
- - run: mvn -s settings.xml -B package
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ - run: mvn -B package
 
  - name: Test on Vanila JDK
  run: |
@@ -52,19 +50,21 @@ jobs:
 
  - name: Download JDK
  run: |
- utils/download-jdk.sh
- sudo tar -axf jdk14-crac.tar.gz
+ archive=$(utils/download-jdk.sh)
+ sudo tar -axf $archive
+ echo JDK=${archive%%.tar.gz} >> $GITHUB_ENV
 
  - name: Prepare warm checkpoint
  run: |
  P=$(utils/start-bg.sh \
  -s "Started Application" \
  -e exitcode \
- jdk14-crac/bin/java \
+ ${{ env.JDK }}/bin/java \
  -XX:CRaCCheckpointTo=cr \
  -XX:+UnlockDiagnosticVMOptions \
  -XX:+CRTraceStartupTime \
  -Djdk.crac.trace-startup-time=true \
+ --add-opens java.base/java.lang=ALL-UNNAMED \
  -jar target/spring-boot-0.0.1-SNAPSHOT.jar)
 
  # warmup the service
@@ -76,12 +76,12 @@ jobs:
  run: |
  P=$(utils/start-bg.sh \
  -s "restore-finish" \
- jdk14-crac/bin/java -XX:CRaCRestoreFrom=cr)
+ ${{ env.JDK }}/bin/java -XX:CRaCRestoreFrom=cr)
  curl localhost:8080 | grep "Greetings from Spring Boot!"
  utils/bench.sh http://localhost:8080
  kill $P
 
  - name: Test C/RaC startup time
  run:
- timeout 3 bash -c "jdk14-crac/lib/javatime ; jdk14-crac/bin/java -XX:CRaCRestoreFrom=cr"
+ timeout 3 bash -c "utils/lib/javatime ; ${{ env.JDK }}/bin/java -XX:CRaCRestoreFrom=cr"
  | utils/sel.awk -v from=prestart -v to=restore-finish

pom.xml

@@ -14,27 +14,26 @@
 <name>spring-boot</name>
 <description>Demo project for Spring Boot</description>
 
-<repositories>
-<repository>
-<id>github</id>
-<url>https://maven.pkg.github.com/crac/tomcat</url>
-</repository>
-<repository>
-<id>github2</id>
-<url>https://maven.pkg.github.com/crac/org.crac</url>
-</repository>
-</repositories>
-
-
 <properties>
 <java.version>1.8</java.version>
-<tomcat.version>999-SNAPSHOT</tomcat.version>
+<tomcat.version>8.5.75</tomcat.version>
 </properties>
 
 <dependencies>
+<dependency>
+<groupId>io.github.crac.org.apache.tomcat.embed</groupId>
+<artifactId>tomcat-embed-core</artifactId>
+<version>8.5.75</version>
+</dependency>
 <dependency>
 <groupId>org.springframework.boot</groupId>
 <artifactId>spring-boot-starter-web</artifactId>
+<exclusions>
+<exclusion>
+<groupId>org.apache.tomcat.embed</groupId>
+<artifactId>tomcat-embed-core</artifactId>
+</exclusion>
+</exclusions>
 </dependency>
 
 <dependency>
@@ -46,6 +45,10 @@
 <groupId>org.junit.vintage</groupId>
 <artifactId>junit-vintage-engine</artifactId>
 </exclusion>
+<exclusion>
+<groupId>org.apache.tomcat</groupId>
+<artifactId>tomcat-embed-core</artifactId>
+</exclusion>
 </exclusions>
 </dependency>
 </dependencies>