Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Lunatix01 committed Aug 19, 2024
2 parents b1a7145 + d9ba1f6 commit 8e0a216
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 98 deletions.
51 changes: 51 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Build Ragscan
on: [push, pull_request]
jobs:
build-with-graal:
if: false # currently disabled
name: Ragscan on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, ubuntu-latest]
steps:
- uses: actions/checkout@v4
- uses: graalvm/setup-graalvm@v1
with:
java-version: '22'
distribution: 'graalvm'
github-token: ${{ secrets.GITHUB_TOKEN }}
native-image-job-reports: 'true'

- name: Build Ragscan
run: |
echo "GRAALVM_HOME: $GRAALVM_HOME"
echo "JAVA_HOME: $JAVA_HOME"
java --version
native-image --version
- name: Compile with maven
run: mvn -X -Pnative native:compile -DskipTests

- name: Upload binary
uses: actions/upload-artifact@v4
with:
name: ragscan-${{ matrix.os }}
path: ragscan*
build:
name: Ragscan
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Java
uses: actions/setup-java@v4
with:
distribution: oracle
java-version: 21
- name: Build Ragscan
run: mvn -f pom.xml clean package -DskipTests
- name: Upload build artifact
if: github.ref_name == 'master'
uses: actions/upload-artifact@v4
with:
name: artifact
path: ./target/*.jar
44 changes: 17 additions & 27 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.1</version>
<relativePath/> <!-- lookup parent from repository -->
<relativePath/>
</parent>
<groupId>lunatix</groupId>
<artifactId>ragscan</artifactId>
Expand All @@ -27,22 +27,13 @@
<url/>
</scm>
<properties>
<java.version>21.0.1</java.version>
<spring-ai.version>1.0.0-M1</spring-ai.version>
<java.version>21</java.version>
<spring-ai.version>1.0.0-SNAPSHOT</spring-ai.version>
<spring-shell.version>3.3.0</spring-shell.version>
<maven.compiler.source>21.0.1</maven.compiler.source>
<maven.compiler.target>21.0.1</maven.compiler.target>

<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.ai</groupId>-->
<!-- <artifactId>spring-ai-ollama-spring-boot-starter</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>org.springframework.ai</groupId>
<artifactId>spring-ai-qdrant-store-spring-boot-starter</artifactId>
Expand All @@ -52,10 +43,9 @@
<artifactId>spring-shell-starter</artifactId>
</dependency>
<dependency>
<!-- jsoup HTML parser library @ https://jsoup.org/ -->
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.17.2</version>
<version>1.18.1</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
Expand All @@ -73,9 +63,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>group.springframework.ai</groupId>
<groupId>org.springframework.ai</groupId>
<artifactId>spring-ai-tika-document-reader</artifactId>
<version>1.1.0</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -93,14 +83,14 @@
<version>3.3.1</version>
</dependency>
<dependency>
<groupId>group.springframework.ai</groupId>
<groupId>org.springframework.ai</groupId>
<artifactId>spring-ai-pdf-document-reader</artifactId>
<version>1.1.0</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>group.springframework.ai</groupId>
<groupId>org.springframework.ai</groupId>
<artifactId>spring-ai-vertex-ai-palm2-spring-boot-starter</artifactId>
<version>1.0.4</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -151,12 +141,12 @@
</build>
<repositories>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.maven.apache.org/maven2</url>
<snapshots>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<releases>
<enabled>false</enabled>
</snapshots>
</releases>
</repository>
</repositories>
</project>
15 changes: 14 additions & 1 deletion settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,14 @@
<url>https://repo.spring.io/milestone</url>
<mirrorOf>*</mirrorOf>
</mirror>
<mirror>
<id>spring-snapshots</id>
<url>https://repo.spring.io/snapshot</url>
<mirrorOf>*</mirrorOf>
</mirror>
<mirror>
<id>central</id>
<mirrorOf>spring-milestones</mirrorOf>
<mirrorOf>spring-snapshots</mirrorOf>
<url>https://repo.maven.apache.org/maven2</url>
</mirror>

Expand All @@ -35,6 +40,14 @@
<name>Maven Repository Switchboard</name>
<url>https://repo1.maven.org/maven2</url>
</repository>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<releases>
<enabled>false</enabled>
</releases>
</repository>
</repositories>
</profile>
</profiles>
Expand Down
70 changes: 0 additions & 70 deletions src/main/java/lunatix/ragscan/WebChatController.java

This file was deleted.

0 comments on commit 8e0a216

Please sign in to comment.