Skip to content
This repository has been 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 
…-648-remove-sample

# Conflicts:
#	.travis.yml
#	samples/core/pom.xml
#	samples/pom.xml
#	samples/server/pom.xml
  • Loading branch information
@hohwille
hohwille committed Jul 31, 2018
2 parents b4498f5 + daac4aa commit 4c8590f
Show file tree
Hide file tree
Showing 8 changed files with 208 additions and 136 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ language: java
dist: trusty
jdk:
- oraclejdk8
script: mvn install
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
156 changes: 25 additions & 131 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 @@ -26,15 +26,35 @@

<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 @@ -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
157 changes: 157 additions & 0 deletions boms/minimal/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<groupId>io.oasp.java.dev</groupId>
<artifactId>oasp4j-boms</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
<groupId>io.oasp.java.boms</groupId>
<artifactId>oasp4j-minimal-bom</artifactId>
<version>${oasp4j.version}</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<description>Dependencies (BOM) of the Open Application Standard Platform for Java (OASP4J) without any thirdparty.</description>
<url>http://oasp.io/oasp4j/</url>
<inceptionYear>2014</inceptionYear>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<oasp.flatten.mode>bom</oasp.flatten.mode>
</properties>

<dependencyManagement>
<dependencies>
<!-- Modules -->
<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.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>
<!-- Starters -->
<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>
</dependencies>
</dependencyManagement>

</project>
20 changes: 20 additions & 0 deletions boms/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<groupId>io.oasp.java.dev</groupId>
<artifactId>oasp4j</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
<artifactId>oasp4j-boms</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<description>Bill of Materials (BOM) for the Open Application Standard Platform for Java (OASP4J).</description>

<modules> <!-- Order is important here as maven does not track BOM imports as dependencies for reactor build order -->
<module>minimal</module>
<module>bom</module>
</modules>

</project>
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<inceptionYear>2014</inceptionYear>

<modules>
<module>bom</module>
<module>boms</module>
<module>modules</module>
<module>starters</module>
<module>templates</module>
Expand Down
2 changes: 1 addition & 1 deletion templates/server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<delimiters>
<delimiter>^*^</delimiter>
<delimiter>$[*]</delimiter>
</delimiters>
<useDefaultDelimiters>false</useDefaultDelimiters>
</configuration>
Expand Down
Loading

0 comments on commit 4c8590f

Please sign in to comment.