Merge branch 'master' into ssrf-final-fixes

Author: seran

.circleci/config.yml

@@ -20,6 +20,7 @@ on:
       - '!.gitignore'
       - '!docs/**'
       - '!release_notes.md'
+      - '!outdated/**'
       - 'docs/options.md'
 ### Unfortunately, had to disable this. Originally added to be able to run CI from PRs from forks (eg from external people).
 ### But this leads to run CI 2 twice on each push on an open PR, regardless of fork.
@@ -38,8 +39,8 @@ env:
   # For some "hilarious" case, see:
   # https://github.com/WebFuzzing/EvoMaster/issues/447
   release-jdk: 21
-  latest-jdk: 21
-  build-jdk: 1.8
+  build-jdk: 17
+#  latest-jdk: 21
   retention-days: 5
   debug: false  # put to true if need to debug a specific test
   debugTestName: "org.evomaster.e2etests.spring.graphql.db.tree.DbTreeEMTest" # replace with test to debug
@@ -132,29 +133,7 @@ jobs:
       - if: github.ref != 'refs/heads/master'
         name: Uploading coverage to CodeCov is done only on 'master' branch builds
         run: echo Skipping upload to CodeCov
-      # Only once coverage is uploaded, we try to build with other versions of Java, as "mvn clean" would delete those reports
-      # However, the latest LTS is fully built (with tests) on a different job
-      # JDK 11
-      - name: Setup JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Compile with JDK 11
-        run: mvn clean verify -DskipTests
-      #JDK 17
-      - name: Setup JDK 17
-        uses: actions/setup-java@v1
-        with:
-          java-version: 17
-      - name: Compile with JDK 17
-        run: mvn clean verify -DskipTests
-      #JDK 21
-      - name: Setup JDK 21
-        uses: actions/setup-java@v1
-        with:
-          java-version: 21
-      - name: Compile with JDK 21
-        run: mvn clean verify -DskipTests
+
 
 
   base-build-mac:
@@ -163,10 +142,10 @@ jobs:
     if: needs.setup.outputs.debug == 'false'
     steps:
       - uses: actions/checkout@v4
-      - name: Setup JDK ${{env.latest-jdk}}
+      - name: Setup JDK ${{env.release-jdk}}
         uses: actions/setup-java@v1
         with:
-          java-version: ${{env.latest-jdk}}
+          java-version: ${{env.release-jdk}}
       - name: Cache Maven packages
         uses: actions/cache@v3
         with:
@@ -184,10 +163,10 @@ jobs:
     if: needs.setup.outputs.debug == 'false'
     steps:
       - uses: actions/checkout@v4
-      - name: Setup JDK ${{env.latest-jdk}}
+      - name: Setup JDK ${{env.release-jdk}}
         uses: actions/setup-java@v1
         with:
-          java-version: ${{env.latest-jdk}}
+          java-version: ${{env.release-jdk}}
       - name: Cache Maven packages
         uses: actions/cache@v3
         with:
@@ -200,32 +179,33 @@ jobs:
           CI_env: GithubAction
 
 
-  full-build-LTS:
-    # run on a different OS from main build.
-    # It would had been good, but does not work due to Docker support :(  see:
-    # https://stackoverflow.com/questions/66077884/testcontainers-in-windows-environment-on-github-actions-could-not-find-a-valid
-    # TODO check this again in the future
-    # runs-on: windows-latest
-    runs-on: ubuntu-latest
-    needs: setup
-    if: needs.setup.outputs.debug == 'false'
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup JDK ${{env.latest-jdk}}
-        uses: actions/setup-java@v1
-        with:
-          java-version: ${{env.latest-jdk}}
-      - name: Cache Maven packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
-      - name: Build with Maven
-        run: mvn clean verify --fae
-        env:
-          CI_env: GithubAction
-          MAVEN_OPTS: "--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED"
+#  NOTES we know try to be on latest LTS
+#  full-build-LTS:
+#    # run on a different OS from main build.
+#    # It would had been good, but does not work due to Docker support :(  see:
+#    # https://stackoverflow.com/questions/66077884/testcontainers-in-windows-environment-on-github-actions-could-not-find-a-valid
+#    # TODO check this again in the future
+#    # runs-on: windows-latest
+#    runs-on: ubuntu-latest
+#    needs: setup
+#    if: needs.setup.outputs.debug == 'false'
+#    steps:
+#      - uses: actions/checkout@v4
+#      - name: Setup JDK ${{env.latest-jdk}}
+#        uses: actions/setup-java@v1
+#        with:
+#          java-version: ${{env.latest-jdk}}
+#      - name: Cache Maven packages
+#        uses: actions/cache@v3
+#        with:
+#          path: ~/.m2
+#          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+#          restore-keys: ${{ runner.os }}-m2
+#      - name: Build with Maven
+#        run: mvn clean verify --fae
+#        env:
+#          CI_env: GithubAction
+#          MAVEN_OPTS: "--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED"
 
 
 
@@ -354,10 +334,10 @@ jobs:
     if: needs.setup.outputs.debug == 'false'
     steps:
       - uses: actions/checkout@v4
-      - name: Setup JDK ${{env.latest-jdk}}
+      - name: Setup JDK ${{env.build-jdk}}
         uses: actions/setup-java@v1
         with:
-          java-version: ${{env.latest-jdk}}
+          java-version: ${{env.build-jdk}}
       - name: Cache Maven packages
         uses: actions/cache@v3
         with:

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ experiments/target/
 *.lst
 /report/target/
 /extra_heuristics.csv
-/dbconstraint/target/
+/core-extra/dbconstraint/target/
 /e2e-tests/spring-rest-postgres/target/
 /e2e-tests/spring-rest-postgres-data-types/target/
 /core/testWithEMB.sh
@@ -66,10 +66,10 @@ experiments/target/
 /client-js/integration-tests/build/
 /core-it/target/
 /coveredTargets.txt
-/core-driver-it/target/
+/core-integration-tests/core-driver-it/target/
 /core-it/src/test/kotlin/exp/
 
-/core-graphql-it/target/
+/core-integration-tests/core-graphql-it/target/
 
 
 #DotNet
@@ -125,7 +125,7 @@ Migrations/
 /e2e-tests/spring-rest-postgres-column-types/target/
 /e2e-tests/spring-rest-h2-column-types/target/
 /e2e-tests/spring-rest-h2-z3solver/target/
-/test-old-libraries/target/
+/client-java/test-old-libraries/target/
 /e2e-tests/spring-web/target/
 /e2e-tests/spring-rest-mongo/target/
 /e2e-tests/spring-rest-opensearch/target/
@@ -137,7 +137,7 @@ Migrations/
 /e2e-tests/spring-rpc/spring-rpc-grpc/target/
 /em.toml
 
-/solver/target/
+/core-extra/solver/target/
 /em.yaml
 /e2e-tests/spring-rest-openapi-v2/em.yaml
 /e2e-tests/spring-rest-openapi-v3/em.yaml
@@ -175,3 +175,5 @@ Migrations/
 /e2e-tests/spring-rest-multidb/target/
 /e2e-tests/spring-rest-h2-v2/target/
 e2e-tests/spring-rest-rsa/target/
+/e2e-tests/spring-rest-h2-v1/em.yaml
+/core-integration-tests/core-it/target/