From 6cb1099714af0faae7e4d392d470cea583c5ee26 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Tue, 21 Nov 2023 09:23:19 +0100 Subject: [PATCH 1/4] #114: Fix CVE-2023-4043 in test dependency `org.eclipse.parsson:parsson` --- .gitattributes | 4 + .github/workflows/ci-build.yml | 27 ++++-- .github/workflows/dependencies_check.yml | 23 ++++- ...elease_droid_prepare_original_checksum.yml | 3 +- .project-keeper.yml | 8 +- dependencies.md | 83 +++++++++---------- doc/changes/changelog.md | 1 + doc/changes/changes_7.1.6.md | 35 ++++++++ pk_generated_parent.pom | 34 ++++---- pom.xml | 18 ++-- 10 files changed, 149 insertions(+), 87 deletions(-) create mode 100644 doc/changes/changes_7.1.6.md diff --git a/.gitattributes b/.gitattributes index e6487b5..93cd5a3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,7 @@ dependencies.md linguist-generated=true doc/changes/changelog.md linguist-generated=true pk_generated_parent.pom linguist-generated=true +.github/workflows/ci-build.yml linguist-generated=true .github/workflows/broken_links_checker.yml linguist-generated=true .github/workflows/ci-build-next-java.yml linguist-generated=true .github/workflows/dependencies_check.yml linguist-generated=true @@ -9,3 +10,6 @@ pk_generated_parent.pom linguist-genera .github/workflows/release_droid_release_on_maven_central.yml linguist-generated=true .settings/org.eclipse.jdt.core.prefs linguist-generated=true .settings/org.eclipse.jdt.ui.prefs linguist-generated=true + +.settings/org.eclipse.jdt.core.prefs linguist-generated=true +.settings/org.eclipse.jdt.ui.prefs linguist-generated=true diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index e194739..4b08a41 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -1,5 +1,6 @@ +# Generated by Project Keeper +# https://github.com/exasol/project-keeper/blob/main/project-keeper/src/main/resources/templates/.github/workflows/ci-build-db-version-matrix.yml name: CI Build - on: push: branches: @@ -8,17 +9,22 @@ on: jobs: build: - runs-on: ubuntu-20.04 # UDFs fail with "VM error: Internal error: VM crashed" on ubuntu-latest + runs-on: ubuntu-20.04 concurrency: - group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.docker_db_version }} + group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.exasol_db_version }} cancel-in-progress: true strategy: fail-fast: false matrix: - docker_db_version: ["7.1.23"] + exasol_db_version: ["7.1.24", "8.23.1"] env: - DEFAULT_DB_VERSION: "7.1.23" + DEFAULT_EXASOL_DB_VERSION: "7.1.24" steps: + - name: Free Disk Space + if: ${{ false }} + run: | + sudo rm -rf /usr/local/lib/android + sudo rm -rf /usr/share/dotnet - name: Checkout the repository uses: actions/checkout@v4 with: @@ -44,17 +50,20 @@ jobs: JAVA_HOME=$JAVA_HOME_11_X64 mvn --batch-mode clean verify \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -DtrimStackTrace=false \ - -Dcom.exasol.dockerdb.image=${{ matrix.docker_db_version }} + -Dcom.exasol.dockerdb.image=${{ matrix.exasol_db_version }} + env: + # Set additional environment variable as in scala projects the scalatest plugin does not forward + # the system property -Dcom.exasol.dockerdb.image to the test's implementation. + EXASOL_DB_VERSION: ${{ matrix.exasol_db_version }} - name: Publish Test Report uses: scacap/action-surefire-report@v1 if: ${{ always() && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }} with: github_token: ${{ secrets.GITHUB_TOKEN }} - name: Sonar analysis - if: ${{ env.SONAR_TOKEN != null }} + if: ${{ env.SONAR_TOKEN != null && matrix.exasol_db_version == env.DEFAULT_EXASOL_DB_VERSION }} run: | - JAVA_HOME=$JAVA_HOME_17_X64 \ - mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \ + JAVA_HOME=$JAVA_HOME_17_X64 mvn --batch-mode org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -DtrimStackTrace=false \ -Dsonar.organization=exasol \ diff --git a/.github/workflows/dependencies_check.yml b/.github/workflows/dependencies_check.yml index 3059964..4b6eadf 100644 --- a/.github/workflows/dependencies_check.yml +++ b/.github/workflows/dependencies_check.yml @@ -1,12 +1,15 @@ -name: Dependencies Check +name: Report Security Issues for Repository on: + workflow_dispatch: schedule: - cron: "0 2 * * *" jobs: - build: + report_security_issues: runs-on: ubuntu-latest + permissions: + issues: write steps: - uses: actions/checkout@v4 @@ -16,5 +19,17 @@ jobs: distribution: "temurin" java-version: 11 cache: "maven" - - name: Checking dependencies for vulnerabilities - run: mvn --batch-mode org.sonatype.ossindex.maven:ossindex-maven-plugin:audit -f pom.xml + + - name: Generate ossindex report + run: | + mvn org.sonatype.ossindex.maven:ossindex-maven-plugin:audit \ + org.sonatype.ossindex.maven:ossindex-maven-plugin:audit-aggregate \ + -Dossindex.reportFile=$(pwd)/ossindex-report.json \ + -Dossindex.fail=false + + - name: Report Security Issues + uses: exasol/python-toolbox/.github/actions/security-issues@main + with: + format: "maven" + command: "cat ossindex-report.json" + github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release_droid_prepare_original_checksum.yml b/.github/workflows/release_droid_prepare_original_checksum.yml index 843604c..bc76555 100644 --- a/.github/workflows/release_droid_prepare_original_checksum.yml +++ b/.github/workflows/release_droid_prepare_original_checksum.yml @@ -5,9 +5,10 @@ on: jobs: build: - runs-on: ubuntu-20.04 # UDFs fail with "VM error: Internal error: VM crashed" on ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Free Disk Space + if: ${{ false }} run: | sudo rm -rf /usr/local/lib/android sudo rm -rf /usr/share/dotnet diff --git a/.project-keeper.yml b/.project-keeper.yml index 378fcd3..aeb7ad1 100644 --- a/.project-keeper.yml +++ b/.project-keeper.yml @@ -6,7 +6,7 @@ sources: - integration_tests - udf_coverage - maven_central -linkReplacements: -excludes: - - "E-PK-CORE-18: Outdated content: '.github/workflows/ci-build.yml'" - - "E-PK-CORE-18: Outdated content: '.github/workflows/release_droid_prepare_original_checksum.yml'" +build: + runnerOs: ubuntu-20.04 + exasolDbVersions: + - "7.1.24" diff --git a/dependencies.md b/dependencies.md index 6e48498..fec6150 100644 --- a/dependencies.md +++ b/dependencies.md @@ -27,34 +27,30 @@ ## Plugin Dependencies -| Dependency | License | -| ------------------------------------------------------- | ---------------------------------------------- | -| [SonarQube Scanner for Maven][26] | [GNU LGPL 3][27] | -| [Apache Maven Compiler Plugin][28] | [Apache-2.0][29] | -| [Apache Maven Enforcer Plugin][30] | [Apache-2.0][29] | -| [Maven Flatten Plugin][31] | [Apache Software Licenese][29] | -| [org.sonatype.ossindex.maven:ossindex-maven-plugin][32] | [ASL2][33] | -| [Maven Surefire Plugin][34] | [Apache-2.0][29] | -| [Versions Maven Plugin][35] | [Apache License, Version 2.0][29] | -| [duplicate-finder-maven-plugin Maven Mojo][36] | [Apache License 2.0][37] | -| [Project keeper maven plugin][38] | [The MIT License][39] | -| [Apache Maven Assembly Plugin][40] | [Apache-2.0][29] | -| [Apache Maven JAR Plugin][41] | [Apache License, Version 2.0][29] | -| [Artifact reference checker and unifier][42] | [MIT][43] | -| [Apache Maven Deploy Plugin][44] | [Apache-2.0][29] | -| [Apache Maven GPG Plugin][45] | [Apache-2.0][29] | -| [Apache Maven Source Plugin][46] | [Apache License, Version 2.0][29] | -| [Apache Maven Javadoc Plugin][47] | [Apache License, Version 2.0][29] | -| [Nexus Staging Maven Plugin][48] | [Eclipse Public License][49] | -| [Apache Maven Dependency Plugin][50] | [Apache-2.0][29] | -| [Maven Failsafe Plugin][51] | [Apache-2.0][29] | -| [JaCoCo :: Maven Plugin][52] | [Eclipse Public License 2.0][25] | -| [error-code-crawler-maven-plugin][53] | [MIT License][54] | -| [Reproducible Build Maven Plugin][55] | [Apache 2.0][33] | -| [Maven Clean Plugin][56] | [The Apache Software License, Version 2.0][33] | -| [Maven Resources Plugin][57] | [The Apache Software License, Version 2.0][33] | -| [Maven Install Plugin][58] | [The Apache Software License, Version 2.0][33] | -| [Maven Site Plugin 3][59] | [The Apache Software License, Version 2.0][33] | +| Dependency | License | +| ------------------------------------------------------- | --------------------------------- | +| [SonarQube Scanner for Maven][26] | [GNU LGPL 3][27] | +| [Apache Maven Compiler Plugin][28] | [Apache-2.0][29] | +| [Apache Maven Enforcer Plugin][30] | [Apache-2.0][29] | +| [Maven Flatten Plugin][31] | [Apache Software Licenese][29] | +| [org.sonatype.ossindex.maven:ossindex-maven-plugin][32] | [ASL2][33] | +| [Maven Surefire Plugin][34] | [Apache-2.0][29] | +| [Versions Maven Plugin][35] | [Apache License, Version 2.0][29] | +| [duplicate-finder-maven-plugin Maven Mojo][36] | [Apache License 2.0][37] | +| [Project keeper maven plugin][38] | [The MIT License][39] | +| [Apache Maven Assembly Plugin][40] | [Apache-2.0][29] | +| [Apache Maven JAR Plugin][41] | [Apache License, Version 2.0][29] | +| [Artifact reference checker and unifier][42] | [MIT][11] | +| [Apache Maven Deploy Plugin][43] | [Apache-2.0][29] | +| [Apache Maven GPG Plugin][44] | [Apache-2.0][29] | +| [Apache Maven Source Plugin][45] | [Apache License, Version 2.0][29] | +| [Apache Maven Javadoc Plugin][46] | [Apache License, Version 2.0][29] | +| [Nexus Staging Maven Plugin][47] | [Eclipse Public License][48] | +| [Apache Maven Dependency Plugin][49] | [Apache-2.0][29] | +| [Maven Failsafe Plugin][50] | [Apache-2.0][29] | +| [JaCoCo :: Maven Plugin][51] | [Eclipse Public License 2.0][25] | +| [error-code-crawler-maven-plugin][52] | [MIT License][53] | +| [Reproducible Build Maven Plugin][54] | [Apache 2.0][33] | [0]: https://github.com/exasol/virtual-schema-common-jdbc/ [1]: https://github.com/exasol/virtual-schema-common-jdbc/blob/main/LICENSE @@ -67,7 +63,7 @@ [8]: https://junit.org/junit5/ [9]: https://www.eclipse.org/legal/epl-v20.html [10]: https://github.com/mockito/mockito -[11]: https://github.com/mockito/mockito/blob/main/LICENSE +[11]: https://opensource.org/licenses/MIT [12]: https://github.com/exasol/exasol-testcontainers/ [13]: https://github.com/exasol/exasol-testcontainers/blob/main/LICENSE [14]: https://java.testcontainers.org @@ -99,20 +95,15 @@ [40]: https://maven.apache.org/plugins/maven-assembly-plugin/ [41]: https://maven.apache.org/plugins/maven-jar-plugin/ [42]: https://github.com/exasol/artifact-reference-checker-maven-plugin -[43]: https://opensource.org/licenses/MIT -[44]: https://maven.apache.org/plugins/maven-deploy-plugin/ -[45]: https://maven.apache.org/plugins/maven-gpg-plugin/ -[46]: https://maven.apache.org/plugins/maven-source-plugin/ -[47]: https://maven.apache.org/plugins/maven-javadoc-plugin/ -[48]: http://www.sonatype.com/public-parent/nexus-maven-plugins/nexus-staging/nexus-staging-maven-plugin/ -[49]: http://www.eclipse.org/legal/epl-v10.html -[50]: https://maven.apache.org/plugins/maven-dependency-plugin/ -[51]: https://maven.apache.org/surefire/maven-failsafe-plugin/ -[52]: https://www.jacoco.org/jacoco/trunk/doc/maven.html -[53]: https://github.com/exasol/error-code-crawler-maven-plugin/ -[54]: https://github.com/exasol/error-code-crawler-maven-plugin/blob/main/LICENSE -[55]: http://zlika.github.io/reproducible-build-maven-plugin -[56]: http://maven.apache.org/plugins/maven-clean-plugin/ -[57]: http://maven.apache.org/plugins/maven-resources-plugin/ -[58]: http://maven.apache.org/plugins/maven-install-plugin/ -[59]: http://maven.apache.org/plugins/maven-site-plugin/ +[43]: https://maven.apache.org/plugins/maven-deploy-plugin/ +[44]: https://maven.apache.org/plugins/maven-gpg-plugin/ +[45]: https://maven.apache.org/plugins/maven-source-plugin/ +[46]: https://maven.apache.org/plugins/maven-javadoc-plugin/ +[47]: http://www.sonatype.com/public-parent/nexus-maven-plugins/nexus-staging/nexus-staging-maven-plugin/ +[48]: http://www.eclipse.org/legal/epl-v10.html +[49]: https://maven.apache.org/plugins/maven-dependency-plugin/ +[50]: https://maven.apache.org/surefire/maven-failsafe-plugin/ +[51]: https://www.jacoco.org/jacoco/trunk/doc/maven.html +[52]: https://github.com/exasol/error-code-crawler-maven-plugin/ +[53]: https://github.com/exasol/error-code-crawler-maven-plugin/blob/main/LICENSE +[54]: http://zlika.github.io/reproducible-build-maven-plugin diff --git a/doc/changes/changelog.md b/doc/changes/changelog.md index f0ac69b..e833da0 100644 --- a/doc/changes/changelog.md +++ b/doc/changes/changelog.md @@ -1,5 +1,6 @@ # Changes +* [7.1.6](changes_7.1.6.md) * [7.1.5](changes_7.1.5.md) * [7.1.4](changes_7.1.4.md) * [7.1.3](changes_7.1.3.md) diff --git a/doc/changes/changes_7.1.6.md b/doc/changes/changes_7.1.6.md new file mode 100644 index 0000000..e698219 --- /dev/null +++ b/doc/changes/changes_7.1.6.md @@ -0,0 +1,35 @@ +# Exasol Virtual Schema 7.1.6, released 2023-11-21 + +Code name: Fix CVE-2023-4043 in test dependency `org.eclipse.parsson:parsson` + +## Summary + +This release fixes vulnerability CVE-2023-4043 in test dependency `org.eclipse.parsson:parsson`. The release also adds runs integration tests using Exasol DB version 8. + +## Security + +* #114: Fixed CVE-2023-4043 in test dependency `org.eclipse.parsson:parsson` + +## Dependency Updates + +### Test Dependency Updates + +* Updated `com.exasol:exasol-testcontainers:6.6.2` to `6.6.3` +* Updated `com.exasol:hamcrest-resultset-matcher:1.6.1` to `1.6.3` +* Updated `com.exasol:test-db-builder-java:3.5.1` to `3.5.2` +* Updated `org.jacoco:org.jacoco.agent:0.8.10` to `0.8.11` +* Updated `org.junit.jupiter:junit-jupiter:5.10.0` to `5.10.1` +* Updated `org.mockito:mockito-junit-jupiter:5.6.0` to `5.7.0` +* Updated `org.testcontainers:junit-jupiter:1.19.1` to `1.19.2` + +### Plugin Dependency Updates + +* Updated `com.exasol:error-code-crawler-maven-plugin:1.3.0` to `1.3.1` +* Updated `com.exasol:project-keeper-maven-plugin:2.9.12` to `2.9.16` +* Updated `org.apache.maven.plugins:maven-dependency-plugin:3.6.0` to `3.6.1` +* Updated `org.apache.maven.plugins:maven-enforcer-plugin:3.4.0` to `3.4.1` +* Updated `org.apache.maven.plugins:maven-failsafe-plugin:3.1.2` to `3.2.2` +* Updated `org.apache.maven.plugins:maven-surefire-plugin:3.1.2` to `3.2.2` +* Updated `org.codehaus.mojo:versions-maven-plugin:2.16.0` to `2.16.1` +* Updated `org.jacoco:jacoco-maven-plugin:0.8.10` to `0.8.11` +* Updated `org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184` to `3.10.0.2594` diff --git a/pk_generated_parent.pom b/pk_generated_parent.pom index a776242..4891cfa 100644 --- a/pk_generated_parent.pom +++ b/pk_generated_parent.pom @@ -3,7 +3,7 @@ 4.0.0 com.exasol exasol-virtual-schema-generated-parent - 7.1.5 + 7.1.6 pom UTF-8 @@ -46,7 +46,7 @@ org.jacoco org.jacoco.agent - 0.8.10 + 0.8.11 test runtime @@ -56,7 +56,7 @@ org.sonarsource.scanner.maven sonar-maven-plugin - 3.9.1.2184 + 3.10.0.2594 org.apache.maven.plugins @@ -65,12 +65,18 @@ ${java.version} ${java.version} + true + + + -Xlint:all,-processing + + org.apache.maven.plugins maven-enforcer-plugin - 3.4.0 + 3.4.1 enforce-maven @@ -80,7 +86,7 @@ - [3.8.7,3.9.0) + 3.6.3 @@ -129,7 +135,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.2 @@ -140,7 +146,7 @@ org.codehaus.mojo versions-maven-plugin - 2.16.0 + 2.16.1 display-updates @@ -277,7 +283,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.2 attach-javadocs @@ -292,6 +298,7 @@ true true true + true @@ -318,7 +325,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.6.0 + 3.6.1 copy-jacoco @@ -338,10 +345,9 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 + 3.2.2 - + -Djava.util.logging.config.file=src/test/resources/logging.properties ${argLine} true @@ -361,7 +367,7 @@ org.jacoco jacoco-maven-plugin - 0.8.10 + 0.8.11 prepare-agent @@ -408,7 +414,7 @@ com.exasol error-code-crawler-maven-plugin - 1.3.0 + 1.3.1 verify diff --git a/pom.xml b/pom.xml index b9d97fa..c8d1b95 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 exasol-virtual-schema - 7.1.5 + 7.1.6 Exasol Virtual Schema This projects contains the Exasol dialect for Exasol's Virtual Schema https://github.com/exasol/exasol-virtual-schema/ @@ -43,32 +43,32 @@ org.junit.jupiter junit-jupiter - 5.10.0 + 5.10.1 test org.mockito mockito-junit-jupiter - 5.6.0 + 5.7.0 test com.exasol exasol-testcontainers - 6.6.2 + 6.6.3 test org.testcontainers junit-jupiter - 1.19.1 + 1.19.2 test com.exasol hamcrest-resultset-matcher - 1.6.1 + 1.6.3 test @@ -80,7 +80,7 @@ com.exasol test-db-builder-java - 3.5.1 + 3.5.2 test @@ -95,7 +95,7 @@ com.exasol project-keeper-maven-plugin - 2.9.12 + 2.9.16 @@ -162,7 +162,7 @@ exasol-virtual-schema-generated-parent com.exasol - 7.1.5 + 7.1.6 pk_generated_parent.pom From 104f4f1e965c11d82de58e93f39732a481f06120 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Tue, 21 Nov 2023 09:25:02 +0100 Subject: [PATCH 2/4] Update references --- doc/dialects/exasol.md | 2 +- .../adapter/dialects/exasol/IntegrationTestConfiguration.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/dialects/exasol.md b/doc/dialects/exasol.md index 5a7b203..e61a343 100644 --- a/doc/dialects/exasol.md +++ b/doc/dialects/exasol.md @@ -17,7 +17,7 @@ The SQL statement below creates the adapter script, defines the Java class that ```sql CREATE JAVA ADAPTER SCRIPT SCHEMA_FOR_VS_SCRIPT.ADAPTER_SCRIPT_EXASOL AS %scriptclass com.exasol.adapter.RequestDispatcher; - %jar /buckets///virtual-schema-dist-11.0.2-exasol-7.1.5.jar; + %jar /buckets///virtual-schema-dist-11.0.2-exasol-7.1.6.jar; / ``` diff --git a/src/test/java/com/exasol/adapter/dialects/exasol/IntegrationTestConfiguration.java b/src/test/java/com/exasol/adapter/dialects/exasol/IntegrationTestConfiguration.java index 9d7aa66..bf2052e 100644 --- a/src/test/java/com/exasol/adapter/dialects/exasol/IntegrationTestConfiguration.java +++ b/src/test/java/com/exasol/adapter/dialects/exasol/IntegrationTestConfiguration.java @@ -3,12 +3,12 @@ import java.nio.file.Path; public final class IntegrationTestConfiguration { - private static final String DEFAULT_DOCKER_DB_REFERENCE = "7.1.21"; + private static final String DEFAULT_DOCKER_DB_REFERENCE = "7.1.24"; /** * Do not use MavenProjectVersionGetter here to enable reference checker to check if reference points to the latest * version. */ - public static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-11.0.2-exasol-7.1.5.jar"; + public static final String VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION = "virtual-schema-dist-11.0.2-exasol-7.1.6.jar"; public static final Path PATH_TO_VIRTUAL_SCHEMAS_JAR = Path.of("target", VIRTUAL_SCHEMAS_JAR_NAME_AND_VERSION); private IntegrationTestConfiguration() { From 816dca56b779a60763f7a3a1400fbac20d68b5a8 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Tue, 21 Nov 2023 09:27:35 +0100 Subject: [PATCH 3/4] Run PK fix --- .github/workflows/ci-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 4b08a41..acf3c0e 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - exasol_db_version: ["7.1.24", "8.23.1"] + exasol_db_version: ["7.1.24"] env: DEFAULT_EXASOL_DB_VERSION: "7.1.24" steps: From 7a06caca9e3853eba2cd00f04cf473fdc1d4e726 Mon Sep 17 00:00:00 2001 From: Christoph Pirkl Date: Tue, 21 Nov 2023 09:48:52 +0100 Subject: [PATCH 4/4] Fix indentation --- .gitattributes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index 93cd5a3..91e2b11 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11,5 +11,5 @@ pk_generated_parent.pom linguist-genera .settings/org.eclipse.jdt.core.prefs linguist-generated=true .settings/org.eclipse.jdt.ui.prefs linguist-generated=true -.settings/org.eclipse.jdt.core.prefs linguist-generated=true -.settings/org.eclipse.jdt.ui.prefs linguist-generated=true +.settings/org.eclipse.jdt.core.prefs linguist-generated=true +.settings/org.eclipse.jdt.ui.prefs linguist-generated=true