lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/Feature/Add_Rest_Api_with_Java_client' into
feature_split_repo_into_api_impl

# Conflicts:
#	hawkbit-repository/src/test/java/org/eclipse/hawkbit/TestDataUtil.java


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
This commit is contained in:
Kai Zimmermann
2016-05-20 17:42:55 +02:00
parent e3041aa9ae f9ed3b305d
commit 8b7b24125f
235 changed files with 4596 additions and 3303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
pom.xml
View File

@@ -8,8 +8,7 @@
http://www.eclipse.org/legal/epl-v10.html
-->
<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/xsd/maven-4.0.0.xsd">
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -25,15 +24,19 @@
<name>hawkBit :: Parent</name>
<modules>
<module>hawkbit-dmf-api</module>
<module>hawkbit-rest-api</module>
<module>hawkbit-core</module>
<module>hawkbit-security-core</module>
<module>hawkbit-repository</module>
<module>hawkbit-rest-core</module>
<module>hawkbit-mgmt-api</module>
<module>hawkbit-mgmt-resource</module>
<module>hawkbit-ddi-api</module>
<module>hawkbit-ddi-dl-api</module>
<module>hawkbit-ddi-resource</module>
<module>hawkbit-dmf-api</module>
<module>hawkbit-dmf-amqp</module>
<module>hawkbit-repository</module>
<module>hawkbit-security-integration</module>
<module>hawkbit-http-security</module>
<module>hawkbit-rest-resource</module>
<module>hawkbit-ui</module>
<module>hawkbit-artifact-repository-mongo</module>
<module>hawkbit-autoconfigure</module>
@@ -102,6 +105,7 @@
<jlorem.version>1.1</jlorem.version>
<json-simple.version>1.1.1</json-simple.version>
<commons-lang3.version>3.4</commons-lang3.version>
<commons.lang>2.3</commons.lang>
<json.version>20141113</json.version>
<rsql-parser.version>2.0.0</rsql-parser.version>
<!-- Misc libraries versions - END -->
@@ -244,7 +248,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore />
<ignore/>
</action>
</pluginExecution>
<pluginExecution>
@@ -258,7 +262,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore />
<ignore/>
</action>
</pluginExecution>
</pluginExecutions>
@@ -548,13 +552,16 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${commons.lang}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
@@ -626,4 +633,4 @@
</dependency>
</dependencies>
</dependencyManagement>
</project>
</project>