Skip to content

Commit

Permalink
Merge pull request #3025 from ashera96/3.2.x
Browse files Browse the repository at this point in the history 
Prepare for 3.2.5 release
  • Loading branch information
@chashikajw
chashikajw authored Aug 5, 2022
2 parents 2086d5d + 4b93a0e commit 528e4d1
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Let's expose the publicly available [petstore service](https://petstore.swagger.
<summary>Docker</summary>
```bash
micro-gw build petstore --docker-image petstore:v1 --docker-base-image wso2/wso2micro-gw:3.2.4
micro-gw build petstore --docker-image petstore:v1 --docker-base-image wso2/wso2micro-gw:3.2.5
```
</details>
Expand Down
4 changes: 2 additions & 2 deletions components/micro-gateway-cli/src/main/resources/templates/ballerinaToml.mustache
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[project]
org-name= "wso2"
version= "3.2.4"
version= "3.2.5"

[dependencies]
"wso2/gateway" = { path = "{{toolkitHome}}/lib/gateway-balo/gateway-2020r1-java8-3.2.4.balo"}
"wso2/gateway" = { path = "{{toolkitHome}}/lib/gateway-balo/gateway-2020r1-java8-3.2.5.balo"}
{{#each dependencies}}
{{{.}}}
{{/each}}
Expand Down
4 changes: 2 additions & 2 deletions components/micro-gateway-core/src/main/ballerina/Ballerina.toml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[project]
org-name= "wso2"
version= "3.2.4"
version= "3.2.5"

[platform]
target = "java8"

[[platform.libraries]]
path = "../../../target/org.wso2.micro.gateway.core-3.2.4.jar"
path = "../../../target/org.wso2.micro.gateway.core-3.2.5.jar"

[[platform.libraries]]
path = "../../../target/lib/dependencies/org.everit.json.schema-1.5.0.wso2.v1.jar"
Expand Down
2 changes: 1 addition & 1 deletion components/micro-gateway-core/src/main/ballerina/src/gateway/constants/constants.bal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public const string SERVICE_ANN_NAME = "ServiceConfig";
public const string API_ANN_NAME = "API";
public const string FILTER_ANN_NAME = "Filters";
public const string SKIP_FILTERS_ANN_NAME = "SkipFilters";
public const string GATEWAY_ANN_PACKAGE = "wso2/gateway:3.2.4";
public const string GATEWAY_ANN_PACKAGE = "wso2/gateway:3.2.5";

public const string BASIC_PREFIX_WITH_SPACE = "Basic ";
public const string AUTHORIZATION_HEADER = "Authorization";
Expand Down
2 changes: 1 addition & 1 deletion components/micro-gateway-core/src/main/java/org/wso2/micro/gateway/core/Constants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class Constants {
/**
* gateway package version.
*/
public static final String PACKAGE_VERSION = "3.2.4";
public static final String PACKAGE_VERSION = "3.2.5";

public static final String GATEWAY_VERSION = "MGW_VERSION";

Expand Down
2 changes: 1 addition & 1 deletion ...-core/src/main/java/org/wso2/micro/gateway/core/jwt/generator/MGWJWTGeneratorInvoker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public static BMap<String, Object> getRetrievedClaims(BMap<String, Object> authC
if (claimList == null) {
return null;
}
BPackage packageId = new BPackage("wso2", "gateway", "3.2.4");
BPackage packageId = new BPackage("wso2", "gateway", "3.2.5");
BMap<String, Object> bMap = BValueCreator.createRecordValue(packageId, "RetrievedUserClaimsListDTO");
bMap.put("count", claimList.size());
BArray bArray = (BArray) bMap.get("list");
Expand Down
2 changes: 1 addition & 1 deletion distribution/LICENSE-RUNTIME.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ below is and where the actual text of the license can be found.

Name Version License
_________________________________________________________________________________________________________________________________________________
org.wso2.micro.gateway.tools-3.2.4.jar bundle apache2
org.wso2.micro.gateway.tools-3.2.5.jar bundle apache2
jmx_prometheus_javaagent-0.14.0.jar jar apache2


Expand Down
10 changes: 5 additions & 5 deletions distribution/LICENSE-TOOLKIT.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ ballerina-tool-1.2.9.jar
ballerina-config-api-1.2.9.jar jar apache2
ballerina-io-1.2.9.jar jar apache2
asm-tree-7.1.jar bundle bsd
commons-collections-3.2.4.jar bundle apache2
commons-collections-3.2.5.jar bundle apache2
ballerina.lang.error.jar jar apache2
netty-buffer-4.1.50.Final.jar bundle apache2
ballerina.ldap.jar jar apache2
Expand Down Expand Up @@ -275,17 +275,17 @@ json-smart-2.3.jar
asm-1.0.2.jar jarinbundle bsd
guava-27.1-jre.jar bundle apache2
jackson-core-2.10.3.jar bundle apache2
mgw-interceptor-3.2.4.jar jar apache2
mgw-interceptor-3.2.5.jar jar apache2
disruptor-3.4.2.wso2v1.jar bundle apache2
org.wso2.carbon.databridge.commons-6.1.45.jar bundle apache2
org.wso2.carbon.databridge.commons.binary-6.1.45.jar bundle apache2
mgw-jwt-transformer-3.2.4.jar jar apache2
mgw-jwt-generator-3.2.4.jar jar apache2
mgw-jwt-transformer-3.2.5.jar jar apache2
mgw-jwt-generator-3.2.5.jar jar apache2
andes-client-3.3.9.jar bundle apache2
org.wso2.securevault-1.1.1.jar bundle apache2
jcommander-1.72.jar bundle apache2
toml4j-0.7.2.jar jar mit
org.wso2.micro.gateway.cli-3.2.4.jar bundle apache2
org.wso2.micro.gateway.cli-3.2.5.jar bundle apache2
core-1.0.8.jar jar apache2
slf4j-api-1.7.26.jar bundle mit
slf4j-jdk14-1.7.26.jar bundle mit
Expand Down
2 changes: 1 addition & 1 deletion distribution/resources/bin/gateway
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ PRGDIR=`dirname "$PRG"`

# set BALLERINA_HOME
GW_HOME=`cd "$PRGDIR/.." ; pwd`
export MGW_VERSION="3.2.4"
export MGW_VERSION="3.2.5"

JAVA_PATH=$GW_HOME/lib/jdk8u332-b09-jre
if [ -d "$JAVA_HOME" ]; then
Expand Down
2 changes: 1 addition & 1 deletion distribution/resources/version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.4
3.2.5
8 changes: 4 additions & 4 deletions release-notes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@

<head>
<meta content="text/html; charset=iso-8859-1" http-equiv="content-type" />
<title>WSO2 API Microgateway v3.2.4</title>
<title>WSO2 API Microgateway v3.2.5</title>
</head>

<body>
<h1>WSO2 API Microgateway 3.2.4 Released!</h1>
<h2>What's new in 3.2.4</h2>
<h1>WSO2 API Microgateway 3.2.5 Released!</h1>
<h2>What's new in 3.2.5</h2>
<p>This is a maintenance release of API Microgateway 3.2.0. This Release include below improvements and fixes.</p>
<h3>Bug fixes</h3>
<p><a
href="https://github.com/wso2/product-microgateway/issues?q=is%3Aissue+milestone%3A3.2.4+is%3Aclosed">Fixed
href="https://github.com/wso2/product-microgateway/issues?q=is%3Aissue+milestone%3A3.2.5+is%3Aclosed">Fixed
Issues</a></p>
<h2>Known Issues</h2>
<p><a href="https://github.com/wso2/product-microgateway/issues?q=is%3Aopen+is%3Aissue+label%3Aballerina-mgw+">Open
Expand Down
2 changes: 1 addition & 1 deletion samples/sample-jwt-generator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<dependency>
<groupId>org.wso2.am.microgw</groupId>
<artifactId>mgw-jwt-generator</artifactId>
<version>3.2.4</version>
<version>3.2.5</version>
</dependency>
</dependencies>

Expand Down

0 comments on commit 528e4d1

Please sign in to comment.