Merge pull request #18 from GoodforGod/dev

[3.1.0]

.editorconfig

@@ -8,14 +8,30 @@ root = true
 end_of_line = lf
 charset = utf-8
 
+# Json
+[*.json]
+indent_size = 2
+indent_style = space
+insert_final_newline = false
+trim_trailing_whitespace = true
+
 # Yaml
 [{*.yml, *.yaml}]
 indent_size = 2
 indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
 
 # Property files
 [*.properties]
 indent_size = 2
 indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
 
-
+# XML files
+[*.xml]
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true

.gitattributes

@@ -2,9 +2,8 @@
 # and leave all files detected as binary untouched.
 *               text=auto
 
-#
+
 # The above will handle all files NOT found below
-#
 # These files are text and should be normalized (Convert crlf => lf)
 *.bash          text eol=lf
 *.css           text diff=css
@@ -26,16 +25,36 @@
 *.xml           text
 *.yml           text eol=lf
 
+
 # These files are binary and should be left untouched
 # (binary is a macro for -text -diff)
-*.class         binary
+# Archives
+*.7z            binary
+*.br            binary
+*.gz            binary
+*.tar           binary
+*.zip           binary
+*.jar           binary
+*.so            binary
+*.war           binary
 *.dll           binary
-*.ear           binary
-*.gif           binary
+
+# Documents
+*.pdf           binary
+
+# Images
 *.ico           binary
-*.jar           binary
+*.gif           binary
 *.jpg           binary
 *.jpeg          binary
 *.png           binary
-*.so            binary
-*.war           binary
+*.psd           binary
+*.webp          binary
+
+# Fonts
+*.woff2         binary
+
+# Other
+*.exe           binary
+*.class         binary
+*.ear           binary

.github/workflows/gradle.yml

@@ -3,36 +3,40 @@ name: Java CI
 on:
   push:
     branches:
-    - master
+      - master
   pull_request:
     branches:
-    - master
-    - dev
+      - master
+      - dev
 
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '11' ]
+        java: [ '11', '17' ]
     name: Java ${{ matrix.java }} setup
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK
-      uses: actions/setup-java@v1
+      - uses: actions/checkout@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v1
 
-      with:
-        java-version: ${{ matrix.java }}
+        with:
+          java-version: ${{ matrix.java }}
 
-    - name: Build
-      run: ./gradlew classes spotlessJavaCheck
+      - name: Code Style
+        run: ./gradlew spotlessCheck
 
-    - name: Test
-      run: ./gradlew test jacocoTestReport
+      - name: Build
+        run: ./gradlew classes
 
-    - name: SonarQube
-      run: ./gradlew sonarqube
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      - name: Test
+        run: ./gradlew test jacocoTestReport
+
+      - name: SonarQube
+        if: matrix.java == '17'
+        run: ./gradlew sonarqube
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.gitignore

@@ -1,4 +1,4 @@
-# Package Files #
+### Package Files
 *.war
 *.nar
 *.ear
@@ -9,9 +9,10 @@
 ### Gradle template
 .gradle
 build/
-out
+target/
 
-# Idea generated files
+### Idea generated files
 .idea
-.idea\*
+.settings/
 *.iml
+out/

README.md

@@ -11,17 +11,15 @@ This project includes integration between Micronaut and ArangoDB.
 
 [**Gradle**](https://mvnrepository.com/artifact/com.github.goodforgod/micronaut-arangodb)
 ```groovy
-dependencies {
-    compile 'com.github.goodforgod:micronaut-arangodb:3.0.0'
-}
+implementation "com.github.goodforgod:micronaut-arangodb:3.1.0"
 ```
 
 [**Maven**](https://mvnrepository.com/artifact/com.github.goodforgod/micronaut-arangodb)
 ```xml
 <dependency>
     <groupId>com.github.goodforgod</groupId>
     <artifactId>micronaut-arangodb</artifactId>
-    <version>3.0.0</version>
+    <version>3.1.0</version>
 </dependency>
 ```
 

build.gradle

@@ -2,9 +2,10 @@ plugins {
     id "jacoco"
     id "maven-publish"
 
-    id "io.micronaut.library" version "2.0.3"
     id "org.sonarqube" version "3.3"
-    id "com.diffplug.spotless" version "5.14.3"
+    id "com.diffplug.spotless" version "6.1.0"
+    id "io.micronaut.library" version "3.3.2"
+
 }
 
 repositories {
@@ -15,53 +16,35 @@ repositories {
 group = groupId
 version = artifactVersion
 
-sourceCompatibility = 11
-targetCompatibility = 11
-
-spotless {
-    java {
-        encoding("UTF-8")
-        importOrder()
-        removeUnusedImports()
-        eclipse().configFile("${projectDir}/config/codestyle.xml")
-    }
-}
-
-sonarqube {
-    properties {
-        property "sonar.host.url", "https://sonarcloud.io"
-        property "sonar.organization", "goodforgod"
-        property "sonar.projectKey", "GoodforGod_micronaut-arangodb"
-    }
-}
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
 
 micronaut {
-    version("3.0.0")
+    version("3.4.2")
     processing {
         incremental(true)
         module(project.name)
         group(project.group)
-        annotations("io.micronaut.configuration.arango.*")
     }
 }
 
 dependencies {
     annotationProcessor "io.micronaut:micronaut-inject-java"
     compileOnly "io.micronaut:micronaut-inject-java"
 
-    api "com.arangodb:arangodb-java-driver:6.13.0"
+    api "com.arangodb:arangodb-java-driver:6.16.1"
 
     implementation "org.apache.httpcomponents:httpclient:4.5.13"
     implementation "io.micronaut:micronaut-management"
     implementation "io.projectreactor:reactor-core"
 
     testAnnotationProcessor "io.micronaut:micronaut-inject-java"
 
-    testRuntimeOnly "ch.qos.logback:logback-classic:1.2.3"
+    testRuntimeOnly "ch.qos.logback:logback-classic:1.2.11"
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
 
-    testImplementation "org.testcontainers:junit-jupiter:1.15.3"
-    testImplementation "com.github.goodforgod:arangodb-testcontainer:1.3.0"
+    testImplementation "org.testcontainers:junit-jupiter:1.16.3"
+    testImplementation "com.github.goodforgod:arangodb-testcontainer:2.0.0"
 
     testImplementation "io.micronaut.test:micronaut-test-core"
     testImplementation "io.micronaut.test:micronaut-test-junit5"
@@ -82,19 +65,36 @@ test {
     }
 }
 
+spotless {
+    java {
+        encoding("UTF-8")
+        importOrder()
+        removeUnusedImports()
+        eclipse("4.21.0").configFile("${rootDir}/config/codestyle.xml")
+    }
+}
+
+sonarqube {
+    properties {
+        property "sonar.host.url", "https://sonarcloud.io"
+        property "sonar.organization", "goodforgod"
+        property "sonar.projectKey", "GoodforGod_$artifactId"
+    }
+}
+
 publishing {
     publications {
         mavenJava(MavenPublication) {
             from components.java
 
             pom {
                 name = "Micronaut ArangoDB Configuration"
-                url = "https://github.com/GoodforGod/micronaut-arangodb"
+                url = "https://github.com/GoodforGod/$artifactId"
                 description = "This is integration between Micronaut and ArangoDB."
 
                 license {
                     name = "Apache License 2.0"
-                    url = "https://github.com/GoodforGod/micronaut-arangodb/blob/master/LICENSE"
+                    url = "https://github.com/GoodforGod/$artifactId/blob/master/LICENSE"
                     distribution = "repo"
                 }
 
@@ -106,9 +106,9 @@ publishing {
                 }
 
                 scm {
-                    connection = "scm:git:git://github.com/GoodforGod/micronaut-arangodb.git"
-                    developerConnection = "scm:git:ssh://GoodforGod/micronaut-arangodb.git"
-                    url = "https://github.com/GoodforGod/micronaut-arangodb/tree/master"
+                    connection = "scm:git:git://github.com/GoodforGod/${artifactId}.git"
+                    developerConnection = "scm:git:ssh://GoodforGod/${artifactId}.git"
+                    url = "https://github.com/GoodforGod/$artifactId/tree/master"
                 }
             }
         }