Skip to content
This repository was archived by the owner on Nov 23, 2021. It is now read-only.

Commit

Permalink
Merge branch 'develop' of https://github.com/oasp/oasp4j into feature…
Browse files Browse the repository at this point in the history 
…-id-ref
  • Loading branch information
@hohwille
hohwille committed Jul 31, 2018
2 parents fd13d10 + fe3a073 commit 630000a
Show file tree
Hide file tree
Showing 483 changed files with 6,557 additions and 23,694 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,3 @@
[submodule "oasp4j-ide"]
path = oasp4j-ide
url = https://github.com/oasp/oasp4j-ide.git
[submodule "samples/server/src/main/client"]
path = samples/server/src/main/client
url = https://github.com/oasp/oasp4js.git
7 changes: 4 additions & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: java
dist: precise
dist: trusty
jdk:
- oraclejdk7
script: mvn install
- oraclejdk8
script:
- mvn install
sudo: false
2 changes: 1 addition & 1 deletion LICENSE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright 2015-2018 Capgemini SE.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
164 changes: 29 additions & 135 deletions bom/pom.xml → boms/bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.oasp.java.dev</groupId>
<artifactId>oasp4j</artifactId>
<artifactId>oasp4j-boms</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
<groupId>io.oasp.java</groupId>
Expand All @@ -19,22 +19,42 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<cxf.version>3.1.8</cxf.version>
<cxf.version>3.1.9</cxf.version>
<mmm.util.version>7.5.1</mmm.util.version>
<oasp.flatten.mode>bom</oasp.flatten.mode>
</properties>

<dependencyManagement>
<dependencies>
<!-- *** INTERNAL DEPENDENCIES *** -->
<dependency>
<groupId>io.oasp.java.boms</groupId>
<artifactId>oasp4j-minimal-bom</artifactId>
<version>${oasp4j.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- *** EXTERNAL DEPENDENCIES *** -->
<!-- BOM for localization -->
<!-- Library with general utilities as well as I18N and exception support -->
<dependency>
<groupId>net.sf.m-m-m</groupId>
<artifactId>mmm-util-bom</artifactId>
<artifactId>mmm-util-core</artifactId>
<version>${mmm.util.version}</version>
</dependency>
<dependency>
<groupId>net.sf.m-m-m</groupId>
<artifactId>mmm-util-validation</artifactId>
<version>${mmm.util.version}</version>
</dependency>
<dependency>
<groupId>net.sf.m-m-m</groupId>
<artifactId>mmm-util-search</artifactId>
<version>${mmm.util.version}</version>
</dependency>
<dependency>
<groupId>net.sf.m-m-m</groupId>
<artifactId>mmm-util-entity</artifactId>
<version>${mmm.util.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- JSR 250 for component/bean lifecycle management -->
<dependency>
Expand Down Expand Up @@ -86,13 +106,13 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>3.1</version>
<version>3.2.5</version>
</dependency>
<!-- Support for dynamic and type-safe JPA queries -->
<dependency>
<groupId>com.mysema.querydsl</groupId>
<groupId>com.querydsl</groupId>
<artifactId>querydsl-jpa</artifactId>
<version>3.4.3</version>
<version>4.1.4</version>
</dependency>
<!-- DataBase Connection Pooling -->
<dependency>
Expand Down Expand Up @@ -235,132 +255,6 @@
<version>1.1.3</version>
</dependency>

<!-- *** INTERNAL DEPENDENCIES *** -->
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-test</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-logging</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-basic</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-batch</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-beanmapping</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-configuration</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-security</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-service</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-json</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-cxf-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-cxf-client-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-cxf-client-ws</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-cxf-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-cxf-server-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-cxf-server-ws</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.starters</groupId>
<artifactId>oasp4j-starter-cxf-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.starters</groupId>
<artifactId>oasp4j-starter-cxf-client-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.starters</groupId>
<artifactId>oasp4j-starter-cxf-client-ws</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.starters</groupId>
<artifactId>oasp4j-starter-cxf-server</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.starters</groupId>
<artifactId>oasp4j-starter-cxf-server-rest</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.starters</groupId>
<artifactId>oasp4j-starter-cxf-server-ws</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-jpa</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-jpa-envers</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.oasp.java.modules</groupId>
<artifactId>oasp4j-web</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
Loading

0 comments on commit 630000a

Please sign in to comment.