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

@W-15644208 Upgrade formula-engine to Java/Jakarta EE 9 namespace #146

Merged
merged 4 commits into from
Jun 27, 2024

Conversation

bairenlong-sfdc
Copy link
Collaborator

@bairenlong-sfdc bairenlong-sfdc commented Jun 6, 2024

Discussed with @jfreschl, we will merge this to main to make it easier to fix other bugs.

We will release from this branch (main-jakarta) to core/252, we will merge this to main after all is good with ee9

@@ -22,8 +22,8 @@
<artifactId>grammaticus</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using jarkatar annotation package

import com.force.formula.FormulaFieldReference;
import com.google.errorprone.annotations.Immutable;
Copy link
Collaborator Author

@bairenlong-sfdc bairenlong-sfdc Jun 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use Immutable from google, the rest changes are from IDE reformatting

import com.force.i18n.commons.text.DeferredStringBuilder;
import com.force.i18n.commons.util.collection.IntHashMap;
import com.google.common.base.CharMatcher;
import com.google.common.base.Joiner;
import com.google.common.escape.Escaper;
import com.google.common.escape.Escapers;
import com.google.errorprone.annotations.Immutable;

import jakarta.annotation.Nullable;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using packages from jakarta & google, the rest are from IDE reformatting

@@ -379,6 +382,29 @@
</execution>
</executions>
</plugin>

<!-- temp to fix eclipse compiler error-->
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is for eclipse on local only.

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>gcloud</artifactId>
<version>${testcontainers.version}</version>
<optional>true</optional>
</dependency>
<dependency>
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved to google-test to make test-utils EE9 ready

api/pom.xml Outdated
@@ -9,7 +9,7 @@
<parent>
<groupId>com.salesforce.formula</groupId>
<artifactId>formula-engine</artifactId>
<version>0.3.23-SNAPSHOT</version>
<version>0.9.0-SNAPSHOT</version>
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will starting with version 3.9.0 for EE9

@bairenlong-sfdc bairenlong-sfdc merged commit 21e1073 into main Jun 27, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants