Skip to content

Commit

Permalink
Merge pull request #5 from umjammer/0.0.13
Browse files Browse the repository at this point in the history
0.0.13
  • Loading branch information
umjammer committed Feb 27, 2024
2 parents c7524f1 + 3d0ae5c commit 03bec99
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 16 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
Expand All @@ -33,14 +37,14 @@ jobs:
uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
cache: maven
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -51,7 +55,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -65,4 +69,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This workflow will build a Java project with Maven
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven

name: Java CI with Maven
name: Java CI

on:
push:
Expand All @@ -23,7 +23,7 @@ jobs:
run: grep "<version>" pom.xml | head -1 | grep -v SNAPSHOT

- name: Set up JDK 17
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![Release](https://jitpack.io/v/umjammer/vavi-nio-file-cyberduck.svg)](https://jitpack.io/#umjammer/vavi-nio-file-cyberduck)
[![Java CI](https://github.com/umjammer/vavi-nio-file-cyberduck/actions/workflows/maven.yml/badge.svg)](https://github.com/umjammer/vavi-nio-file-cyberduck/actions)
[![Java CI](https://github.com/umjammer/vavi-nio-file-cyberduck/actions/workflows/maven.yml/badge.svg)](https://github.com/umjammer/vavi-nio-file-cyberduck/actions/workflows/maven.yml)
[![CodeQL](https://github.com/umjammer/vavi-nio-file-cyberduck/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/umjammer/vavi-nio-file-cyberduck/actions/workflows/codeql-analysis.yml)
![Java](https://img.shields.io/badge/Java-17-b07219)
[![Parent](https://img.shields.io/badge/Parent-vavi--apps--fuse-pink)](https://github.com/umjammer/vavi-apps-fuse)
Expand Down
50 changes: 41 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>vavi</groupId>
<artifactId>vavi-nio-file-cyberduck</artifactId>
<version>0.0.12</version>
<version>0.0.13</version>

<url>https://github.com/umjammer/vavi-nio-file-cyberduck</url>
<scm>
Expand All @@ -15,8 +15,8 @@
<cyberduck.version>8.7.3</cyberduck.version>
<vavi-nio-file-base.groupId>com.github.umjammer</vavi-nio-file-base.groupId> <!-- com.github.fge / com.github.umjammer -->
<vavi-nio-file-base.version>0.0.14v</vavi-nio-file-base.version>
<vavi-net-fuse.groupId>com.github.umjammer.vavi-apps-fuse</vavi-net-fuse.groupId> <!-- vavi / com.github.umjammer.vavi-apps-fuse -->
<vavi-net-fuse.version>0.1.9</vavi-net-fuse.version>
<vavi-nio-file-fuse.groupId>com.github.umjammer</vavi-nio-file-fuse.groupId> <!-- vavi / com.github.umjammer -->
<vavi-nio-file-fuse.version>0.0.16</vavi-nio-file-fuse.version>
</properties>

<profiles>
Expand Down Expand Up @@ -135,6 +135,11 @@
</dependencyManagement>

<dependencies>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.14.0</version>
</dependency>
<dependency>
<groupId>ch.cyberduck</groupId>
<artifactId>core</artifactId>
Expand Down Expand Up @@ -169,6 +174,14 @@
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
<exclusion>
<artifactId>jna</artifactId>
<groupId>net.java.dev.jna</groupId>
</exclusion>
<exclusion>
<artifactId>jna-min</artifactId>
<groupId>net.java.dev.jna</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand All @@ -185,7 +198,18 @@
<groupId>ch.cyberduck</groupId>
<artifactId>ssh</artifactId>
<version>${cyberduck.version}</version>
<exclusions>
<exclusion>
<groupId>software.amazon.ion</groupId>
<artifactId>ion-java</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.amazon.ion</groupId>
<artifactId>ion-java</artifactId>
<version>1.11.3</version>
</dependency>

<dependency>
<!-- cyberduck logging (slf4j) backend -->
Expand Down Expand Up @@ -241,17 +265,25 @@
</dependency>

<dependency>
<groupId>${vavi-net-fuse.groupId}</groupId>
<artifactId>vavi-net-fuse</artifactId>
<version>${vavi-net-fuse.version}</version>
<groupId>${vavi-nio-file-fuse.groupId}</groupId>
<artifactId>vavi-nio-file-fuse</artifactId>
<version>${vavi-nio-file-fuse.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${vavi-net-fuse.groupId}</groupId>
<artifactId>vavi-net-fuse</artifactId>
<version>${vavi-net-fuse.version}</version>
<groupId>${vavi-nio-file-fuse.groupId}</groupId>
<artifactId>vavi-nio-file-fuse</artifactId>
<version>${vavi-nio-file-fuse.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<!-- cause error
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<version>2.22.1</version>
</dependency>
-->
</dependencies>
</project>

0 comments on commit 03bec99

Please sign in to comment.