diff --git a/modules/distribution/product/src/main/assembly/filter.properties b/modules/distribution/product/src/main/assembly/filter.properties index 78da4895fc..526b6f5cbe 100644 --- a/modules/distribution/product/src/main/assembly/filter.properties +++ b/modules/distribution/product/src/main/assembly/filter.properties @@ -3,7 +3,7 @@ product.key=AM product.version=4.4.0 product.wum.name=wso2am -carbon.version=4.9.26 +carbon.version=4.9.27-alpha am.version=4.4.0 default.server.role=APIManager bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator diff --git a/modules/distribution/product/src/main/resources/client-truststore.jks b/modules/distribution/product/src/main/resources/client-truststore.jks index 97518c5669..96642af5e1 100644 Binary files a/modules/distribution/product/src/main/resources/client-truststore.jks and b/modules/distribution/product/src/main/resources/client-truststore.jks differ diff --git a/modules/distribution/product/src/main/startup-scripts/fips.bat b/modules/distribution/product/src/main/startup-scripts/fips.bat index 0087583c90..1b3434b120 100644 --- a/modules/distribution/product/src/main/startup-scripts/fips.bat +++ b/modules/distribution/product/src/main/startup-scripts/fips.bat @@ -16,10 +16,10 @@ rem KIND, either express or implied. See the License for the rem specific language governing permissions and limitations rem under the License. -set BC_FIPS_VERSION=1.0.2.4 +set BC_FIPS_VERSION=1.0.2.5 set BCPKIX_FIPS_VERSION=1.0.7 -set EXPECTED_BC_FIPS_CHECKSUM=9008d04fc13da6455e6a792935b93b629757335d +set EXPECTED_BC_FIPS_CHECKSUM=704e65f7e4fe679e5ab2aa8a840f27f8ced4c522 set EXPECTED_BCPKIX_FIPS_CHECKSUM=fe07959721cfa2156be9722ba20fdfee2b5441b0 diff --git a/modules/distribution/product/src/main/startup-scripts/fips.sh b/modules/distribution/product/src/main/startup-scripts/fips.sh index 60377081f3..e5b00a58a1 100644 --- a/modules/distribution/product/src/main/startup-scripts/fips.sh +++ b/modules/distribution/product/src/main/startup-scripts/fips.sh @@ -14,10 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -BC_FIPS_VERSION=1.0.2.4; +BC_FIPS_VERSION=1.0.2.5; BCPKIX_FIPS_VERSION=1.0.7; -EXPECTED_BC_FIPS_CHECKSUM="9008d04fc13da6455e6a792935b93b629757335d" +EXPECTED_BC_FIPS_CHECKSUM="704e65f7e4fe679e5ab2aa8a840f27f8ced4c522" EXPECTED_BCPKIX_FIPS_CHECKSUM="fe07959721cfa2156be9722ba20fdfee2b5441b0" # Get standard environment variables diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/configFiles/idpjwt/client-truststore.jks b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/configFiles/idpjwt/client-truststore.jks index 407d572e68..f2b21a2fca 100644 Binary files a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/configFiles/idpjwt/client-truststore.jks and b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/AM/configFiles/idpjwt/client-truststore.jks differ diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/client-truststore.jks b/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/client-truststore.jks index 97518c5669..96642af5e1 100644 Binary files a/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/client-truststore.jks and b/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/client-truststore.jks differ diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/wso2carbon.jks b/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/wso2carbon.jks index 7e09a74781..ef48120379 100644 Binary files a/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/wso2carbon.jks and b/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/products/wso2carbon.jks differ diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/stratos/client-truststore.jks b/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/stratos/client-truststore.jks index 97518c5669..96642af5e1 100644 Binary files a/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/stratos/client-truststore.jks and b/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/stratos/client-truststore.jks differ diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/stratos/wso2carbon.jks b/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/stratos/wso2carbon.jks index 7e09a74781..ef48120379 100644 Binary files a/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/stratos/wso2carbon.jks and b/modules/integration/tests-integration/tests-backend/src/test/resources/keystores/stratos/wso2carbon.jks differ diff --git a/modules/integration/tests-integration/tests-benchmark/src/test/resources/keystores/products/client-truststore.jks b/modules/integration/tests-integration/tests-benchmark/src/test/resources/keystores/products/client-truststore.jks index 97518c5669..96642af5e1 100644 Binary files a/modules/integration/tests-integration/tests-benchmark/src/test/resources/keystores/products/client-truststore.jks and b/modules/integration/tests-integration/tests-benchmark/src/test/resources/keystores/products/client-truststore.jks differ diff --git a/modules/integration/tests-integration/tests-benchmark/src/test/resources/keystores/products/wso2carbon.jks b/modules/integration/tests-integration/tests-benchmark/src/test/resources/keystores/products/wso2carbon.jks index 7e09a74781..ef48120379 100644 Binary files a/modules/integration/tests-integration/tests-benchmark/src/test/resources/keystores/products/wso2carbon.jks and b/modules/integration/tests-integration/tests-benchmark/src/test/resources/keystores/products/wso2carbon.jks differ diff --git a/modules/integration/tests-integration/tests-restart/src/test/resources/artifacts/AM/configFiles/idpjwt/client-truststore.jks b/modules/integration/tests-integration/tests-restart/src/test/resources/artifacts/AM/configFiles/idpjwt/client-truststore.jks index 407d572e68..f2b21a2fca 100644 Binary files a/modules/integration/tests-integration/tests-restart/src/test/resources/artifacts/AM/configFiles/idpjwt/client-truststore.jks and b/modules/integration/tests-integration/tests-restart/src/test/resources/artifacts/AM/configFiles/idpjwt/client-truststore.jks differ diff --git a/modules/integration/tests-integration/tests-restart/src/test/resources/keystores/products/client-truststore.jks b/modules/integration/tests-integration/tests-restart/src/test/resources/keystores/products/client-truststore.jks index 97518c5669..96642af5e1 100644 Binary files a/modules/integration/tests-integration/tests-restart/src/test/resources/keystores/products/client-truststore.jks and b/modules/integration/tests-integration/tests-restart/src/test/resources/keystores/products/client-truststore.jks differ diff --git a/modules/integration/tests-integration/tests-restart/src/test/resources/keystores/products/wso2carbon.jks b/modules/integration/tests-integration/tests-restart/src/test/resources/keystores/products/wso2carbon.jks index 7e09a74781..ef48120379 100644 Binary files a/modules/integration/tests-integration/tests-restart/src/test/resources/keystores/products/wso2carbon.jks and b/modules/integration/tests-integration/tests-restart/src/test/resources/keystores/products/wso2carbon.jks differ diff --git a/modules/integration/tests-integration/tests-restart/src/test/resources/keystores/stratos/client-truststore.jks b/modules/integration/tests-integration/tests-restart/src/test/resources/keystores/stratos/client-truststore.jks index 97518c5669..96642af5e1 100644 Binary files a/modules/integration/tests-integration/tests-restart/src/test/resources/keystores/stratos/client-truststore.jks and b/modules/integration/tests-integration/tests-restart/src/test/resources/keystores/stratos/client-truststore.jks differ diff --git a/modules/integration/tests-integration/tests-restart/src/test/resources/keystores/stratos/wso2carbon.jks b/modules/integration/tests-integration/tests-restart/src/test/resources/keystores/stratos/wso2carbon.jks index 7e09a74781..ef48120379 100644 Binary files a/modules/integration/tests-integration/tests-restart/src/test/resources/keystores/stratos/wso2carbon.jks and b/modules/integration/tests-integration/tests-restart/src/test/resources/keystores/stratos/wso2carbon.jks differ diff --git a/modules/p2-profile/product/carbon.product b/modules/p2-profile/product/carbon.product index 4fd6ada531..1d225fbfd0 100644 --- a/modules/p2-profile/product/carbon.product +++ b/modules/p2-profile/product/carbon.product @@ -2,7 +2,7 @@ +version="4.9.27.alpha" useFeatures="true" includeLaunchers="true"> @@ -14,7 +14,7 @@ version="4.9.26" useFeatures="true" includeLaunchers="true"> - + diff --git a/pom.xml b/pom.xml index 74c4cbc69b..b35ac43812 100644 --- a/pom.xml +++ b/pom.xml @@ -1288,7 +1288,7 @@ - 9.29.204 + 9.30.0 [9.0.0, 10.0.0) @@ -1301,7 +1301,7 @@ 4.8.34 - 4.9.26 + 4.9.27-alpha 4.4.0-SNAPSHOT 1.1.26 @@ -1310,7 +1310,7 @@ [4.5.0, 5.0.0) - 4.7.218 + 4.7.219 5.25.713 @@ -1340,7 +1340,7 @@ 4.11.16 - 4.9.27 + 4.9.28 3.2.13 @@ -1354,7 +1354,7 @@ 1.8 3.0-FINAL 1.0.0.M8-wso2v1 - 4.0.0-wso2v125 + 4.0.0-wso2v128 1.0.2 1.6.1-wso2v99 1.2.11-wso2v29 diff --git a/sample-scenarios/sample-utils/src/main/resources/client-truststore.jks b/sample-scenarios/sample-utils/src/main/resources/client-truststore.jks index 97518c5669..96642af5e1 100644 Binary files a/sample-scenarios/sample-utils/src/main/resources/client-truststore.jks and b/sample-scenarios/sample-utils/src/main/resources/client-truststore.jks differ diff --git a/sample-scenarios/src/main/resources/client-truststore.jks b/sample-scenarios/src/main/resources/client-truststore.jks index 97518c5669..96642af5e1 100644 Binary files a/sample-scenarios/src/main/resources/client-truststore.jks and b/sample-scenarios/src/main/resources/client-truststore.jks differ