diff --git a/chutney/.env.nix b/.env.chutney.nix similarity index 96% rename from chutney/.env.nix rename to .env.chutney.nix index 62778789c..a9da24d16 100644 --- a/chutney/.env.nix +++ b/.env.chutney.nix @@ -9,6 +9,7 @@ mkShell { buildInputs = [ unstable.nodejs_20 + unstable.act chromium geckodriver jdk diff --git a/.envrc b/.envrc new file mode 100644 index 000000000..69af45de3 --- /dev/null +++ b/.envrc @@ -0,0 +1,23 @@ +# Setup a working environment without hassle using nix and direnv +# For more information, visit https://direnv.net/ + +# Install node, npm and geckodriver by loading .env.chutney.nix expression +use_nix .env.chutney.nix + +# Some tools (ex. Intellij) might need to configure paths to node, npm etc. +# You can use following symlinks provided in .env folder + +## Create .env folder +[[ ! -d .env.chutney ]] && mkdir .env.chutney && echo "Create .env.chutney folder" + +## Symlink npm home +ln -sfn $(dirname "$(dirname "$(readlink -f $(which npm))")") .env.chutney/npm_home && echo "Symlink npm home dir" + +## Symlink JDK +ln -sfn $JAVA_HOME .env.chutney/jdk && echo "Symlink jdk \"$JAVA_HOME\"" + +## Symlink Node +ln -sfn $(readlink -f $(which node)) .env.chutney/node && echo "Symlink node \"$(readlink -f $(which node))" + +# Run npm install if needed +[[ ! -d ./chutney/ui/node_modules ]] && echo "node_modules not found. Starting npm install" && cd ./chutney/ui && npm install && cd - diff --git a/chutney/.github/ISSUE_TEMPLATE/bug_report_form.yml b/.github/ISSUE_TEMPLATE/bug_report_form.yml similarity index 85% rename from chutney/.github/ISSUE_TEMPLATE/bug_report_form.yml rename to .github/ISSUE_TEMPLATE/bug_report_form.yml index 8fd2f6ccc..68dfc1178 100644 --- a/chutney/.github/ISSUE_TEMPLATE/bug_report_form.yml +++ b/.github/ISSUE_TEMPLATE/bug_report_form.yml @@ -11,7 +11,19 @@ body: 🙌 Please, make sure your bug report is unique 🦄 ! Did you search issues labeled with Bug ? If you find anything relevant to you, up-vote 👍 or add a comment 💬 ! - For more information, please visit our [contribute section](https://github.com/chutney-testing/chutney/blob/master/CONTRIBUTING.md) + For more information, please visit our [contribute section](https://github.com/chutney-testing/chutney/blob/main/chutney/CONTRIBUTING.md) + - type: dropdown + id: component + attributes: + label: Which part of our software stack is concerned by the problem ? + multiple: true + options: + - Chutney + - Documentation + - IDEA plugin + - Kotlin DSL + validations: + required: true - type: textarea id: what-happened attributes: diff --git a/chutney/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml similarity index 100% rename from chutney/.github/ISSUE_TEMPLATE/config.yml rename to .github/ISSUE_TEMPLATE/config.yml diff --git a/chutney/.github/ISSUE_TEMPLATE/feature_request_form.yml b/.github/ISSUE_TEMPLATE/feature_request_form.yml similarity index 83% rename from chutney/.github/ISSUE_TEMPLATE/feature_request_form.yml rename to .github/ISSUE_TEMPLATE/feature_request_form.yml index 9f54c9e61..2877bfe3c 100644 --- a/chutney/.github/ISSUE_TEMPLATE/feature_request_form.yml +++ b/.github/ISSUE_TEMPLATE/feature_request_form.yml @@ -8,6 +8,18 @@ body: value: | 🙌 Please, make sure your feature request is unique 🦄 ! Did you search issues labeled with Enhancement ? If you find anything relevant to you, up-vote 👍 or add a comment 💬 ! + - type: dropdown + id: component + attributes: + label: Which part of our software stack is concerned by the feature ? + multiple: true + options: + - Chutney + - Documentation + - IDEA plugin + - Kotlin DSL + validations: + required: true - type: textarea id: use-case attributes: diff --git a/.github/actions/build-chutney/action.yml b/.github/actions/build-chutney/action.yml new file mode 100644 index 000000000..b77f43ee1 --- /dev/null +++ b/.github/actions/build-chutney/action.yml @@ -0,0 +1,53 @@ +name: 'build chutney' +description: 'build chutney' +inputs: + goals: + default: "clean install -V -B" + description: "Maven goals to execute" + cache-artifacts: + default: "" + description: "path of artifacts to be cached" +runs: + using: "composite" + steps: + - name: Cache node + uses: actions/cache@v3 + with: + path: '**/node' + key: node_cache + + - name: Cache node_modules + uses: actions/cache@v3 + with: + path: '**/node_modules' + key: node_module_cache + + - uses: actions/checkout@v4 + + - name: Add the current IP address, long hostname and short hostname record to /etc/hosts file + if: ${{ ! contains(inputs.goals, '-DskipTests') }} + shell: bash + run: | + echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts + + - name: Build Chutney + shell: bash + run: | + cd ./chutney + echo "Running: ${{inputs.goals}}" + mvn ${{ inputs.goals }} + cd .. + + - name: Codecov + if: ${{ ! contains(inputs.goals, '-DskipTests') }} + uses: codecov/codecov-action@v3 + + - name: Temporarily cache jar artifacts + if: inputs.cache-artifacts != '' + uses: actions/upload-artifact@v4 + with: + name: chutney-artifacts + path: ${{inputs.cache-artifacts}} + retention-days: 1 + overwrite: true + diff --git a/.github/actions/build-dsl/action.yml b/.github/actions/build-dsl/action.yml new file mode 100644 index 000000000..0cc94d7c9 --- /dev/null +++ b/.github/actions/build-dsl/action.yml @@ -0,0 +1,31 @@ +name: 'build all projects' +description: 'build all projects sequentially' +inputs: + goals: + default: "clean build :chutney-kotlin-dsl:publishToMavenLocal" + description: "Gradle goals to execute" + cache-artifacts: + default: "" + description: "path of artifacts to be cached" + +runs: + using: "composite" + steps: + - uses: actions/checkout@v4 + + - name: Build DSL + shell: bash + run: | + cd ./kotlin-dsl + echo "Running: ${{inputs.goals}}" + ./gradlew ${{inputs.goals}} :chutney-kotlin-dsl:publishToMavenLocal + cd .. + + - name: Temporarily cache jar artifacts + if: inputs.cache-artifacts != '' + uses: actions/upload-artifact@v4 + with: + name: dsl-artifacts + path: ${{inputs.cache-artifacts}} + retention-days: 1 + overwrite: true diff --git a/.github/actions/build-plugin/action.yml b/.github/actions/build-plugin/action.yml new file mode 100644 index 000000000..a39e70404 --- /dev/null +++ b/.github/actions/build-plugin/action.yml @@ -0,0 +1,31 @@ +name: 'build all projects' +description: 'build all projects sequentially' +inputs: + goals: + default: "clean buildPlugin" + description: "Gradle goals to execute" + cache-artifacts: + default: "" + description: "path of artifacts to be cached" + +runs: + using: "composite" + steps: + - uses: actions/checkout@v4 + + - name: Build Plugin + shell: bash + run: | + cd ./idea-plugin + echo "Running: ${{inputs.goals}}" + ./gradlew ${{inputs.goals}} + cd .. + + - name: Temporarily cache jar artifacts + if: inputs.cache-artifacts != '' + uses: actions/upload-artifact@v4 + with: + name: plugin-artifacts + path: ${{inputs.cache-artifacts}} + retention-days: 1 + overwrite: true diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..3c3f9c0f3 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,9 @@ +version: 2 +updates: +- package-ecosystem: maven + directory: "/chutney/" + schedule: + interval: monthly + open-pull-requests-limit: 10 + labels: + - dependencies diff --git a/chutney/.github/pull_request_template.md b/.github/pull_request_template.md similarity index 100% rename from chutney/.github/pull_request_template.md rename to .github/pull_request_template.md diff --git a/chutney/.github/release.yml b/.github/release.yml similarity index 100% rename from chutney/.github/release.yml rename to .github/release.yml diff --git a/.github/workflows/build-all-template.yml b/.github/workflows/build-all-template.yml new file mode 100644 index 000000000..e0c74aeec --- /dev/null +++ b/.github/workflows/build-all-template.yml @@ -0,0 +1,158 @@ +name: "Build all template" + +on: + workflow_call: + inputs: + skipTests: + default: false + type: boolean + description: "Skip tests if true" + release: + default: false + type: boolean + description: "Release if true" + cache-artifacts: + default: "" + type: string + description: "path of artifacts to be cached" + server-id: + type: string + default: github + description: "DistributionManagement repository id" + + secrets: + gpg-private-key: + description: "Chutney gpg private key" + required: false + gpg-passphrase: + description: "Chutney gpg passphrase" + required: false + gpg-key-id: + description: "Chutney gpg key id" + required: false + maven-username: + description: "MAVEN_USERNAME secret" + required: false + maven-password: + description: "MAVEN_PASSWORD secret" + required: false + github-token: + description: "GITHUB_TOKEN secret" + required: false + + outputs: + PROJECT_VERSION: + description: "Chutney Version" + value: ${{ jobs.all.outputs.PROJECT_VERSION }} + +defaults: + run: + working-directory: . + +jobs: + all: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v4 + + - name: Setup JDK + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 17 + cache: 'maven' + server-id: ${{inputs.server-id}} + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + gpg-private-key: ${{ secrets.gpg-private-key }} + gpg-passphrase: CHUTNEY_GPG_PASSPHRASE + + - uses: actions/checkout@v4 + - name: Retrieve chutney version from pom.xml + id: get-version + run: cd ./chutney && echo "PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_OUTPUT && cd .. + + - name: Resolve chutney maven goal from inputs + id: chutney-goals + run: | + skipTestArg="" + mvnGoals="clean install" + if ${{ inputs.skipTests }}; then + skipTestArg="-DskipTests" + fi + if ${{ inputs.release }}; then + mvnGoals="deploy -P ${{inputs.server-id}}" + skipTestArg="-DskipTests" + fi + echo "CHUTNEY_GOALS=$mvnGoals $skipTestArg -V -B" >> $GITHUB_OUTPUT + + - name: Build Chutney + id: build-chutney + uses: ./.github/actions/build-chutney + env: + MAVEN_USERNAME: ${{secrets.maven-username}} + MAVEN_PASSWORD: ${{secrets.maven-password}} + CHUTNEY_GPG_PASSPHRASE: ${{ secrets.gpg-passphrase }} + with: + goals: ${{steps.chutney-goals.outputs.CHUTNEY_GOALS}} + cache-artifacts: ${{ inputs.cache-artifacts }} + + - name: Install api-insecure + shell: bash + run: | + mvn org.apache.maven.plugins:maven-install-plugin:3.1.1:install-file \ + -Dfile=./chutney/packaging/local-api-unsecure/target/chutney-local-api-unsecure-${{steps.get-version.outputs.PROJECT_VERSION}}.jar \ + -DgroupId=com.chutneytesting \ + -DartifactId=local-api-unsecure \ + -Dversion=${{steps.get-version.outputs.PROJECT_VERSION}} \ + -Dpackaging=jar + + - name: Resolve dsl gradle goal from inputs + id: dsl-goals + run: | + skipTestArg="" + gradleGoals="clean build" + if ${{ inputs.skipTests }}; then + skipTestArg="-x test" + fi + if ${{ inputs.release }}; then + gradleGoals="publish -Pserver-id=${{inputs.server-id}}" + skipTestArg="-x test" + + fi + echo "DSL_GOALS=$gradleGoals $skipTestArg" >> $GITHUB_OUTPUT + + - name: Build DSL + uses: ./.github/actions/build-dsl + env: + MAVEN_USERNAME: ${{secrets.maven-username}} + MAVEN_PASSWORD: ${{secrets.maven-password}} + CHUTNEY_GPG_KEY_ID: ${{ secrets.gpg-key-id }} + CHUTNEY_GPG_KEY: ${{ secrets.gpg-private-key }} + CHUTNEY_GPG_PASSPHRASE: ${{ secrets.gpg-passphrase }} + with: + goals: ${{steps.dsl-goals.outputs.DSL_GOALS}} + cache-artifacts: ${{ inputs.cache-artifacts }} + + - name: Resolve plugin gradle goal from inputs + if: ${{! inputs.release}} + id: plugin-goals + run: | + skipTestArg="" + if ${{ inputs.skipTests }}; then + skipTestArg="-x test" + fi + echo "PLUGIN_GOALS=clean buildPlugin $skipTestArg" >> $GITHUB_OUTPUT + + - name: Build Plugin + if: ${{! inputs.release}} + uses: ./.github/actions/build-plugin + with: + goals: ${{steps.plugin-goals.outputs.PLUGIN_GOALS}} + cache-artifacts: ${{ inputs.cache-artifacts }} + + outputs: + PROJECT_VERSION: ${{ steps.get-version.outputs.PROJECT_VERSION }} diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml new file mode 100644 index 000000000..7a0de03ec --- /dev/null +++ b/.github/workflows/build-all.yml @@ -0,0 +1,13 @@ +name: "Build all" + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build: + uses: ./.github/workflows/build-all-template.yml + with: + skipTests: ${{ startsWith(github.head_ref, 'release/') }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 000000000..e92169a20 --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,73 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ main ] + paths-ignore: + - 'docs/**' + +jobs: + codeql-analyze: + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'java', 'javascript', 'typescript', 'kotlin' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] + # Learn more about CodeQL language support at https://git.io/codeql-language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: 17 + cache: "maven" + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # 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 + + # ℹ️ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl + + # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 diff --git a/chutney/.github/workflows/dependency-convergence.yml b/.github/workflows/convergence-chutney.yml similarity index 51% rename from chutney/.github/workflows/dependency-convergence.yml rename to .github/workflows/convergence-chutney.yml index 54cac009f..6ff662cf4 100644 --- a/chutney/.github/workflows/dependency-convergence.yml +++ b/.github/workflows/convergence-chutney.yml @@ -1,27 +1,29 @@ -name: Convergence +name: "Chutney Dependency Convergence" on: - push: - branches: [ 'release/**' ] pull_request: - branches: [ master ] + branches: [ main ] + paths: + - 'chutney/**' + +defaults: + run: + working-directory: ./chutney jobs: - build: + convergence-chutney: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: - distribution: 'adopt' + distribution: 'temurin' java-version: 17 - name: Cache maven - uses: actions/cache@v2.1.3 + uses: actions/cache@v3 with: path: ~/.m2/repository key: maven_cache - name: Build with Maven - env: - BUILD_ENV: 'github-actions' run: mvn -B -V validate -Dconvergence -fae diff --git a/.github/workflows/release-docker-template.yml b/.github/workflows/release-docker-template.yml new file mode 100644 index 000000000..ee7516990 --- /dev/null +++ b/.github/workflows/release-docker-template.yml @@ -0,0 +1,62 @@ +name: "Release docker images on ghcr" + +on: + workflow_call: + inputs: + version: + type: string + description: "Project version" + secrets: + github-token: + description: "GITHUB_TOKEN secret" + required: true + +jobs: + publish-server-image: + name: Publish server docker image on ghcr + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v4 + + - name: Download server artifacts + uses: actions/download-artifact@v4 + with: + name: chutney-artifacts + path: artifacts + + - name: Login to Github Packages + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.github-token }} + + - name: Build and push server docker image + uses: docker/build-push-action@v2 + with: + context: ${{ github.workspace }} + file: ${{ github.workspace }}/chutney/.docker/server/Dockerfile + tags: | + ghcr.io/chutney-testing/chutney/server:latest + ghcr.io/chutney-testing/chutney/server:${{ inputs.version }} + push: true + build-args: | + JAR_PATH=artifacts/chutney/packaging/local-dev/target + + - name: Build and push ui docker image + uses: docker/build-push-action@v2 + with: + context: ${{ github.workspace }} + file: ${{ github.workspace }}/chutney/.docker/ui/Dockerfile + tags: | + ghcr.io/chutney-testing/chutney/ui:latest + ghcr.io/chutney-testing/chutney/ui:${{ inputs.version }} + push: true + build-args: | + WEBSITE=artifacts/chutney/ui/dist + CONF=chutney/.docker/ui + + diff --git a/docs/.github/workflows/publish.yml b/.github/workflows/release-docs.yml similarity index 65% rename from docs/.github/workflows/publish.yml rename to .github/workflows/release-docs.yml index c61b509b7..fd58c34be 100644 --- a/docs/.github/workflows/publish.yml +++ b/.github/workflows/release-docs.yml @@ -1,13 +1,21 @@ -name: docs +name: "Publish Documentation" + on: push: branches: - main + paths: + - 'docs/**' + +defaults: + run: + working-directory: ./docs + jobs: - deploy: + publish-doc: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions/setup-python@v2 with: python-version: 3.x diff --git a/.github/workflows/release-github-template.yml b/.github/workflows/release-github-template.yml new file mode 100644 index 000000000..b46ba7df8 --- /dev/null +++ b/.github/workflows/release-github-template.yml @@ -0,0 +1,56 @@ +name: "Release on Github" + +on: + workflow_call: + +jobs: + create-github-release: + runs-on: ubuntu-latest + steps: + - name: Create github release + id: create_release + uses: actions/create-release@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + release_name: Release ${{ github.ref }} + body: 'TODO' + draft: false + prerelease: false + outputs: + RELEASE_PATH: ${{ steps.create_release.outputs.upload_url }} + + publish-to-github-maven-registry: + uses: ./.github/workflows/build-all-template.yml + if: ${{ contains(github.ref_name, 'RC') }} + with: + release: true + secrets: + github-token: ${{ secrets.GITHUB_TOKEN }} + maven-username: ${{ github.actor }} + maven-password: ${{ secrets.GITHUB_TOKEN }} + + + upload-plugin-to-release: + needs: [ create-github-release] + runs-on: ubuntu-latest + steps: + - name: get plugin artifacts from build job + uses: actions/download-artifact@v4 + with: + name: plugin-artifacts + path: artifacts + + - name: Upload artifacts to github release + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ needs.create-github-release.outputs.RELEASE_PATH }} + asset_path: artifacts/idea-plugin/build/distributions/chutney-idea-plugin-${{ github.ref_name }}.zip + asset_name: chutney-idea-plugin-${{ github.ref_name }}.zip + asset_content_type: application/zip + + + diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..899bb4b8b --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,45 @@ +name: "Release all" + +on: + push: + tags: + - '*.*.*' + - '*.*.*-RC' + - '*.*.*-RC*' + +jobs: + build: + uses: ./.github/workflows/build-all-template.yml + with: + skipTests: true + cache-artifacts: | + chutney/packaging/local-dev/target/chutney-local-dev-*.jar + idea-plugin/build/distributions/*.zip + chutney/ui/dist + + release-github: + needs: [ build ] + uses: ./.github/workflows/release-github-template.yml + + release-to-OSSRH: + if: ${{ ! contains(github.ref_name, 'RC') }} + needs: [ build ] + uses: ./.github/workflows/build-all-template.yml + with: + release: true + server-id: ossrh + secrets: + gpg-private-key: ${{secrets.CHUTNEY_GPG_PRIVATE_KEY}} + gpg-passphrase: ${{ secrets.CHUTNEY_GPG_PASSPHRASE }} + gpg-key-id: ${{ secrets.CHUTNEY_GPG_KEY_ID }} + maven-username: ${{ secrets.OSSRH_USERNAME }} + maven-password: ${{ secrets.OSSRH_PASSWORD }} + + release-docker: + needs: [ build ] + uses: ./.github/workflows/release-docker-template.yml + with: + version: ${{needs.build.outputs.PROJECT_VERSION}} + secrets: + github-token: ${{ secrets.GITHUB_TOKEN }} + diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..03f2c68e1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,24 @@ +###################### +# Intellij +###################### +**/.idea/* +!.idea/codeStyleSettings.xml +!.idea/codeStyles +!.idea/runConfigurations +!.idea/copyright +!.idea/scopes +*.iml +*.iws +*.ipr +*.ids +*.orig + + +###################### +# Visual Studio Code +###################### +.vscode/ +**/.sts4-cache + + +.env.chutney diff --git a/chutney/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml similarity index 100% rename from chutney/.idea/codeStyleSettings.xml rename to .idea/codeStyleSettings.xml diff --git a/chutney/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml similarity index 100% rename from chutney/.idea/codeStyles/Project.xml rename to .idea/codeStyles/Project.xml diff --git a/chutney/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml similarity index 100% rename from chutney/.idea/codeStyles/codeStyleConfig.xml rename to .idea/codeStyles/codeStyleConfig.xml diff --git a/chutney/.idea/copyright/apache2.xml b/.idea/copyright/apache2.xml similarity index 100% rename from chutney/.idea/copyright/apache2.xml rename to .idea/copyright/apache2.xml diff --git a/chutney/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml similarity index 100% rename from chutney/.idea/copyright/profiles_settings.xml rename to .idea/copyright/profiles_settings.xml diff --git a/.idea/runConfigurations/install_local_api_unsecure_jar.xml b/.idea/runConfigurations/install_local_api_unsecure_jar.xml new file mode 100644 index 000000000..f02b1b08f --- /dev/null +++ b/.idea/runConfigurations/install_local_api_unsecure_jar.xml @@ -0,0 +1,37 @@ + + + + + + + + \ No newline at end of file diff --git a/chutney/.idea/runConfigurations/server_all_tests.xml b/.idea/runConfigurations/server_all_tests.xml similarity index 89% rename from chutney/.idea/runConfigurations/server_all_tests.xml rename to .idea/runConfigurations/server_all_tests.xml index b83aa01eb..1a7cd5e00 100644 --- a/chutney/.idea/runConfigurations/server_all_tests.xml +++ b/.idea/runConfigurations/server_all_tests.xml @@ -11,9 +11,9 @@