diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..c39d4cf2 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,15 @@ +// .devcontainer/devcontainer.json +{ + "name": "Java", + "image": "mcr.microsoft.com/devcontainers/java", + "customizations": { + "vscode": { + "settings": { + "terminal.integrated.shell.linux": "/bin/bash" + } + }, + "extensions": [ + "vscjava.vscode-java-pack" + ] + } +} \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8c7d3f35..89ffecf2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,8 +29,8 @@ jobs: runs-on: ubuntu-latest strategy: - matrix: - java-version: ${{ fromJson(vars.RTLDEV_MW_CI_JAVA_MATRIX) }} + # matrix: + # java-version: ${{ fromJson(vars.RTLDEV_MW_CI_JAVA_MATRIX) }} name: 🧪 Testing needs: lint @@ -41,10 +41,10 @@ jobs: with: fetch-depth: 0 persist-credentials: false - - name: Java JDK @^${{ matrix.java-version }} + - name: Java JDK @^21 uses: actions/setup-java@v3 with: - java-version: ${{ matrix.java-version }} + java-version: 21 distribution: ${{ vars.RTLDEV_MW_CI_JAVA_DISTRO }} - name: Validate & Coverage Report run: | diff --git a/pom.xml b/pom.xml index 812db2e7..4fcd35b2 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,6 @@ 3.6.2 true - 8 -html5 @@ -123,6 +122,11 @@ maven-install-plugin 3.1.1 + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.4.5 + org.apache.maven.plugins maven-release-plugin diff --git a/src/test/java/net/hexonet/apiconnector/ResponseTest.java b/src/test/java/net/hexonet/apiconnector/ResponseTest.java index 5be2ef2a..16df01f3 100644 --- a/src/test/java/net/hexonet/apiconnector/ResponseTest.java +++ b/src/test/java/net/hexonet/apiconnector/ResponseTest.java @@ -108,7 +108,7 @@ public void getCommandPlainSecure() { cmd.put("SUBUSER", "test.user"); cmd.put("PASSWORD", "test.passw0rd"); Response r = new Response("", cmd); - String str = "SUBUSER = test.user\nCOMMAND = CheckAuthentication\nPASSWORD = ***\n"; + String str = "SUBUSER = test.user\nPASSWORD = ***\nCOMMAND = CheckAuthentication\n"; assertEquals(str, r.getCommandPlain()); }