diff --git a/.github/workflows/ci_main.yaml b/.github/workflows/ci_main.yaml index 0ff3d16..c0fc215 100644 --- a/.github/workflows/ci_main.yaml +++ b/.github/workflows/ci_main.yaml @@ -30,7 +30,7 @@ jobs: run: ./mvnw dependency:go-offline -U -B - name: Build with Maven - run: ./mvnw package -DskipUnitTests -B + run: ./mvnw package -DskipTests=true -B unit-tests: needs: package @@ -57,8 +57,14 @@ jobs: key: confapi-plugin-${{ hashFiles('**/pom.xml') }} restore-keys: confapi-plugin - - name: Run Unit Tests and analyze on SonarCloud - run: ./mvnw test sonar:sonar -B + - name: Run Unit Tests + run: ./mvnw --batch-mode compile test + + - name: Perform static code analysis + run: | + ./mvnw --batch-mode sonar:sonar \ + --settings ./.github/workflows/settings.xml \ + -P resolving,analyzing,defaults integration-tests: needs: package @@ -82,7 +88,7 @@ jobs: restore-keys: confapi-plugin - name: Run Integration Tests - run: ./mvnw integration-test -DskipUnitTests -B + run: ./mvnw integration-test -B deploy: needs: [unit-tests, integration-tests] @@ -90,13 +96,11 @@ jobs: runs-on: ubuntu-20.04 env: + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + GPG_KEY_BASE64: ${{ secrets.GPG_KEY_BASE64 }} GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - SIGN_ASC_SALT: ${{ secrets.SIGN_ASC_SALT }} - SIGN_ASC_KEY: ${{ secrets.SIGN_ASC_KEY }} - SIGN_ASC_IV: ${{ secrets.SIGN_ASC_IV }} steps: - name: Set up JDK 11 @@ -114,14 +118,15 @@ jobs: key: confapi-plugin-${{ hashFiles('**/pom.xml') }} restore-keys: confapi-plugin - - name: Decrypt Signing Key - run: openssl aes-256-cbc -S ${SIGN_ASC_SALT} -K ${SIGN_ASC_KEY} -iv ${SIGN_ASC_IV} -in .github/workflows/sign.asc.enc -out .github/workflows/sign.asc -d - - - name: Import Signing Key - run: gpg --no-tty --batch --import .github/workflows/sign.asc + - name: Import GPG key + run: echo "${GPG_KEY_BASE64}" | base64 --decode | gpg --no-tty --batch --import - - name: Deploy to Maven Central - run: export GPG_TTY=$(tty) && ./mvnw -s .github/workflows/settings.xml -DskipTests deploy -B + - name: Publish + run: | + ./mvnw --batch-mode deploy \ + --settings ./.github/workflows/settings.xml \ + -P resolving,signing,deploying,defaults \ + -DskipTests=true apcc: needs: deploy diff --git a/.github/workflows/ci_pull_request.yaml b/.github/workflows/ci_pull_request.yaml index 1d81c1d..0dbfd93 100644 --- a/.github/workflows/ci_pull_request.yaml +++ b/.github/workflows/ci_pull_request.yaml @@ -30,7 +30,7 @@ jobs: run: ./mvnw dependency:go-offline -U -B - name: Build with Maven - run: ./mvnw package -DskipUnitTests -B + run: ./mvnw package -DskipTests=true -B unit-tests: needs: package @@ -57,8 +57,14 @@ jobs: key: confapi-plugin-${{ hashFiles('**/pom.xml') }} restore-keys: confapi-plugin - - name: Run Unit Tests and analyze on SonarCloud - run: ./mvnw test sonar:sonar -B + - name: Run Unit Tests + run: ./mvnw --batch-mode compile test + + - name: Perform static code analysis + run: | + ./mvnw --batch-mode sonar:sonar \ + --settings ./.github/workflows/settings.xml \ + -P resolving,analyzing,defaults integration-tests: needs: package @@ -82,7 +88,7 @@ jobs: restore-keys: confapi-plugin - name: Run Integration Tests - run: ./mvnw integration-test -DskipUnitTests -B + run: ./mvnw integration-test -DskipTests=true -B apcc: needs: package diff --git a/.github/workflows/settings.xml b/.github/workflows/settings.xml index 058bcaa..797e150 100644 --- a/.github/workflows/settings.xml +++ b/.github/workflows/settings.xml @@ -1,12 +1,8 @@ + - sonatype-nexus-snapshots - ${env.OSSRH_USERNAME} - ${env.OSSRH_PASSWORD} - - - sonatype-nexus-staging + ossrh ${env.OSSRH_USERNAME} ${env.OSSRH_PASSWORD} @@ -14,15 +10,29 @@ - sign-env - - true - + analyzing + + aservo_ldap-crowd-adapter + 800c9135c81800959e51375f6594c91a1f757be9bbbc14d311783a4f75c501ec7807da061e787a9ea89433eb1cf2d6088b664332abd6a411ca5b44e811e97a23 + https://sonarcloud.io + + + + signing - gpg ${env.GPG_KEY_NAME} ${env.GPG_PASSPHRASE} + gpg + + + + deploying + + https://oss.sonatype.org/ + https://oss.sonatype.org/content/repositories/snapshots + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + diff --git a/.github/workflows/sign.asc.enc b/.github/workflows/sign.asc.enc deleted file mode 100644 index 7f35ecc..0000000 Binary files a/.github/workflows/sign.asc.enc and /dev/null differ diff --git a/index.adoc b/index.adoc index 4e806f1..6739a8c 100644 --- a/index.adoc +++ b/index.adoc @@ -2613,6 +2613,36 @@ endif::internal-generation[] | | date-time +| server +| +| DirectoryLdapServer +| +| + +| permissions +| +| DirectoryLdapPermissions +| +| + +| advanced +| +| DirectoryInternalAdvanced +| +| + +| credentialPolicy +| +| DirectoryInternalCredentialPolicy +| +| + +| schema +| +| DirectoryLdapSchema +| +| + |=== diff --git a/pom.xml b/pom.xml index 329ec6a..62fec38 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ de.aservo parent-pom - 0.0.11 + 1.0.0-SNAPSHOT 4.0.0 @@ -53,6 +53,16 @@ + + 1.8 + ${java.version} + ${java.version} + + true + true + false + true + 8.15.0 8.12.1 @@ -379,7 +389,7 @@ io.swagger.core.v3 swagger-maven-plugin - ${swagger.version} + ${swagger.plugin.version} ${basedir}/src/main/resources/openapi.yaml @@ -402,7 +412,7 @@ org.openapitools openapi-generator-maven-plugin - ${openapi-generator-maven-plugin.version} + ${openapi-generator.plugin.version} package