Skip to content

Commit

Permalink
Merge pull request #3294 from madawas/master
Browse files Browse the repository at this point in the history 
Prepare for release: Update branch for release
  • Loading branch information
@madawas
madawas authored Jun 12, 2018
2 parents 6a6703a + 90a1143 commit 693e39e
Show file tree
Hide file tree
Showing 56 changed files with 74 additions and 73 deletions.
13 changes: 7 additions & 6 deletions LICENSE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ com.google.guava_19.0.0.jar
commons-beanutils-1.7.0.jar jarinbundle apache2
commons-cli-1.3.1.jar jar apache2
commons-cli_1.2.0.wso2v1.jar bundle apache2
commons-codec-1.4.jar jar apache2
commons-collections-3.2.2.jar jar apache2
commons-collections-3.2.2.wso2v1.jar bundle apache2
commons-collections_3.2.2.wso2v1.jar bundle apache2
Expand All @@ -97,11 +98,11 @@ compass_2.0.1.wso2v2.jar
cors-filter_1.7.0.wso2v1.jar bundle apache2
csrfguard_3.1.0.wso2v3.jar bundle bsd
cxf-bundle-2.7.16.wso2v1.jar bundle apache2
cxf-xjc-boolean-3.2.0.jar jar apache2
cxf-xjc-bug671-3.2.0.jar jar apache2
cxf-xjc-dv-3.2.0.jar jar apache2
cxf-xjc-runtime-3.2.0.jar jar apache2
cxf-xjc-ts-3.2.0.jar jar apache2
cxf-xjc-boolean-3.2.1.jar jar apache2
cxf-xjc-bug671-3.2.1.jar jar apache2
cxf-xjc-dv-3.2.1.jar jar apache2
cxf-xjc-runtime-3.2.1.jar jar apache2
cxf-xjc-ts-3.2.1.jar jar apache2
disruptor_3.3.2.wso2v2.jar bundle apache2
ehcache-core-2.5.1.jar jar apache2
ehcache_1.5.0.wso2v3.jar bundle apache2
Expand Down Expand Up @@ -155,7 +156,7 @@ jackson-core-2.9.4.jar
jackson-databind-2.9.4.jar jarinbundle apache2
java-property-utils_1.9.0.wso2v1.jar bundle apache2
javasysmon_0.3.3.wso2v1.jar bundle bsd
javax.cache.wso2_4.4.31.jar jar apache2
javax.cache.wso2_4.4.32.jar jar apache2
javax.ws.rs-api-2.0-m10.jar jar cddl+gpl
jaxb-api-2.2.12.jar jar cddl1
jaxb-impl-2.2.2.jar jar cddl+gpl
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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/integration/tests-common/extensions/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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/migration/migration-service/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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-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.4.31" useFeatures="true" includeLaunchers="true">
version="4.4.32" useFeatures="true" includeLaunchers="true">

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

<features>
<feature id="org.wso2.carbon.core.runtime" version="4.4.31"/>
<feature id="org.wso2.carbon.core.runtime" version="4.4.32"/>
</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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion ...authenticators/components/org.wso2.carbon.identity.sample.extension.auth.endpoint/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>wso2is-identity-samples-authenticators</artifactId>
<version>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion ...uthenticators/components/org.wso2.carbon.identity.sample.extension.authenticators/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>wso2is-identity-samples-authenticators</artifactId>
<version>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/samples/authenticators/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>wso2is-identity-samples</artifactId>
<version>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/samples/identity-mgt/info-recovery-sample/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>wso2is-identity-samples-info-recovery</artifactId>
<version>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/samples/identity-mgt/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>wso2is-identity-samples</artifactId>
<version>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/samples/microprofile/microprofile-jwt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>wso2is-identity-samples-microprofile</artifactId>
<version>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/samples/microprofile/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>wso2is-identity-samples</artifactId>
<version>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion modules/samples/oauth/oauth10a-resource-owner-equivalent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>wso2is-identity-samples-oauth10a</artifactId>
<version>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion modules/samples/oauth/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>wso2is-identity-samples</artifactId>
<version>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/samples/oauth2/custom-grant/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>wso2is-identity-samples-oauth2</artifactId>
<version>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/samples/oauth2/playground2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>wso2is-identity-samples-oauth2</artifactId>
<version>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/samples/oauth2/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>wso2is-identity-samples</artifactId>
<version>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/samples/passive-sts/passive-sts-client/PassiveSTSFilter/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>PassiveSTSSample</artifactId>
<version>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/samples/passive-sts/passive-sts-client/PassiveSTSSampleApp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>PassiveSTSSample</artifactId>
<version>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/samples/passive-sts/passive-sts-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.wso2.is</groupId>
<artifactId>wso2is-identity-samples-passivests</artifactId>
<version>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/samples/passive-sts/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>wso2is-identity-samples</artifactId>
<version>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/samples/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>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/samples/scim/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>wso2is-identity-samples</artifactId>
<version>5.7.0-m1-SNAPSHOT</version>
<version>5.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Loading

0 comments on commit 693e39e

Please sign in to comment.