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.

Sign up for GitHub

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

More progress on Jakarta #28092

Merged
merged 3 commits into from
Sep 20, 2022
Merged

More progress on Jakarta #28092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00a3e46
Jakarta - Upgrade to Infinispan 14.0.0.CR2 and new Jakarta artifacts
gsmet Sep 20, 2022
ce54d9d
Jakarta - Adjust JAX-RS 3.1 hash
gsmet Sep 20, 2022
ab9e606
Jakarta - Exclude old Jandex from resteasy-core
gsmet Sep 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions bom/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4401,6 +4401,10 @@
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
1 change: 0 additions & 1 deletion extensions/infinispan-client/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@
<configuration>
<activeRecipes>
<recipe>io.quarkus.infinispan</recipe>
<recipe>io.quarkus.fix-infinispan-commons</recipe>
</activeRecipes>
</configuration>
</plugin>
Expand Down
29 changes: 6 additions & 23 deletions jakarta/rewrite.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@ displayName: Adjust Infinispan version and dependencies
recipeList:
- org.openrewrite.maven.ChangePropertyValue:
key: infinispan.version
newValue: 14.0.0.Dev04
newValue: 14.0.0.CR2
- org.openrewrite.maven.ChangePropertyValue:
key: infinispan.protostream.version
newValue: 14.0.0.CR2
Expand All @@ -865,41 +865,24 @@ recipeList:
oldGroupId: org.infinispan
oldArtifactId: infinispan-client-hotrod
newGroupId: org.infinispan
newArtifactId: infinispan-client-hotrod
newClassifier: jakarta
newArtifactId: infinispan-client-hotrod-jakarta
- org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId:
oldGroupId: org.infinispan
oldArtifactId: infinispan-commons
newGroupId: org.infinispan
newArtifactId: infinispan-commons
newClassifier: jakarta
newArtifactId: infinispan-commons-jakarta
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
oldGroupId: org.infinispan
oldArtifactId: infinispan-core
newGroupId: org.infinispan
newArtifactId: infinispan-core
newClassifier: jakarta
newArtifactId: infinispan-core-jakarta
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
oldGroupId: org.infinispan
oldArtifactId: infinispan-client-hotrod
newGroupId: org.infinispan
newArtifactId: infinispan-client-hotrod
newClassifier: jakarta
newArtifactId: infinispan-client-hotrod-jakarta
- org.openrewrite.maven.ChangeDependencyGroupIdAndArtifactId:
oldGroupId: org.infinispan
oldArtifactId: infinispan-commons
newGroupId: org.infinispan
newArtifactId: infinispan-commons
newClassifier: jakarta
---
type: specs.openrewrite.org/v1beta/recipe
name: io.quarkus.fix-infinispan-commons
displayName: Adjust Infinispan version and dependencies
recipeList:
- org.openrewrite.maven.ExcludeDependency:
groupId: org.infinispan
artifactId: infinispan-commons
- org.openrewrite.maven.AddDependencyNoQuestionsAsked:
groupId: org.infinispan
artifactId: infinispan-commons
classifier: jakarta
newArtifactId: infinispan-commons-jakarta
2 changes: 1 addition & 1 deletion jakarta/transform.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ git cherry-pick -x ${JAKARTA_10_CDI_HASH}

## JAX-RS/RESTEasy Reactive
git fetch origin jakarta-10-jaxrs
git rev-list e466a63792db2e5d87eb0b662384618f16aaa419..origin/jakarta-10-jaxrs | tac | xargs git cherry-pick -x
git rev-list 1ac748346b91512957121e9b2f68c3b960c41565..origin/jakarta-10-jaxrs | tac | xargs git cherry-pick -x

# Build phase

Expand Down