Skip to content

Commit

Permalink
Use CRAC api from org.crac and upadte project website (CRaC#8)
Browse files Browse the repository at this point in the history
  • Loading branch information
joeyleeeeeee97 authored Jun 8, 2023
1 parent 6b38c54 commit 2354e10
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ jobs:
echo JDK=${archive%%.tar.gz} >> $GITHUB_ENV
- name: Use specific API
if: matrix.api != 'jdk'
if: matrix.api != 'org'
run: |
find -name '*.java' | xargs sed -i 's/jdk\.crac/${{ matrix.api }}.crac/g'
find -name '*.java' | xargs sed -i 's/org\.crac/${{ matrix.api }}.crac/g'
git diff
- run: |
Expand Down
15 changes: 6 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
<version>1.0-SNAPSHOT</version>

<name>example-jetty</name>
<!-- FIXME change it to the project's website -->
<url>http://www.example.com</url>
<url>https://github.com/CRaC/example-jetty</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -28,6 +27,11 @@
<artifactId>jetty-server</artifactId>
<version>9.4.30.v20200611</version>
</dependency>
<dependency>
<groupId>org.crac</groupId>
<artifactId>crac</artifactId>
<version>0.1.3</version>
</dependency>
</dependencies>

<profiles>
Expand All @@ -54,13 +58,6 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>io.github.crac</groupId>
<artifactId>org-crac</artifactId>
<version>0.1.0</version>
</dependency>
</dependencies>
</profile>
</profiles>

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/example/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

// org.crac could be used instead of jdk.crac
// https://github.com/CRaC/docs#orgcrac
import jdk.crac.Context;
import jdk.crac.Core;
import jdk.crac.Resource;
import org.crac.Context;
import org.crac.Core;
import org.crac.Resource;

import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
Expand Down

0 comments on commit 2354e10

Please sign in to comment.