Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(backend): Test Java 21 and identify next steps after illegal (#28622) #28623

Conversation

spbolton
Copy link
Contributor

@spbolton spbolton commented May 21, 2024

Proposed Changes

  • Test upgrade to J21 after recent changes, DO NOT MERGE

Checklist

  • Tests
  • Translations
  • Security Implications Contemplated (add notes if applicable)

Additional Info

Related to #28622 (Test Java 21 and identify next steps after illegal).

Screenshots

Original Updated
** original screenshot ** ** updated screenshot **

@spbolton spbolton linked an issue May 21, 2024 that may be closed by this pull request
@spbolton spbolton marked this pull request as draft May 21, 2024 16:12
@spbolton spbolton force-pushed the issue-28622-test-java-21-and-identify-next-steps-after-illegal branch 4 times, most recently from a06d8b7 to 318ddff Compare May 22, 2024 02:40
@spbolton spbolton force-pushed the issue-28622-test-java-21-and-identify-next-steps-after-illegal branch from 83b67ae to f4c1c76 Compare June 3, 2024 10:09
@spbolton spbolton force-pushed the issue-28622-test-java-21-and-identify-next-steps-after-illegal branch from f4c1c76 to a890c91 Compare June 3, 2024 10:21
dependabot bot and others added 19 commits June 3, 2024 11:23
)

Bumps [next](https://github.com/vercel/next.js) from 14.1.0 to 14.1.1.
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/vercel/next.js/commit/5f59ee5f197a09275da7a9fa876986f22f4b7711"><code>5f59ee5</code></a>
v14.1.1</li>
<li><a
href="https://github.com/vercel/next.js/commit/f48b90b162c1a27a1ecaa8ae0a452e0a6605c35f"><code>f48b90b</code></a>
even more</li>
<li><a
href="https://github.com/vercel/next.js/commit/7f789f4a6f6a4f89495c770bed74d5e5d0e01d44"><code>7f789f4</code></a>
more timeout</li>
<li><a
href="https://github.com/vercel/next.js/commit/ab71c4cf782e13d564f48fe15732b9c42a3f6f36"><code>ab71c4c</code></a>
update timeout</li>
<li><a
href="https://github.com/vercel/next.js/commit/75f60d92c43187aa5786f88f0fe4e2bfc7d44c7b"><code>75f60d9</code></a>
update trigger release workflow</li>
<li><a
href="https://github.com/vercel/next.js/commit/74b3f0f4f3dcc15f35c9b9956755ca7b7b6a6db5"><code>74b3f0f</code></a>
Server Action tests (<a
href="https://redirect.github.com/vercel/next.js/issues/62655">#62655</a>)</li>
<li><a
href="https://github.com/vercel/next.js/commit/a6946b69ccb268015887ea6d6ef39f262e5636b1"><code>a6946b6</code></a>
Backport metadata fixes (<a
href="https://redirect.github.com/vercel/next.js/issues/62663">#62663</a>)</li>
<li><a
href="https://github.com/vercel/next.js/commit/4002f4b33c5a42166e5ad5f9ff4f879195aeb852"><code>4002f4b</code></a>
Fix draft mode invariant (<a
href="https://redirect.github.com/vercel/next.js/issues/62121">#62121</a>)</li>
<li><a
href="https://github.com/vercel/next.js/commit/7dbf6f8298daea8e8c5198e9a4e7e758da665a6d"><code>7dbf6f8</code></a>
fix: babel usage with next/image (<a
href="https://redirect.github.com/vercel/next.js/issues/61835">#61835</a>)</li>
<li><a
href="https://github.com/vercel/next.js/commit/3efc842a0a30ffd3a991e45736ac615f336d3103"><code>3efc842</code></a>
Fix next/server apit push alias for ESM pkg (<a
href="https://redirect.github.com/vercel/next.js/issues/61721">#61721</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/vercel/next.js/compare/v14.1.0...v14.1.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=next&package-manager=npm_and_yarn&previous-version=14.1.0&new-version=14.1.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts page](https://github.com/dotCMS/core/network/alerts).

</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Arcadio Quintero <[email protected]>
Dimensions should display as `{Width} x {Height}` instead of `{Height} x
{Width}` in the dropdown; this just swaps them.

Solves #28517.

Redo of #28520, but this time I'm not
working off a fork, so that should simplify things!

Signed-off-by: Jamie Mauro <[email protected]>
### Proposed Changes
* Upon adding a query param we get language variables count info 
* Also adding an endpoint to get languages and countries provided by JVM
* Respective postman and IT
first PR for:

#28588

I am going to use this Method later to clean the MultiTreeCache

### Proposed Changes
* Create Factory method to get Experiment by Host


https://github.com/dotCMS/core/pull/28628/files#diff-21c1ce5a843f846838109d8270b67fb2a386b5cd7c9b45234d30c0d9ad34117bR53
trying to upgrade graphql to 17.5
### Proposed Changes
* Update the dependencies of SDK to the examples to the latest version
in NPM

### Checklist
- [ ] Tests
- [ ] Translations
- [ ] Security Implications Contemplated (add notes if applicable)

### Additional Info
** any additional useful context or info **

### Screenshots
This is a last PR for #22033

First one: #28530
Second one: #28564
third one: #28586

On this PR we are starting the PruneTimeMachineJob, this need to be
starter when the TimeMachineJob is started.

### Proposed Changes
* Start the Prune Time machineJob after start the TimeMachineJob


https://github.com/dotCMS/core/pull/28586/files#diff-d6eb70242764e7e3dbcffc3d0bac20c485b0879b72118925714bb30e37d1ac9aR507

* We need to remove the files under the bundle folder too


https://github.com/dotCMS/core/pull/28586/files#diff-19b28e2982b6db869240fb8fc96a2bf2c156e3607f41656fd16d7845c45ba604R231

When TimeMachine run it created the Bundle folder under the bundles
folder and later copy it to the timemachine folder, we need to remove
both

### Checklist
- [x] Tests
- [ ] 
### Additional Info
Later I am going to sent a last PR with the Stop logic

---------

Co-authored-by: Daniel Silva <[email protected]>
…28650)

### Proposed Changes
* edit embedded contentlet only JSP

### Checklist
- [ ] Tests
- [ ] Translations
- [ ] Security Implications Contemplated (add notes if applicable)

### Additional Info
** any additional useful context or info **

### Screenshots


https://github.com/dotCMS/core/assets/1909643/752fb4f4-3cdd-401d-bb9d-c71b8909c611
### Proposed Changes
* Check if the page is a variant before setting the mode of the editor

### Screenshots



https://github.com/dotCMS/core/assets/63567962/c79e31cb-e3ab-4b93-a25e-201f6b811489
… (#28642)

### Proposed Changes
* Fix filtering of language not country codes and add missing entries
* Tests should work but will only really know when we do not see the
issue re-occur.

### Checklist
- [ ] Tests
- [ ] Translations
- [ ] Security Implications Contemplated (add notes if applicable)

### Additional Info
Related to #28640 (Flakey test  Language randomization causes conflic).


### Screenshots
Original             |  Updated
:-------------------------:|:-------------------------:
** original screenshot **  |  ** updated screenshot **
…8633)

Now, when updating a content type we don't depend solely on the ID, but
we use now the variable as a secondary key if needed.
second PR for:

#28588

first one: #28628

Refactor MultiTreeCache to make it cluster-aware.

Previously, we used the Page ID as the key in the MultiTreeCache,
storing a map where each key represented a different variant name and
each value was a MultiTree. When we needed to remove a variant, we
followed these steps:

Removed the item from the map representing the variant.
Put the updated map back into the cache.
However, the put method was not cluster-aware. You can see the relevant
code here:


https://github.com/dotCMS/core/blob/eb200d27482a557634e0f732ed5f055c0df28450/dotCMS/src/main/java/com/dotmarketing/cache/MultiTreeCache.java#L91-L103

### Proposed Changes
* Create the listActive Experiment API Method to get all the Active
Experiment by Host


https://github.com/dotCMS/core/pull/28630/files#diff-8bf1865184fd59c5c64882df72bd0c71a403a544777830acf250bbf54ea84d90R271

* Use Page's id + variant Name as Cache key 


https://github.com/dotCMS/core/pull/28630/files#diff-ad644a666145836b324394468b653fe572daf6de9d1e434752ec44eca7fdf9a4R53

so we don't need the Map anymore

* When we need to remove all the variants for a Page, we use the new
listActive API Method


https://github.com/dotCMS/core/pull/28630/files#diff-ad644a666145836b324394468b653fe572daf6de9d1e434752ec44eca7fdf9a4R99

### Checklist
- [x] Tests
Include logging of backups deleted
### Proposed Changes
*Better clean up code for lang variables test. Prevents breakage in
tests
### Proposed Changes
- Add more tests
- Migrate to JWT auth 

### Checklist
- [ ] Tests
- [ ] Security Implications 

### Additional Info
** any additional useful context or info **

---------

Signed-off-by: bryanboza <[email protected]>
dsilvam and others added 21 commits June 3, 2024 11:23
… in the table. (#28669)

### Proposed Changes
* add the menu options to the locale table and the confirmation
messages.
* Push Publish 
* Set As Default 
* Delete 


### Screenshots


https://github.com/dotCMS/core/assets/31667212/646d62f0-b6d3-4f8d-b9e4-173e955160b8
## Proposed Changes
* Add `Content` Class to handle Content API Methods and expose it as a
method of the Dotcms Client
* Add `GetCollection` Class to handle the building of a query for
collections and expose it as a method of `Content` Class

## Usage example for standalone `getCollection`

This an example of a query with all possible methods it supports (could
not be a real use case and it should be used from the `client.content`).

```typescript
        const requestOptions: Omit<RequestInit, 'body' | 'method'> = {
            cache: 'no-cache' // To simulate a valid request
        };

        const serverUrl = 'http://localhost:8080';

        const contentType = 'forceSensitive';
        const client = new GetCollection(requestOptions, serverUrl, contentType);

        const response = await client
            .language(13) // Language Id
            .render(true) // To retrieve the content with the render
            .sortBy([
                // Sort by multiple fields
                {
                    field: 'name',
                    order: 'asc'
                },
                {
                    field: 'midichlorians',
                    order: 'desc'
                }
            ])
            .depth(2) // Depth of the content for relationships
            .limit(20) // Limit of content per page
            .page(3) // Page to fetch
            .query(
                (
                    qb // Lucene query to append to the main query for more complex queries
                ) =>
                    qb
                        .field('kyberCrystal')
                        .equals('red')
                        .and()
                        .equals('blue')
                        .field('master')
                        .equals('Yoda')
                        .or()
                        .equals('Obi-Wan')
            )
            .draft(true) // To retrieve the draft content
            .variant('legends-forceSensitive') // Variant of the content
            .rawQuery('+modDate:2024-05-28 +conhost:MyCoolSite') // Raw query to append to the main query
            .fetch(); // Fetch the content
```
… fields (#28683)

Now, when updating the content type fields, we don't depend solely on
the field ID, but we use now the field variable as a secondary key if
needed.

---------

Co-authored-by: Daniel Enrique Colina Rodríguez <[email protected]>
…nore when invalid (#28707)

This is to prevent a HTML injection.
### Proposed Changes
* Adding a minified version of the Vanity URL object to the JSON
response when processing a Forward status code, for troubleshooting
purposes.
* Adding the `X-DOT-VanityUrl` Response Header just like we do when
accessing Vanity URLs in the front-end.
Include Upgrade Task to add the dotAI portlet by default.
Integration test included.
Update empty starter with a new one that includes the dotAI portlet.
### Proposed Changes
* Moved all SDK logic to standalone lib in NX workspace
* This PR introduces a new method to create a links from the example
apps to sdk libs, using compilerOptions on tsconfig file. To test it,
build the angular sdk lib and run the angular example

in core/core-web:
`npx nx run sdk-angular:build`

then `ng serve` in examples/angular

This way can be used in other sdk/examples apps

---------

Co-authored-by: KevinDavilaDotCMS <[email protected]>
### Proposed Changes
* Ensure that all rows of cards have a consistent height.

### Video


https://github.com/dotCMS/core/assets/72418962/f73b7e1f-09e0-4d22-9fba-39c7a130e5bf
@spbolton spbolton force-pushed the issue-28622-test-java-21-and-identify-next-steps-after-illegal branch from a890c91 to be3b397 Compare June 3, 2024 10:23
Copy link

Copy link

github-actions bot commented Jul 6, 2024

This PR is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days.

@github-actions github-actions bot added the stale label Jul 6, 2024
Copy link

This PR was closed because it has been stalled with no activity.

@github-actions github-actions bot closed this Jul 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Test Java 21 and identify next steps after illegal-access workaround