Skip to content

Commit

Permalink
Use GraalVM 22
Browse files Browse the repository at this point in the history
  • Loading branch information
@theotherp
theotherp committed Mar 23, 2024
1 parent afe2cfd commit 56a1647
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 102 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/buildNative.yml
View file
Expand Up @@ -23,10 +23,10 @@ jobs:
# Check out last 15 commits
fetch-depth: 15

- name: Set up JDK 17
- name: Set up JDK 22
uses: actions/setup-java@v3
with:
java-version: '17'
java-version: '22'
distribution: 'adopt'
cache: 'maven'

Expand All @@ -53,7 +53,7 @@ jobs:
uses: graalvm/setup-graalvm@v1
if: steps.changed-files-specific.outputs.any_changed == 'true'
with:
java-version: '17'
java-version: '22'
distribution: 'graalvm-community'
components: 'native-image'
cache: 'maven'
Expand Down
2 changes: 1 addition & 1 deletion .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions misc/buildLinuxCore/amd64/dockerfile
View file
Expand Up @@ -13,10 +13,10 @@ ENV M2_HOME=/opt/maven
ENV MAVEN_HOME=/opt/maven
ENV PATH=${M2_HOME}/bin:${PATH}

RUN wget -nv --no-check-certificate https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-17.0.9/graalvm-community-jdk-17.0.9_linux-x64_bin.tar.gz
RUN tar xzf graalvm-community-jdk-17.0.9_linux-x64_bin.tar.gz -C /
ENV PATH=/graalvm-community-openjdk-17.0.9+9.1/bin/:$PATH
ENV JAVA_HOME=/graalvm-community-openjdk-17.0.9+9.1
RUN wget -nv --no-check-certificate https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_linux-x64_bin.tar.gz
RUN tar xzf graalvm-community-jdk-22.0.0_linux-x64_bin.tar.gz -C /
ENV PATH=/graalvm-community-openjdk-22+36.1/bin/:$PATH
ENV JAVA_HOME=/graalvm-community-openjdk-22+36.1

# When you update this also change the directory in buildInContainer.sh
RUN wget -nv --no-check-certificate https://github.com/upx/upx/releases/download/v4.2.2/upx-4.2.2-amd64_linux.tar.xz
Expand Down
12 changes: 6 additions & 6 deletions misc/buildLinuxCore/arm64/dockerfile
View file
Expand Up @@ -4,18 +4,18 @@ FROM arm64v8/ubuntu:16.04
RUN echo 'APT::Install-Suggests "0";' >> /etc/apt/apt.conf.d/00-docker
RUN echo 'APT::Install-Recommends "0";' >> /etc/apt/apt.conf.d/00-docker
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y zip unzip wget curl libfreetype6 libfreetype6-dev build-essential ca-certificates
RUN wget -nv --no-check-certificate https://dlcdn.apache.org/maven/maven-3/3.9.5/binaries/apache-maven-3.9.5-bin.tar.gz -P /tmp
RUN wget -nv --no-check-certificate https://dlcdn.apache.org/maven/maven-3/3.9.6/binaries/apache-maven-3.9.6-bin.tar.gz -P /tmp

RUN tar xf /tmp/apache-maven-*.tar.gz -C /opt
RUN ln -s /opt/apache-maven-3.9.5 /opt/maven
RUN ln -s /opt/apache-maven-3.9.6 /opt/maven
ENV M2_HOME=/opt/maven
ENV MAVEN_HOME=/opt/maven
ENV PATH=${M2_HOME}/bin:${PATH}

RUN wget -nv --no-check-certificate https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-17.0.9/graalvm-community-jdk-17.0.9_linux-aarch64_bin.tar.gz
RUN tar xzf graalvm-community-jdk-17.0.9_linux-aarch64_bin.tar.gz -C /
ENV PATH=/graalvm-community-openjdk-17.0.9+9.1/bin/:$PATH
ENV JAVA_HOME=/graalvm-community-openjdk-17.0.9+9.1
RUN wget -nv --no-check-certificate https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-22.0.0/graalvm-community-jdk-22.0.0_linux-x64_bin.tar.gz
RUN tar xzf graalvm-community-jdk-22.0.0_linux-x64_bin.tar.gz -C /
ENV PATH=/graalvm-community-openjdk-22+36.1/bin/:$PATH
ENV JAVA_HOME=/graalvm-community-openjdk-22+36.1

# When you update this also change the directory in buildInContainer.sh
#Newer versions crash with segmentation fault: https://github.com/upx/upx/issues/737
Expand Down
91 changes: 3 additions & 88 deletions other/sockslib/pom.xml
View file
Expand Up @@ -114,26 +114,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<version>3.13.0</version>
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>


<plugin>
<artifactId>maven-assembly-plugin</artifactId>
Expand All @@ -158,25 +146,7 @@
</executions>
</plugin>

<!--
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.0.0</version>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.7</version>
<configuration>
<format>xml</format>
<maxmem>256m</maxmem>
<aggregate>true</aggregate>
<check/>
</configuration>
</plugin>
-->
</plugins>

</build>
Expand Down Expand Up @@ -216,62 +186,7 @@
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<build>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<configuration>
<tags>
<tag>
<name>date</name>
<placement>a</placement>
<head>Date</head>
</tag>
</tags>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</profile>
</profiles>

Expand Down

0 comments on commit 56a1647

Please sign in to comment.