Skip to content

Commit

Permalink
Merge branch 'wso2:master' into add-error-codes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Thisara-Welmilla
Thisara-Welmilla authored Jan 2, 2025
2 parents ff04e0b + 5e31a52 commit 1b01cbe
Show file tree
Hide file tree
Showing 33 changed files with 43 additions and 52 deletions.
4 changes: 2 additions & 2 deletions modules/api-resources/api-resources-full/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>api-resources</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>api-resources-full</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<packaging>war</packaging>

<name>WSO2 Identity Server - All Rest API</name>
Expand Down
4 changes: 2 additions & 2 deletions modules/api-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>api-resources</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<packaging>pom</packaging>

<name>WSO2 Identity Server - Rest API</name>
Expand Down
2 changes: 1 addition & 1 deletion modules/authenticators/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/connectors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
3 changes: 0 additions & 3 deletions modules/distribution/src/repository/resources/conf/deployment.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ hash= "66cd9688a2ae068244ea01e70f0e230f5623b7fa4cdecb65070a09ec06452262"
[identity.auth_framework.endpoint]
app_password= "dashboard"

[notification_templates]
enable_unicode_support = true

# The KeyStore which is used for encrypting/decrypting internal data. By default the primary keystore is used as the internal keystore.

#[keystore.internal]
Expand Down
2 changes: 1 addition & 1 deletion modules/features/org.wso2.identity.styles.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-features</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/features/org.wso2.identity.ui.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-features</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/features/org.wso2.identity.utils.feature/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-features</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/features/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration-ui-templates/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/admin-clients/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/integration-test-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/jacoco-report-generator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/ui-pages/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-integration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-integration/tests-backend/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
3 changes: 0 additions & 3 deletions ...sts-integration/tests-backend/src/test/resources/artifacts/IS/email/email_otp_config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,3 @@ federatedEmailAttributeKey = "email"
EmailOTPEnableByUserClaim = true
CaptureAndUpdateEmailAddress = true
showEmailAddressInUI = true

[notification_templates]
enable_unicode_support = true
3 changes: 0 additions & 3 deletions .../tests-backend/src/test/resources/artifacts/IS/user/enable_email_username_deployment.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,3 @@ enable_email_domain = true

[identity_mgt.events.schemes.liteUserRegistration.properties]
enable = true

[notification_templates]
enable_unicode_support = true
2 changes: 1 addition & 1 deletion modules/local-authenticators/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/oauth2-grant-types/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions modules/p2-profile-gen/carbon.product
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?pde version="3.5"?>

<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application"
version="4.10.29" useFeatures="true" includeLaunchers="true">
version="4.10.30" useFeatures="true" includeLaunchers="true">

<configIni use="default">
</configIni>
Expand All @@ -14,7 +14,7 @@ version="4.10.29" useFeatures="true" includeLaunchers="true">
</plugins>

<features>
<feature id="org.wso2.carbon.core.runtime" version="4.10.29"/>
<feature id="org.wso2.carbon.core.runtime" version="4.10.30"/>
</features>

<configurations>
Expand Down
2 changes: 1 addition & 1 deletion modules/p2-profile-gen/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/provisioning-connectors/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/social-authenticators/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/styles/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/styles/product/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-styles-parent</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/tests-utils/admin-services/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests-utils</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/tests-utils/admin-stubs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-integration-tests-utils</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/tests-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>identity-server-parent</artifactId>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
22 changes: 11 additions & 11 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<artifactId>identity-server-parent</artifactId>
<packaging>pom</packaging>
<description>WSO2 Identity Server</description>
<version>7.1.0-m6-SNAPSHOT</version>
<version>7.1.0-m7-SNAPSHOT</version>
<name>WSO2 Identity Server</name>
<url>http://wso2.org/projects/identity</url>

Expand Down Expand Up @@ -2356,7 +2356,7 @@
<properties>

<!--Carbon Identity Framework Version-->
<carbon.identity.framework.version>7.7.50</carbon.identity.framework.version>
<carbon.identity.framework.version>7.7.60</carbon.identity.framework.version>
<carbon.identity.framework.version.range>[5.14.67, 8.0.0)</carbon.identity.framework.version.range>

<!--SAML Common Utils Version-->
Expand All @@ -2377,7 +2377,7 @@


<!-- Identity Inbound Versions -->
<identity.inbound.auth.oauth.version>7.0.202</identity.inbound.auth.oauth.version>
<identity.inbound.auth.oauth.version>7.0.204</identity.inbound.auth.oauth.version>
<identity.inbound.auth.saml.version>5.11.48</identity.inbound.auth.saml.version>
<identity.inbound.auth.openid.version>5.10.2</identity.inbound.auth.openid.version>
<identity.inbound.auth.sts.version>5.11.14</identity.inbound.auth.sts.version>
Expand All @@ -2392,13 +2392,13 @@
<identity.userstore.remote.version>5.2.5</identity.userstore.remote.version>

<!-- Identity Data Publisher Versions -->
<identity.data.publisher.authentication.version>5.7.5</identity.data.publisher.authentication.version>
<identity.data.publisher.authentication.version>5.7.6</identity.data.publisher.authentication.version>
<identity.data.publisher.oauth.version>1.7.4</identity.data.publisher.oauth.version>
<identity.data.publisher.audit.version>1.4.6</identity.data.publisher.audit.version>

<!-- Identity Event Handler Versions -->
<identity.event.handler.account.lock.version>1.9.13</identity.event.handler.account.lock.version>
<identity.event.handler.notification.version>1.9.31</identity.event.handler.notification.version>
<identity.event.handler.notification.version>1.9.32</identity.event.handler.notification.version>

<!--<identity.agent.entitlement.proxy.version>5.1.1</identity.agent.entitlement.proxy.version>-->
<!--<identity.carbon.auth.signedjwt.version>5.1.1</identity.carbon.auth.signedjwt.version>-->
Expand All @@ -2409,7 +2409,7 @@
<identity.outbound.auth.oidc.version>5.12.14</identity.outbound.auth.oidc.version>
<identity.outbound.auth.oauth2.version>1.0.12</identity.outbound.auth.oauth2.version>
<identity.outbound.auth.passive.sts.version>5.5.1</identity.outbound.auth.passive.sts.version>
<identity.outbound.auth.samlsso.version>5.9.5</identity.outbound.auth.samlsso.version>
<identity.outbound.auth.samlsso.version>5.9.6</identity.outbound.auth.samlsso.version>
<identity.outbound.auth.requestpath.basicauth.version>5.5.5</identity.outbound.auth.requestpath.basicauth.version>
<identity.outbound.auth.requestpath.oauth.version>5.5.6</identity.outbound.auth.requestpath.oauth.version>

Expand Down Expand Up @@ -2469,7 +2469,7 @@
<!-- Identity REST API feature -->
<identity.api.dispatcher.version>2.0.17</identity.api.dispatcher.version>
<identity.server.api.version>1.3.15</identity.server.api.version>
<identity.user.api.version>1.3.46</identity.user.api.version>
<identity.user.api.version>1.3.47</identity.user.api.version>

<identity.agent.sso.version>5.5.9</identity.agent.sso.version>
<identity.tool.samlsso.validator.version>5.5.10</identity.tool.samlsso.validator.version>
Expand All @@ -2478,16 +2478,16 @@
<conditional.authentication.functions.version>1.2.70</conditional.authentication.functions.version>

<!-- Identity Portal Versions -->
<identity.apps.console.version>2.35.33</identity.apps.console.version>
<identity.apps.myaccount.version>2.13.38</identity.apps.myaccount.version>
<identity.apps.core.version>2.8.7</identity.apps.core.version>
<identity.apps.console.version>2.36.0</identity.apps.console.version>
<identity.apps.myaccount.version>2.13.41</identity.apps.myaccount.version>
<identity.apps.core.version>2.8.8</identity.apps.core.version>
<identity.apps.tests.version>1.6.378</identity.apps.tests.version>

<!-- Charon -->
<charon.version>3.4.1</charon.version>

<!-- Carbon Kernel -->
<carbon.kernel.version>4.10.29</carbon.kernel.version>
<carbon.kernel.version>4.10.30</carbon.kernel.version>

<!-- Identity Verification -->
<identity.verification.version>1.0.15</identity.verification.version>
Expand Down

0 comments on commit 1b01cbe

Please sign in to comment.