ruwin
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1764 from geethkokila/330-release

Browse Source 
Update component versions
application-manager-new
Charitha Goonetilleke 7 years ago committed by GitHub
parent d8363a5378 f1153c9194
commit 658665cfeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 356 additions and 61 deletions
Show Stats Download Patch File Download Diff File

62
modules/cxf-filters/pom.xml
Unescape View File

@ -0,0 +1,62 @@
<!--
~ Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-parent</artifactId>
<version>3.2.0-update1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2is-cxf-filters</artifactId>
<packaging>pom</packaging>
<name>Identity Server : cxf filters</name>
<build>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<!-- Download JWT Bearer Grant jar from nexus and copy to the oauth2GrantCopied folder-->
<execution>
<id>download_oauth_client_authenticaion_proxy_jar</id>
<phase>compile</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.wso2.carbon.identity.inbound.auth.oauth2</groupId>
<artifactId>org.wso2.carbon.identity.oauth.client.authn.filter</artifactId>
<version>${identity.inbound.auth.oauth.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${basedir}/target/cxfFilters/jar
</outputDirectory>
<includes>**/*.jar</includes>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

46
modules/distribution/pom.xml
Unescape View File

@ -148,6 +148,26 @@
</replacements> </replacements>
</configuration> </configuration>
</execution> </execution>
<!-- Replace Consent Mgt Datasource Confgs -->
<execution>
<id>replace-for-consent</id>
<phase>package</phase>
<goals>
<goal>replace</goal>
</goals>
<configuration>
<file>${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/consent-mgt-config.xml</file>
<replacements>
<replacement>
<xpath>/ConsentManager/DataSource/Name</xpath>
<token>(jdbc/WSO2CarbonDB)</token>
<value>jdbc/WSO2AM_DB</value>
</replacement>
</replacements>
</configuration>
</execution>
<!-- Replace Datasource, Scope mpl classes and OAuth callback class in identity.xml --> <!-- Replace Datasource, Scope mpl classes and OAuth callback class in identity.xml -->
<!-- Replace the Datasource in the thrift-authentication.xml file --> <!-- Replace the Datasource in the thrift-authentication.xml file -->
@ -450,7 +470,33 @@
</tasks> </tasks>
</configuration> </configuration>
</execution> </execution>
<execution>
<!-- Creating API Management schema -->
<id>create-user-consent-schema</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<echo message="########### Create User Consent H2 Schema ###########" />
<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
<property name="userid" value="wso2carbon" />
<property name="password" value="wso2carbon" />
<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2AM_DB;DB_CLOSE_ON_EXIT=FALSE" />
<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
<classpath refid="maven.dependency.classpath" />
<classpath refid="maven.compile.classpath" />
<classpath refid="maven.runtime.classpath" />
<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/consent/h2.sql" />
</sql>
<echo message="##################### END ####################" />
</tasks>
</configuration>
</execution>
<execution> <execution>
<!-- Creating App Management schema --> <!-- Creating App Management schema -->
<id>create-app-mgt-schema</id> <id>create-app-mgt-schema</id>

25
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -386,6 +386,12 @@
<fileMode>644</fileMode> <fileMode>644</fileMode>
</fileSet> </fileSet>
<!--copy the cxf filters to cxf-runtime-->
<fileSet>
<directory>../cxf-filters/target/cxfFilters/jar</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/lib/runtimes/cxf</outputDirectory>
</fileSet>
<!-- Copying APP Manager Publisher and Store Jaggery apps --> <!-- Copying APP Manager Publisher and Store Jaggery apps -->
<fileSet> <fileSet>
<directory> <directory>
@ -1291,6 +1297,11 @@
<fileMode>644</fileMode> <fileMode>644</fileMode>
</file> </file>
<file>
<source>../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/security/balana-config.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/conf/security/</outputDirectory>
</file>
<file> <file>
<source>src/core/LICENSE.txt</source> <source>src/core/LICENSE.txt</source>
<outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
@ -1549,13 +1560,13 @@
<fileMode>755</fileMode> <fileMode>755</fileMode>
</file> </file>
<file> <!--<file>-->
<source>target/webapp-temp/client-registration#v0.11.war</source> <!--<source>target/webapp-temp/client-registration#v0.11.war</source>-->
<outputDirectory> <!--<outputDirectory>-->
${pom.artifactId}-${pom.version}/repository/deployment/server/webapps <!--${pom.artifactId}-${pom.version}/repository/deployment/server/webapps-->
</outputDirectory> <!--</outputDirectory>-->
<fileMode>755</fileMode> <!--<fileMode>755</fileMode>-->
</file> <!--</file>-->
<file> <file>
<source>target/webapp-temp/api#identity#entitlement.war</source> <source>target/webapp-temp/api#identity#entitlement.war</source>
<outputDirectory> <outputDirectory>

4
modules/p2-profile/analytics-profile/carbon.product
Unescape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?> <?pde version="3.5"?>
<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.17" useFeatures="true" includeLaunchers="true"> <product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.25" useFeatures="true" includeLaunchers="true">
<configIni use="default"> <configIni use="default">
</configIni> </configIni>
@ -13,7 +13,7 @@
</plugins> </plugins>
<features> <features>
<feature id="org.wso2.carbon.core.runtime" version="4.4.17"/> <feature id="org.wso2.carbon.core.runtime" version="4.4.25"/>
</features> </features>
<configurations> <configurations>

25
modules/p2-profile/analytics-profile/pom.xml
Unescape View File

@ -185,6 +185,7 @@
</featureArtifactDef> </featureArtifactDef>
<!-- ************** END - User Management ********* --> <!-- ************** END - User Management ********* -->
<!-- ************** START - Deployment Synchronizer ********* --> <!-- ************** START - Deployment Synchronizer ********* -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version} org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version}
@ -276,6 +277,9 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.data:org.wso2.carbon.datasource.reader.cassandra.server.feature:${carbon.data.version} org.wso2.carbon.data:org.wso2.carbon.datasource.reader.cassandra.server.feature:${carbon.data.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.data:org.wso2.carbon.datasource.reader.mongo.server.feature:${carbon.data.version}
</featureArtifactDef>
<!-- END - Data source related --> <!-- END - Data source related -->
<!-- ************** START - EVENT PROCESSING FEATURES *********** --> <!-- ************** START - EVENT PROCESSING FEATURES *********** -->
@ -294,6 +298,9 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.event-processing:org.wso2.carbon.event.flow.feature:${carbon.event-processing.version} org.wso2.carbon.event-processing:org.wso2.carbon.event.flow.feature:${carbon.event-processing.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.event-processing:org.wso2.carbon.event.processor.server.feature:${carbon.event-processing.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.event.statistics.feature:${carbon.analytics.common.version} org.wso2.carbon.analytics-common:org.wso2.carbon.event.statistics.feature:${carbon.analytics.common.version}
</featureArtifactDef> </featureArtifactDef>
@ -588,6 +595,17 @@
</feature> </feature>
<!-- ************** END - User Management ********* --> <!-- ************** END - User Management ********* -->
<!--Identity governance-->
<!--<feature>-->
<!--<id>org.wso2.carbon.identity.governance.server.feature.group</id>-->
<!--<version>${carbon.identity.governance.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.identity.captcha.server.feature.group</id>-->
<!--<version>${carbon.identity.governance.version}</version>-->
<!--</feature>-->
<!--Identity governance ends-->
<!-- ************** START - Deployment Synchronizer ********* --> <!-- ************** START - Deployment Synchronizer ********* -->
<feature> <feature>
<id>org.wso2.carbon.deployment.synchronizer.feature.group</id> <id>org.wso2.carbon.deployment.synchronizer.feature.group</id>
@ -699,6 +717,13 @@
<id>org.wso2.carbon.datasource.reader.cassandra.server.feature.group</id> <id>org.wso2.carbon.datasource.reader.cassandra.server.feature.group</id>
<version>${carbon.data.version}</version> <version>${carbon.data.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.datasource.reader.mongo.server.feature.group</id>
<version>${carbon.data.version}</version>
</feature>
<!-- END - Data source related --> <!-- END - Data source related -->
<!-- ************** START - EVENT PROCESSING FEATURES ************ --> <!-- ************** START - EVENT PROCESSING FEATURES ************ -->

4
modules/p2-profile/broker-profile/carbon.product
Unescape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?> <?pde version="3.5"?>
<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.17" useFeatures="true" includeLaunchers="true"> <product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.25" useFeatures="true" includeLaunchers="true">
<configIni use="default"> <configIni use="default">
</configIni> </configIni>
@ -13,7 +13,7 @@
</plugins> </plugins>
<features> <features>
<feature id="org.wso2.carbon.core.runtime" version="4.4.17"/> <feature id="org.wso2.carbon.core.runtime" version="4.4.25"/>
</features> </features>
<configurations> <configurations>

4
modules/p2-profile/iot-core-profile/carbon.product
Unescape View File

@ -2,7 +2,7 @@
<?pde version="3.5"?> <?pde version="3.5"?>
<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" <product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application"
version="4.4.17" useFeatures="true" includeLaunchers="true"> version="4.4.25" useFeatures="true" includeLaunchers="true">
<configIni use="default"> <configIni use="default">
</configIni> </configIni>
@ -14,7 +14,7 @@ version="4.4.17" useFeatures="true" includeLaunchers="true">
</plugins> </plugins>
<features> <features>
<feature id="org.wso2.carbon.core.runtime" version="4.4.17"/> <feature id="org.wso2.carbon.core.runtime" version="4.4.25"/>
</features> </features>
<configurations> <configurations>

162
modules/p2-profile/iot-core-profile/pom.xml
Unescape View File

@ -99,6 +99,15 @@
<publishArtifactRepository>true</publishArtifactRepository> <publishArtifactRepository>true</publishArtifactRepository>
<featureArtifacts> <featureArtifacts>
<featureArtifactDef>
org.wso2.carbon.identity.governance:org.wso2.carbon.identity.captcha.server.feature:${identity.governance.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.identity.governance:org.wso2.carbon.identity.governance.feature:${identity.governance.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.identity.event.handler.accountlock:org.wso2.carbon.identity.handler.event.account.lock.feature:${identity.event.handler.account.lock.version}
</featureArtifactDef>
<!-- Device Management Features --> <!-- Device Management Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.feature:${carbon.device.mgt.version}
@ -244,6 +253,10 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.apimgt:org.wso2.carbon.forum.server.feature:${carbon.api.mgt.version} org.wso2.carbon.apimgt:org.wso2.carbon.forum.server.feature:${carbon.api.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.publisher.feature:${carbon.api.mgt.version}
</featureArtifactDef>
<!-- End of API Management Features --> <!-- End of API Management Features -->
<!-- Carbon Commons Features --> <!-- Carbon Commons Features -->
@ -292,8 +305,13 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity.inbound.auth.oauth2:org.wso2.carbon.identity.oauth.feature:${identity.inbound.auth.oauth.version} org.wso2.carbon.identity.inbound.auth.oauth2:org.wso2.carbon.identity.oauth.feature:${identity.inbound.auth.oauth.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.provider.server.feature:${identity.inbound.auth.openid.version} org.wso2.carbon.identity.framework:org.wso2.carbon.identity.event.server.feature:${carbon.identity.framework.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.identity.inbound.auth.openid:org.wso2.carbon.identity.provider.server.feature:${identity.inbound.auth.openid.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity.framework:org.wso2.carbon.identity.thrift.authentication.feature:${carbon.identity.framework.version} org.wso2.carbon.identity.framework:org.wso2.carbon.identity.thrift.authentication.feature:${carbon.identity.framework.version}
@ -353,10 +371,10 @@
</featureArtifactDef> </featureArtifactDef>
<!-- Authenticators --> <!-- Authenticators -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature:${identity.outbound.auth.requestpath.basicauth.version} org.wso2.carbon.identity.local.auth.requestpath.basic:org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature:${identity.outbound.auth.requestpath.basicauth.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature:${identity.outbound.auth.requestpath.oauth.version} org.wso2.carbon.identity.local.auth.requestpath.oauth:org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature:${identity.outbound.auth.requestpath.oauth.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity.application.auth.basic:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:${identity.local.auth.basicauth.version} org.wso2.carbon.identity.application.auth.basic:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:${identity.local.auth.basicauth.version}
@ -377,7 +395,15 @@
org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.sp.metadata.saml2.server.feature:${identity.metadata.saml2.version} org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.sp.metadata.saml2.server.feature:${identity.metadata.saml2.version}
</featureArtifactDef> </featureArtifactDef>
<!--<featureArtifactDef>--> <!--<featureArtifactDef>-->
<!--org.wso2.carbon.identity.framework:org.wso2.carbon.identity.base:${carbon.identity.framework.version}--> <!--org.wso2.carbon.identity.framework:org.wso2.carbon.identity.mgt.server.feature:${carbon.identity.framework.version}-->
<!--</featureArtifactDef>-->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.identity.governance:org.wso2.carbon.identity.governance.server.feature:${carbon.identity.governance.version}-->
<!--</featureArtifactDef>-->
<!--<featureArtifactDef>-->
<!--org.wso2.carbon.identity.governance:org.wso2.carbon.identity.captcha.server.feature:${carbon.identity.governance.version}-->
<!--</featureArtifactDef>--> <!--</featureArtifactDef>-->
<!-- End of Identity Features --> <!-- End of Identity Features -->
@ -735,7 +761,17 @@
</featureArtifactDef> </featureArtifactDef>
<!--JWT grant type handler--> <!--JWT grant type handler-->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity:org.wso2.carbon.identity.oauth2.grant.jwt.feature:${identity.jwt.extension.version} org.wso2.carbon.extension.identity.oauth2.grantType.jwt:org.wso2.carbon.extension.identity.oauth2.jwt.feature:${identity.jwt.extension.version}
</featureArtifactDef>
<!--Consent management feature-->
<featureArtifactDef>
org.wso2.carbon.consent.mgt:org.wso2.carbon.consent.mgt.server.feature:${carbon.consent.mgt.version}
</featureArtifactDef>
<!--Database utils feature-->
<featureArtifactDef>
org.wso2.carbon.utils:org.wso2.carbon.database.utils.feature:${org.wso2.carbon.database.utils.version}
</featureArtifactDef> </featureArtifactDef>
<!--Geo Dashboard feature--> <!--Geo Dashboard feature-->
<featureArtifactDef> <featureArtifactDef>
@ -851,7 +887,20 @@
</destination> </destination>
<deleteOldProfileFiles>true</deleteOldProfileFiles> <deleteOldProfileFiles>true</deleteOldProfileFiles>
<features> <features>
<feature>
<id>org.wso2.carbon.identity.captcha.server.feature.group</id>
<version>${identity.governance.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.governance.feature.group</id>
<version>${identity.governance.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.identity.handler.event.account.lock.feature.group</id>
<version>${identity.event.handler.account.lock.version}</version>
</feature>
<!-- IoTServer Features --> <!-- IoTServer Features -->
<feature> <feature>
<id>org.wso2.carbon.identity.inbound.metadata.saml2.server.feature.group</id> <id>org.wso2.carbon.identity.inbound.metadata.saml2.server.feature.group</id>
<version>0.1.1</version> <version>0.1.1</version>
@ -1137,6 +1186,12 @@
<id>org.wso2.carbon.forum.server.feature.group</id> <id>org.wso2.carbon.forum.server.feature.group</id>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.publisher.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<!-- End of API Management Features --> <!-- End of API Management Features -->
<!-- Carbon Analytics Common Features --> <!-- Carbon Analytics Common Features -->
@ -1230,6 +1285,12 @@
<id>org.wso2.carbon.user.mgt.feature.group</id> <id>org.wso2.carbon.user.mgt.feature.group</id>
<version>${carbon.identity.framework.version}</version> <version>${carbon.identity.framework.version}</version>
</feature> </feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.identity.mgt.server.feature.group</id>-->
<!--<version>${carbon.identity.framework.version}</version>-->
<!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.directory.service.mgr.server.feature.group <id>org.wso2.carbon.directory.service.mgr.server.feature.group
</id> </id>
@ -1310,6 +1371,17 @@
</feature> </feature>
<!-- End of Identity Features --> <!-- End of Identity Features -->
<!--Identity governance-->
<!--<feature>-->
<!--<id>org.wso2.carbon.identity.governance.server.feature.group</id>-->
<!--<version>${carbon.identity.governance.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.identity.captcha.server.feature.group</id>-->
<!--<version>${carbon.identity.governance.version}</version>-->
<!--</feature>-->
<!--Identity governance ends-->
<!-- Registry Features --> <!-- Registry Features -->
<feature> <feature>
<id>org.wso2.carbon.registry.core.feature.group</id> <id>org.wso2.carbon.registry.core.feature.group</id>
@ -1492,8 +1564,25 @@
<id>org.wso2.carbon.identity.oauth.feature.group</id> <id>org.wso2.carbon.identity.oauth.feature.group</id>
<version>${identity.inbound.auth.oauth.version}</version> <version>${identity.inbound.auth.oauth.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.identity.event.server.feature.group</id>
<version>${carbon.identity.framework.version}</version>
</feature>
<!-- End of Identity Features --> <!-- End of Identity Features -->
<!--Identity governance-->
<!--<feature>-->
<!--<id>org.wso2.carbon.identity.governance.server.feature.group</id>-->
<!--<version>${carbon.identity.governance.version}</version>-->
<!--</feature>-->
<!--<feature>-->
<!--<id>org.wso2.carbon.identity.captcha.server.feature.group</id>-->
<!--<version>${carbon.identity.governance.version}</version>-->
<!--</feature>-->
<!--Identity governance ends-->
<!-- Registry Features --> <!-- Registry Features -->
<feature> <feature>
<id>org.wso2.carbon.registry.community.features.server.feature.group</id> <id>org.wso2.carbon.registry.community.features.server.feature.group</id>
@ -1607,9 +1696,21 @@
</feature> </feature>
<!--jwt grant type handler--> <!--jwt grant type handler-->
<feature> <feature>
<id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id> <id>org.wso2.carbon.extension.identity.oauth2.jwt.feature.group</id>
<version>${identity.jwt.extension.version}</version> <version>${identity.jwt.extension.version}</version>
</feature> </feature>
<!--Consent Management Feature-->
<feature>
<id>org.wso2.carbon.consent.mgt.server.feature.group</id>
<version>${carbon.consent.mgt.version}</version>
</feature>
<!--Database utils feature-->
<feature>
<id>org.wso2.carbon.database.utils.feature.group</id>
<version>${org.wso2.carbon.database.utils.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id> <id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
@ -1679,9 +1780,18 @@
<version>${carbon.identity.framework.version}</version> <version>${carbon.identity.framework.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id> <id>org.wso2.carbon.extension.identity.oauth2.jwt.feature.group</id>
<version>${identity.jwt.extension.version}</version> <version>${identity.jwt.extension.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.consent.mgt.server.feature.group</id>
<version>${carbon.consent.mgt.version}</version>
</feature>
<!--Database utils feature-->
<feature>
<id>org.wso2.carbon.database.utils.feature.group</id>
<version>${org.wso2.carbon.database.utils.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.tenant.common.feature.group</id> <id>org.wso2.carbon.tenant.common.feature.group</id>
<version>${carbon.multitenancy.version}</version> <version>${carbon.multitenancy.version}</version>
@ -1767,6 +1877,10 @@
<id>org.wso2.carbon.identity.oauth.feature.group</id> <id>org.wso2.carbon.identity.oauth.feature.group</id>
<version>${identity.inbound.auth.oauth.version}</version> <version>${identity.inbound.auth.oauth.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.identity.event.server.feature.group</id>
<version>${carbon.identity.framework.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.identity.user.registration.server.feature.group</id> <id>org.wso2.carbon.identity.user.registration.server.feature.group</id>
<version>${carbon.identity.framework.version}</version> <version>${carbon.identity.framework.version}</version>
@ -1780,6 +1894,10 @@
<id>org.wso2.carbon.user.mgt.feature.group</id> <id>org.wso2.carbon.user.mgt.feature.group</id>
<version>${carbon.identity.framework.version}</version> <version>${carbon.identity.framework.version}</version>
</feature> </feature>
<!--<feature>-->
<!--<id>org.wso2.carbon.identity.mgt.server.feature.group</id>-->
<!--<version>${carbon.identity.framework.version}</version>-->
<!--</feature>-->
<feature> <feature>
<id>org.wso2.carbon.identity.core.feature.group</id> <id>org.wso2.carbon.identity.core.feature.group</id>
<version>${carbon.identity.framework.version}</version> <version>${carbon.identity.framework.version}</version>
@ -1844,6 +1962,10 @@
<id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id> <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.consent.mgt.server.feature.group</id>
<version>${carbon.consent.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.identity.sso.saml.feature.group</id> <id>org.wso2.carbon.identity.sso.saml.feature.group</id>
<version>${identity.inbound.auth.saml.version}</version> <version>${identity.inbound.auth.saml.version}</version>
@ -1993,6 +2115,10 @@
<id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id> <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.consent.mgt.server.feature.group</id>
<version>${carbon.consent.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group</id> <id>org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
@ -2039,9 +2165,14 @@
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id> <id>org.wso2.carbon.extension.identity.oauth2.jwt.feature.group</id>
<version>${identity.jwt.extension.version}</version> <version>${identity.jwt.extension.version}</version>
</feature> </feature>
<!--Database utils feature-->
<feature>
<id>org.wso2.carbon.database.utils.feature.group</id>
<version>${org.wso2.carbon.database.utils.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.tenant.mgt.common.feature.group</id> <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -2199,6 +2330,10 @@
<id>org.wso2.carbon.identity.oauth.feature.group</id> <id>org.wso2.carbon.identity.oauth.feature.group</id>
<version>${identity.inbound.auth.oauth.version}</version> <version>${identity.inbound.auth.oauth.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.identity.event.server.feature.group</id>
<version>${carbon.identity.framework.version}</version>
</feature>
<feature> <feature>
<id> <id>
org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group
@ -2225,6 +2360,7 @@
<id>org.wso2.carbon.identity.user.registration.server.feature.group</id> <id>org.wso2.carbon.identity.user.registration.server.feature.group</id>
<version>${carbon.identity.framework.version}</version> <version>${carbon.identity.framework.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.deployment.synchronizer.feature.group</id> <id>org.wso2.carbon.deployment.synchronizer.feature.group</id>
<version>${carbon.commons.version}</version> <version>${carbon.commons.version}</version>
@ -2349,6 +2485,10 @@
<id>org.wso2.carbon.forum.server.feature.group</id> <id>org.wso2.carbon.forum.server.feature.group</id>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.publisher.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.tenant.common.feature.group</id> <id>org.wso2.carbon.tenant.common.feature.group</id>
<version>${carbon.multitenancy.version}</version> <version>${carbon.multitenancy.version}</version>
@ -2671,7 +2811,7 @@
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature> <feature>
<id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id> <id>org.wso2.carbon.extension.identity.oauth2.jwt.feature.group</id>
<version>${identity.jwt.extension.version}</version> <version>${identity.jwt.extension.version}</version>
</feature> </feature>
<feature> <feature>
@ -2971,6 +3111,10 @@
<id>org.wso2.carbon.forum.server.feature.group</id> <id>org.wso2.carbon.forum.server.feature.group</id>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.apimgt.publisher.feature.group</id>
<version>${carbon.api.mgt.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.tenant.common.feature.group</id> <id>org.wso2.carbon.tenant.common.feature.group</id>
<version>${carbon.multitenancy.version}</version> <version>${carbon.multitenancy.version}</version>

83
pom.xml
Unescape View File

@ -39,9 +39,10 @@
<module>modules/features</module> <module>modules/features</module>
<module>modules/scripts</module> <module>modules/scripts</module>
<module>modules/tools</module> <module>modules/tools</module>
<module>modules/cxf-filters</module>
<module>modules/p2-profile</module> <module>modules/p2-profile</module>
<module>modules/distribution</module> <module>modules/distribution</module>
<module>modules/integration</module> <!--<module>modules/integration</module>-->
</modules> </modules>
<dependencyManagement> <dependencyManagement>
@ -492,7 +493,6 @@
<artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId> <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</dependency> </dependency>
<!--MDM dependencies--> <!--MDM dependencies-->
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId> <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
@ -1446,7 +1446,7 @@
<properties> <properties>
<!--Carbon kernel versions--> <!--Carbon kernel versions-->
<carbon.kernel.version>4.4.17</carbon.kernel.version> <carbon.kernel.version>4.4.25</carbon.kernel.version>
<carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range> <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
<carbon.ui.menu.stratos.version>2.2.0</carbon.ui.menu.stratos.version> <carbon.ui.menu.stratos.version>2.2.0</carbon.ui.menu.stratos.version>
@ -1483,63 +1483,68 @@
<javax.ws.rs.version>1.1.1</javax.ws.rs.version> <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
<!-- Carbon Commons --> <!-- Carbon Commons -->
<carbon.commons.version>4.5.8</carbon.commons.version> <carbon.commons.version>4.6.21</carbon.commons.version>
<!-- Carbon Deployment --> <!-- Carbon Deployment -->
<carbon.deployment.version>4.7.3</carbon.deployment.version> <carbon.deployment.version>4.7.15</carbon.deployment.version>
<!-- Carbon Identity --> <!-- Carbon Identity -->
<carbon.identity.framework.version>5.7.5</carbon.identity.framework.version> <carbon.identity.framework.version>5.11.124</carbon.identity.framework.version>
<carbon.identity.framework.version.range>[5.2.0, 6.0.0) <carbon.identity.framework.version.range>[5.2.0, 6.0.0)
</carbon.identity.framework.version.range> </carbon.identity.framework.version.range>
<identity.local.auth.basicauth.version>5.3.1</identity.local.auth.basicauth.version> <identity.local.auth.basicauth.version>5.3.7</identity.local.auth.basicauth.version>
<identity.inbound.auth.openid.version>5.1.1</identity.inbound.auth.openid.version> <identity.inbound.auth.openid.version>5.2.5</identity.inbound.auth.openid.version>
<identity.inbound.auth.saml.version>5.3.1</identity.inbound.auth.saml.version> <identity.inbound.auth.saml.version>5.4.4</identity.inbound.auth.saml.version>
<identity.carbon.auth.saml2.version>5.2.1</identity.carbon.auth.saml2.version> <identity.carbon.auth.saml2.version>5.2.5</identity.carbon.auth.saml2.version>
<identity.inbound.auth.oauth.version>5.3.11</identity.inbound.auth.oauth.version> <identity.inbound.auth.oauth.version>5.6.53</identity.inbound.auth.oauth.version>
<identity.carbon.auth.mutual.ssl.version>5.1.2</identity.carbon.auth.mutual.ssl.version> <identity.carbon.auth.mutual.ssl.version>5.1.3</identity.carbon.auth.mutual.ssl.version>
<identity.user.ws.version>5.1.4</identity.user.ws.version> <identity.user.ws.version>5.1.8</identity.user.ws.version>
<identity.outbound.auth.requestpath.basicauth.version>5.1.1 <identity.outbound.auth.requestpath.basicauth.version>5.1.5</identity.outbound.auth.requestpath.basicauth.version>
</identity.outbound.auth.requestpath.basicauth.version> <identity.outbound.auth.requestpath.oauth.version>5.1.4</identity.outbound.auth.requestpath.oauth.version>
<identity.outbound.auth.requestpath.oauth.version>5.1.1 <identity.outbound.auth.samlsso.version>5.1.12</identity.outbound.auth.samlsso.version>
</identity.outbound.auth.requestpath.oauth.version> <identity.metadata.saml2.version>1.0.5</identity.metadata.saml2.version>
<identity.outbound.auth.samlsso.version>5.1.4</identity.outbound.auth.samlsso.version>
<identity.metadata.saml2.version>1.0.0</identity.metadata.saml2.version>
<identity.inbound.metadata.saml2.version>0.1.1</identity.inbound.metadata.saml2.version> <identity.inbound.metadata.saml2.version>0.1.1</identity.inbound.metadata.saml2.version>
<identity.application.authz.xacml>1.0.0</identity.application.authz.xacml> <identity.application.authz.xacml>2.0.2</identity.application.authz.xacml>
<carbon.identity.governance.version>1.1.7</carbon.identity.governance.version>
<!--JWT grant type extension feature--> <!--JWT grant type extension feature-->
<identity.jwt.extension.version>1.0.2</identity.jwt.extension.version> <identity.jwt.extension.version>1.0.10</identity.jwt.extension.version>
<!--Consent Management feature-->
<carbon.consent.mgt.version>1.0.48</carbon.consent.mgt.version>
<!--Database utils version-->
<org.wso2.carbon.database.utils.version>2.0.6</org.wso2.carbon.database.utils.version>
<!-- Carbon Multi-tenancy --> <!-- Carbon Multi-tenancy -->
<carbon.multitenancy.version>4.6.1</carbon.multitenancy.version> <carbon.multitenancy.version>4.6.8</carbon.multitenancy.version>
<!-- Carbon Registry --> <!-- Carbon Registry -->
<carbon.registry.version>4.6.8</carbon.registry.version> <carbon.registry.version>4.6.28</carbon.registry.version>
<!-- Carbon Governance --> <!-- Carbon Governance -->
<carbon.governance.version>4.7.8</carbon.governance.version> <carbon.governance.version>4.7.23</carbon.governance.version>
<!-- Carbon Device Management--> <!-- Carbon Device Management-->
<carbon.device.mgt.version>3.0.240</carbon.device.mgt.version> <carbon.device.mgt.version>3.1.3-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
<product.iot.version>${project.version}</product.iot.version> <product.iot.version>${project.version}</product.iot.version>
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>4.0.136</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>4.1.0-SNAPSHOT</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>6.1.109</carbon.api.mgt.version> <carbon.api.mgt.version>6.2.170</carbon.api.mgt.version>
<carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range> <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
<!-- Carbon Mediation --> <!-- Carbon Mediation -->
<carbon.mediation.version>4.6.10</carbon.mediation.version> <carbon.mediation.version>4.6.61</carbon.mediation.version>
<!-- Carbon Analytics Common (DAS) --> <!-- Carbon Analytics Common (DAS) -->
<carbon.analytics.common.version>5.1.17</carbon.analytics.common.version> <carbon.analytics.common.version>5.1.32</carbon.analytics.common.version>
<carbon.analytics.version>1.3.3</carbon.analytics.version> <carbon.analytics.version>1.3.16</carbon.analytics.version>
<carbon.analytics.das.version>1.3.5</carbon.analytics.das.version> <carbon.analytics.das.version>1.3.16</carbon.analytics.das.version>
<product.iot.analytics.version>${project.version}</product.iot.analytics.version> <product.iot.analytics.version>${project.version}</product.iot.analytics.version>
<product.das.version>3.1.0</product.das.version> <product.das.version>3.1.0</product.das.version>
<product.mb.version>3.1.0</product.mb.version> <product.mb.version>3.1.0</product.mb.version>
@ -1558,8 +1563,8 @@
<!-- IoT Broker Dependencies --> <!-- IoT Broker Dependencies -->
<product.iot.broker.version>${project.version}</product.iot.broker.version> <product.iot.broker.version>${project.version}</product.iot.broker.version>
<andes.version>3.2.25</andes.version> <andes.version>3.2.45</andes.version>
<carbon.messaging.version>3.2.16</carbon.messaging.version> <carbon.messaging.version>3.2.32</carbon.messaging.version>
<!-- Third Party Dependencies--> <!-- Third Party Dependencies-->
<spongycastle.version>1.51.0.0</spongycastle.version> <spongycastle.version>1.51.0.0</spongycastle.version>
@ -1572,7 +1577,7 @@
<!--IOT Analytics--> <!--IOT Analytics-->
<shindig.version>2.0.2</shindig.version> <shindig.version>2.0.2</shindig.version>
<carbon.data.version>4.3.6</carbon.data.version> <carbon.data.version>4.4.41</carbon.data.version>
<equinox.osgi.version>3.8.1.v20120830-144521</equinox.osgi.version> <equinox.osgi.version>3.8.1.v20120830-144521</equinox.osgi.version>
<analytics.shared.version>1.0.3</analytics.shared.version> <analytics.shared.version>1.0.3</analytics.shared.version>
@ -1604,7 +1609,7 @@
<commons.lang3.version>3.3.2</commons.lang3.version> <commons.lang3.version>3.3.2</commons.lang3.version>
<commons.lang.version>2.2</commons.lang.version> <commons.lang.version>2.2</commons.lang.version>
<commons.io.version>2.4</commons.io.version> <commons.io.version>2.4</commons.io.version>
<axis2.wso2.version>1.6.1.wso2v12</axis2.wso2.version> <axis2.wso2.version>1.6.1.wso2v23</axis2.wso2.version>
<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version> <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
<gson.version>2.3.1</gson.version> <gson.version>2.3.1</gson.version>
<slf4j.log4j12.version>1.6.1</slf4j.log4j12.version> <slf4j.log4j12.version>1.6.1</slf4j.log4j12.version>
@ -1624,7 +1629,7 @@
<orbit.version.joda-time>2.8.2.wso2v1</orbit.version.joda-time> <orbit.version.joda-time>2.8.2.wso2v1</orbit.version.joda-time>
<orbit.version.json>2.0.0.wso2v1</orbit.version.json> <orbit.version.json>2.0.0.wso2v1</orbit.version.json>
<carbon.dashboard.version>2.0.7</carbon.dashboard.version> <carbon.dashboard.version>2.0.7</carbon.dashboard.version>
<carbon.event-processing.version>2.1.9</carbon.event-processing.version> <carbon.event-processing.version>2.1.19</carbon.event-processing.version>
<imp.pkg.version.javax.servlet>[2.6.0,3.0.0)</imp.pkg.version.javax.servlet> <imp.pkg.version.javax.servlet>[2.6.0,3.0.0)</imp.pkg.version.javax.servlet>
<akka.version>2.3.4-spark</akka.version> <akka.version>2.3.4-spark</akka.version>
@ -1632,13 +1637,13 @@
<caramel.version>1.0.1</caramel.version> <caramel.version>1.0.1</caramel.version>
<!-- App manager version--> <!-- App manager version-->
<appmgt.feature.version>1.2.51</appmgt.feature.version> <appmgt.feature.version>1.2.53</appmgt.feature.version>
<!-- Carbon Store version--> <!-- Carbon Store version-->
<carbon.store.version>1.5.1</carbon.store.version> <carbon.store.version>1.5.1</carbon.store.version>
<!-- Carbon Remote User Management version --> <!-- Carbon Remote User Management version -->
<carbon.um.ws.version>5.1.4</carbon.um.ws.version> <carbon.um.ws.version>5.1.5</carbon.um.ws.version>
<!-- Cipher tool version--> <!-- Cipher tool version-->
<cipher.tool.version>1.0.0-wso2v5</cipher.tool.version> <cipher.tool.version>1.0.0-wso2v5</cipher.tool.version>
@ -1668,6 +1673,8 @@
<apache.httpclient.version>4.5.2</apache.httpclient.version> <apache.httpclient.version>4.5.2</apache.httpclient.version>
<maven.javadoc.skip>true</maven.javadoc.skip> <maven.javadoc.skip>true</maven.javadoc.skip>
<identity.governance.version>1.0.38</identity.governance.version>
<identity.event.handler.account.lock.version>1.1.12</identity.event.handler.account.lock.version>
</properties> </properties>
<scm> <scm>

Write Preview
Loading…
Cancel
Save