geethkokila
93af292037
Resolve conflicts
6 years ago
geethkokila
0dea5cd0aa
Resolve conflicts
6 years ago
lasanthaDLPDS
f9ec82e4dc
Merge with upstream
6 years ago
geethkokila
34fad87cce
Fixing the conflicts
6 years ago
inoshperera
2011843736
Adding APK parcing and ipa parsing capability
6 years ago
WSO2 Builder
01991dcc4d
[WSO2 Release] [Jenkins #3030 ] [Release 3.1.39] prepare for next development iteration
6 years ago
WSO2 Builder
18b81223df
[WSO2 Release] [Jenkins #3030 ] [Release 3.1.39] prepare release v3.1.39
6 years ago
WSO2 Builder
cbbd327a02
[WSO2 Release] [Jenkins #3028 ] [Release 3.1.38] prepare for next development iteration
6 years ago
WSO2 Builder
de07597d53
[WSO2 Release] [Jenkins #3028 ] [Release 3.1.38] prepare release v3.1.38
6 years ago
WSO2 Builder
3401a8c845
[WSO2 Release] [Jenkins #3026 ] [Release 3.1.37] prepare for next development iteration
6 years ago
WSO2 Builder
ecadadef94
[WSO2 Release] [Jenkins #3026 ] [Release 3.1.37] prepare release v3.1.37
6 years ago
WSO2 Builder
2b6de6834b
[maven-release-plugin] prepare for next development iteration
6 years ago
WSO2 Builder
16c6a27f81
[maven-release-plugin] prepare release v3.1.36
6 years ago
WSO2 Builder
252b260237
[WSO2 Release] [Jenkins #3021 ] [Release 3.1.35] prepare for next development iteration
6 years ago
WSO2 Builder
a2422cb02a
[WSO2 Release] [Jenkins #3021 ] [Release 3.1.35] prepare release v3.1.35
6 years ago
WSO2 Builder
af7aa73886
[WSO2 Release] [Jenkins #3019 ] [Release 3.1.34] prepare for next development iteration
6 years ago
WSO2 Builder
47ed74c156
[WSO2 Release] [Jenkins #3019 ] [Release 3.1.34] prepare release v3.1.34
6 years ago
charitha
82778f06c6
Add secure web socket proxy to route ws connections in IoTS cluster
6 years ago
lasanthaDLPDS
d293b5b1b8
Fix merge conflixts
6 years ago
WSO2 Builder
4848e271af
[WSO2 Release] [Jenkins #3017 ] [Release 3.1.33] prepare for next development iteration
6 years ago
WSO2 Builder
c79baf3392
[WSO2 Release] [Jenkins #3017 ] [Release 3.1.33] prepare release v3.1.33
6 years ago
charitha
2cac0053ab
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into entgra-master
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImplTest.java
6 years ago
WSO2 Builder
02282967ab
[WSO2 Release] [Jenkins #3015 ] [Release 3.1.32] prepare for next development iteration
6 years ago
WSO2 Builder
7daeb6efb9
[WSO2 Release] [Jenkins #3015 ] [Release 3.1.32] prepare release v3.1.32
6 years ago
charitha
47f619a136
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into iots-3.3.1
6 years ago
WSO2 Builder
8da1bcb741
[WSO2 Release] [Jenkins #3011 ] [Release 3.1.31] prepare for next development iteration
6 years ago
WSO2 Builder
9c0cbdc983
[WSO2 Release] [Jenkins #3011 ] [Release 3.1.31] prepare release v3.1.31
6 years ago
charitha
bccb88ab22
Fixed build issue due to okio
6 years ago
charitha
ed75a9a7b2
Update Entgra nexus url
6 years ago
charitha
598632fc36
Fixed build issue due to okio
6 years ago
charitha
1cbf501661
Update configs for entgra
6 years ago
charitha
5552b382ad
Add maven snapshot deployment to nexus
6 years ago
WSO2 Builder
0aec365dce
[WSO2 Release] [Jenkins #3009 ] [Release 3.1.30] prepare for next development iteration
7 years ago
WSO2 Builder
ca890ac346
[WSO2 Release] [Jenkins #3009 ] [Release 3.1.30] prepare release v3.1.30
7 years ago
WSO2 Builder
2e5db59398
[WSO2 Release] [Jenkins #3007 ] [Release 3.1.29] prepare for next development iteration
7 years ago
WSO2 Builder
964d92eb7f
[WSO2 Release] [Jenkins #3007 ] [Release 3.1.29] prepare release v3.1.29
7 years ago
Madhawa Perera
b87763dba1
Add capability to WSO2 IOT server to route HTTP/HTTPS calls through Proxy server ( #1244 )
...
* Fix IoT Server HTTP/HTTPS calls bypassing a Proxy server
Since the Feign client is not supporting proxy routing this fix has included okhttp client and pass it to the feigns okkhttp client wrapper in order to pass HTTP/HTTPS call through proxy server if the system proxy properties are set. Further this modifies the apache http client also to pick system properties.
fixes wso2/product-iots#1806
* Remove unwanted comments and commented lines
* Remove the localhost host check
* Add default non proxy hosts
Added localhost as a default non proxy host
* use the version property from parent pom
Use the version property, "github.openfeign.version" from parent pom instead of hard-coding the version range
7 years ago
WSO2 Builder
79d48bb1a8
[WSO2 Release] [Jenkins #3005 ] [Release 3.1.28] prepare for next development iteration
7 years ago
WSO2 Builder
f05750b794
[WSO2 Release] [Jenkins #3005 ] [Release 3.1.28] prepare release v3.1.28
7 years ago
WSO2 Builder
2fcb647957
[WSO2 Release] [Jenkins #3003 ] [Release 3.1.27] prepare for next development iteration
7 years ago
WSO2 Builder
2f519baf67
[WSO2 Release] [Jenkins #3003 ] [Release 3.1.27] prepare release v3.1.27
7 years ago
WSO2 Builder
7431cde12a
[WSO2 Release] [Jenkins #3001 ] [Release 3.1.26] prepare for next development iteration
7 years ago
WSO2 Builder
aa429e230c
[WSO2 Release] [Jenkins #3001 ] [Release 3.1.26] prepare release v3.1.26
7 years ago
WSO2 Builder
7620d7ea5d
[WSO2 Release] [Jenkins #2999 ] [Release 3.1.25] prepare for next development iteration
7 years ago
WSO2 Builder
5fd8aeef89
[WSO2 Release] [Jenkins #2999 ] [Release 3.1.25] prepare release v3.1.25
7 years ago
lasanthaDLPDS
e5a34d52e8
Add testing version to pom.xml
7 years ago
lasantha
475bfea8b2
Bump dependency versions
7 years ago
WSO2 Builder
3201dfcfa9
[WSO2 Release] [Jenkins #2996 ] [Release 3.1.24] prepare for next development iteration
7 years ago
WSO2 Builder
86000e93b2
[WSO2 Release] [Jenkins #2996 ] [Release 3.1.24] prepare release v3.1.24
7 years ago
WSO2 Builder
ac7e71282e
[WSO2 Release] [Jenkins #2994 ] [Release 3.1.23] prepare for next development iteration
7 years ago
WSO2 Builder
1c135b9e18
[WSO2 Release] [Jenkins #2994 ] [Release 3.1.23] prepare release v3.1.23
7 years ago
WSO2 Builder
7dd3f29ff7
[WSO2 Release] [Jenkins #2992 ] [Release 3.1.22] prepare for next development iteration
7 years ago
WSO2 Builder
03dd153f6f
[WSO2 Release] [Jenkins #2992 ] [Release 3.1.22] prepare release v3.1.22
7 years ago
Rasika Perera
4be47123b3
Merge pull request #1235 from rasika/master
...
Update carbon-device-mgt dependencies
7 years ago
WSO2 Builder
db8a5afdf8
[WSO2 Release] [Jenkins #2990 ] [Release 3.1.21] prepare for next development iteration
7 years ago
WSO2 Builder
bb0c498b3a
[WSO2 Release] [Jenkins #2990 ] [Release 3.1.21] prepare release v3.1.21
7 years ago
Rasika Perera
b639845ab2
Fix formatting issue
7 years ago
Rasika Perera
f14564339a
Fix formatting issues
7 years ago
Rasika Perera
703a4cbb12
Add further fixes for the jwt-grant dependency issue
7 years ago
Rasika Perera
48a06c048b
Fix jwt dependency issue
7 years ago
Rasika Perera
ec7a0c07cb
Update carbon-device-mgt dependencies
7 years ago
WSO2 Builder
10cf201da7
[WSO2 Release] [Jenkins #2988 ] [Release 3.1.20] prepare for next development iteration
7 years ago
WSO2 Builder
2c73d73860
[WSO2 Release] [Jenkins #2988 ] [Release 3.1.20] prepare release v3.1.20
7 years ago
WSO2 Builder
790641a2aa
[WSO2 Release] [Jenkins #2987 ] [Release 3.1.19] prepare for next development iteration
7 years ago
WSO2 Builder
efb54864c6
[WSO2 Release] [Jenkins #2987 ] [Release 3.1.19] prepare release v3.1.19
7 years ago
WSO2 Builder
7fe945f1bf
[WSO2 Release] [Jenkins #2985 ] [Release 3.1.18] prepare for next development iteration
7 years ago
WSO2 Builder
555a349fd6
[WSO2 Release] [Jenkins #2985 ] [Release 3.1.18] prepare release v3.1.18
7 years ago
WSO2 Builder
f7f13f2052
[WSO2 Release] [Jenkins #2983 ] [Release 3.1.17] prepare for next development iteration
7 years ago
WSO2 Builder
d44ac973cb
[WSO2 Release] [Jenkins #2983 ] [Release 3.1.17] prepare release v3.1.17
7 years ago
WSO2 Builder
a51a3cd6a4
[WSO2 Release] [Jenkins #2981 ] [Release 3.1.16] prepare for next development iteration
7 years ago
WSO2 Builder
f416cecb9e
[WSO2 Release] [Jenkins #2981 ] [Release 3.1.16] prepare release v3.1.16
7 years ago
WSO2 Builder
41358a41a5
[WSO2 Release] [Jenkins #2979 ] [Release 3.1.15] prepare for next development iteration
7 years ago
WSO2 Builder
d679faecca
[WSO2 Release] [Jenkins #2979 ] [Release 3.1.15] prepare release v3.1.15
7 years ago
WSO2 Builder
5a1b4b154e
[WSO2 Release] [Jenkins #2977 ] [Release 3.1.14] prepare for next development iteration
7 years ago
WSO2 Builder
50232e10a5
[WSO2 Release] [Jenkins #2977 ] [Release 3.1.14] prepare release v3.1.14
7 years ago
WSO2 Builder
f265ddc736
[WSO2 Release] [Jenkins #2975 ] [Release 3.1.13] prepare for next development iteration
7 years ago
WSO2 Builder
221fb27c6c
[WSO2 Release] [Jenkins #2975 ] [Release 3.1.13] prepare release v3.1.13
7 years ago
WSO2 Builder
7d1183274d
[WSO2 Release] [Jenkins #2973 ] [Release 3.1.12] prepare for next development iteration
7 years ago
WSO2 Builder
1e875dc00b
[WSO2 Release] [Jenkins #2973 ] [Release 3.1.12] prepare release v3.1.12
7 years ago
WSO2 Builder
1c3bca244a
[WSO2 Release] [Jenkins #2971 ] [Release 3.1.11] prepare for next development iteration
7 years ago
WSO2 Builder
4140ba7e76
[WSO2 Release] [Jenkins #2971 ] [Release 3.1.11] prepare release v3.1.11
7 years ago
WSO2 Builder
d2163025f2
[WSO2 Release] [Jenkins #2969 ] [Release 3.1.10] prepare for next development iteration
7 years ago
WSO2 Builder
494b4db66b
[WSO2 Release] [Jenkins #2969 ] [Release 3.1.10] prepare release v3.1.10
7 years ago
WSO2 Builder
31f11433bb
[WSO2 Release] [Jenkins #2967 ] [Release 3.1.9] prepare for next development iteration
7 years ago
WSO2 Builder
a3773032ce
[WSO2 Release] [Jenkins #2967 ] [Release 3.1.9] prepare release v3.1.9
7 years ago
Geeth
d69ce0b9a1
Merge pull request #1223 from charithag/master
...
Updated API Publisher & Store extensions after bumping versions
7 years ago
WSO2 Builder
fa014fb838
[WSO2 Release] [Jenkins #2965 ] [Release 3.1.8] prepare for next development iteration
7 years ago
WSO2 Builder
e2218ed497
[WSO2 Release] [Jenkins #2965 ] [Release 3.1.8] prepare release v3.1.8
7 years ago
WSO2 Builder
a73300b693
[WSO2 Release] [Jenkins #2964 ] [Release 3.1.7] prepare for next development iteration
7 years ago
WSO2 Builder
fa5300cec1
[WSO2 Release] [Jenkins #2964 ] [Release 3.1.7] prepare release v3.1.7
7 years ago
charitha
3fda0a1459
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
charitha
6f19ca3e20
Fixed test failures
7 years ago
WSO2 Builder
46c4111b1d
[WSO2 Release] [Jenkins #2963 ] [Release 3.1.6] prepare for next development iteration
7 years ago
WSO2 Builder
28ec21a4f3
[WSO2 Release] [Jenkins #2963 ] [Release 3.1.6] prepare release v3.1.6
7 years ago
WSO2 Builder
10f32aa150
[WSO2 Release] [Jenkins #2961 ] [Release 3.1.5] prepare for next development iteration
7 years ago
WSO2 Builder
b2c969ef85
[WSO2 Release] [Jenkins #2961 ] [Release 3.1.5] prepare release v3.1.5
7 years ago
WSO2 Builder
ffb28d018b
[WSO2 Release] [Jenkins #2959 ] [Release 3.1.4] prepare for next development iteration
7 years ago
WSO2 Builder
66591d3680
[WSO2 Release] [Jenkins #2959 ] [Release 3.1.4] prepare release v3.1.4
7 years ago
charitha
c26198c0e1
Bump analytics commons version
7 years ago
charitha
b1696eb08e
Bump identity versions
7 years ago