Updating master branch

.travis.yml

@@ -14,13 +14,13 @@ cache:
   directories:
   - $HOME/.m2
 
-before_install:
-- openssl aes-256-cbc -K $encrypted_8dafc9c32687_key -iv $encrypted_8dafc9c32687_iv
-  -in gpg.tar.enc -out gpg.tar -d
-- tar xvf gpg.tar
-
 install: mvn clean install -DskipTests=true -V -U
-script: mvn test
+script: mvn test -Dkumuluzee.plugin.test.skip=true
 
 after_success:
-- mvn source:jar javadoc:jar deploy -Pdeploy -DskipTests=true --settings ./settings.xml
+# Deploy to OSSHR
+- if [[ $TRAVIS_PULL_REQUEST == "false" && ($TRAVIS_BRANCH == "master" || $TRAVIS_TAG) ]]; then
+    openssl aes-256-cbc -K $encrypted_047edc09e660_key -iv $encrypted_047edc09e660_iv -in gpg.tar.gz.enc -out gpg.tar.gz -d;
+    tar xvf gpg.tar.gz;
+    mvn source:jar javadoc:jar deploy -Pdeploy -DskipTests=true --settings ./settings.xml;
+  fi

README.md

@@ -3,68 +3,92 @@
 
 > Lightweight open-source framework for developing microservices using standard Java EE technologies and migrating Java EE to cloud-native architecture.
 
-KumuluzEE is a lightweight framework for developing microservices using standard Java EE technologies and migrating 
-existing Java EE applications to microservices. KumuluzEE packages microservices as standalone JARs.
-KumuluzEE microservices are lightweight and optimized for size and start-up time.
-They fit perfectly with Docker containers.
+KumuluzEE is a lightweight framework for developing microservices using standard Java EE technologies and migrating existing Java EE applications to microservices. KumuluzEE packages microservices as standalone JARs. KumuluzEE microservices are lightweight and optimized for size and start-up time.
+They fit perfectly with Docker containers. KumuluzEE microservices are fully compatible with Kubernetes. 
 
-KumuluzEE also provides extensions for developing common patterns in cloud-native architectures,
-including configuration, logging, discovery, circuit-breakers, metrics, security, event streaming and more.
+KumuluzEE also provides extensions for developing common patterns in cloud-native architectures, including configuration, logging, discovery, fault tolerance with circuit-breakers, metrics, security, event streaming and more.
 
-KumuluzEE has been designed to use the standard Java EE technologies and APIs with optional extensions for easier
-development of cloud-native microservices. Therefore, it is particularly suitable for existing enterprise Java EE developers,
-who would like to leverage their skills, but progressively move from monolithic to microservice design patterns.
+KumuluzEE has been designed to use the standard Java EE technologies and APIs with optional extensions for easier development of cloud-native microservices. Therefore, it is particularly suitable for existing enterprise Java EE developers, who would like to leverage their skills, but progressively move from monolithic to microservice design patterns.
+
+KumuluzEE is Eclipse MicroProfile compliant and provides support for MicroProfile 1.0 and MicroProfile 1.1. It implements MicroProfile Config 1.1, MicroProfile Health 1.0, MicroProfile Fault Tolerance 1.0 and MicroProfile Metrics 1.0 APIs.
+
+## Features
 
 Primary features:
 
 - No need for a traditional application server. Run your app anywhere Java runs as well as in PaaS
 and Docker-like environments
 - Allows you to develop microservices using standard Java EE technologies.
 - Allows you to gradually migrate existing Java EE applications to microservices and cloud-native architecture.
-- Complete control over what Java EE components and its implementations are included. Only include what you need and make
-your app lightweight.
+- Complete control over what Java EE components and its implementations are included. Only include what you need and make your app lightweight.
 - Minimal to no configuration settings up the base server. Develop like any other Java EE application
 - Quick startup time, low resource consumption and stateless scalability accelerates development
-- Extend your microservices with common cloud-native patterns, such as config, discovery, logging, circuit-breakers,
-etc. KumuluzEE provides all the building blocks.
+- Extend your microservices with common cloud-native patterns, such as config, discovery, logging, fault tolerance, circuit-breakers, etc. KumuluzEE provides all the building blocks.
+
+KumuluzEE provides support for various Java EE APIs and components. The goal is to support as many Java EE components as possible (contributions welcome). 
 
-The goal is to support as many Java EE components as possible. Currently the following components are
-supported with more being added over time:
+## Java EE components
+
+Currently the following components are supported with more being added over time:
 
 - Servlet 3.1 (Jetty)
-- WebSocket 1.1 (Jetty)
+- CDI 1.2 (RI Weld)
+- JAX-RS 2.1. (RI Jersey)
+- JSON-P 1.0 (RI JSONP)
 - JSP 2.3 (Jetty Apache Jasper)
+- JPA 2.1 (RI EclipseLink)
+- JPA 2.1 (RI Hibernate)
 - EL 3.0 (RI UEL)
-- CDI 1.2 (RI Weld)
-- JPA 2.1 (RI EclipseLink, Hibernate)
-- JAX-RS 2.0 (RI Jersey)
+- JAX-WS (RI Metro)
 - JSF 2.2 (RI Mojarra)
+- WebSocket 1.1 (Jetty)
 - Bean Validation 1.1 (RI Hibernate validator)
-- JSON-P 1.0 (RI JSONP)
+- JTA 1.2 (Narayana)
+
+## Additional features
+
+KumuluzEE provides additional features, which are described on the [project Wiki]( https://github.com/kumuluz/kumuluzee/wiki), particularly:
+- [Configuration framework](https://github.com/kumuluz/kumuluzee/wiki/Configuration) for easy and efficient configuration of microservices from various sources, such as environment variables, configuration files (yaml), properties, etc.
+- [TLS/SSL support](https://github.com/kumuluz/kumuluzee/wiki/TLS-SSL-support) for configuring TLS/SSL.
+
+KumuluzEE also provides support for [**Uber JARs**](https://github.com/kumuluz/kumuluzee/wiki/Uber-JAR-support). With the KumuluzEE Maven plugin, you can pack and run each microservice as a single, self-contained Uber-JAR. Details are described later in this document.
 
 ## KumuluzEE extensions
 
-In addition to the standard Java EE components, KumuluzEE also comes with several extensions that complement and extend
-its functionality. The extensions will follow the same modular concept as the Java EE components in which you can chose
-if you want to use it as well as the underlying implementation of the extension. Most extensions are geared towards creating
-cloud-native microservices including configuration, logging, discovery, circuit-breakers, metrics, security, event streaming and more.
-As such they will be part of the KumuluzEE Cloud project with some exceptions. Currently the following
-extensions are available with more planned soon:
+In addition to the standard Java EE components, KumuluzEE also comes with several extensions that complement and extend its functionality. The extensions will follow the same modular concept as the Java EE components in which you can chose if you want to use it as well as the underlying implementation of the extension. Most extensions are geared towards creating cloud-native microservices including configuration, logging, discovery, fault tolerance including circuit-breakers, metrics, security, event streaming and more.
+The following extensions are available with more planned soon:
+
+- [KumuluzEE Config](https://github.com/kumuluz/kumuluzee/wiki/Configuration) (File and environment variables)
+- [KumuluzEE Config with config server](https://github.com/kumuluz/kumuluzee-config) (Config server etcd/Consul)
+- [KumuluzEE REST](https://github.com/kumuluz/kumuluzee-rest) (For implementation of common, advanced and flexible REST API functionalities and patterns. Includes support for exposing JPA entities through REST)
+- [KumuluzEE Logs](https://github.com/kumuluz/kumuluzee-logs) (For advanced microservice framework for logging)
+- [KumuluzEE Discovery](https://github.com/kumuluz/kumuluzee-discovery) (For dynamic service discovery (etcd or Consul). Fully compatible with Kubernetes)
+- [KumuluzEE Metrics](https://github.com/kumuluz/kumuluzee-metrics) (For easy collection and reporting of performance metrics)
+- [KumuluzEE Security](https://github.com/kumuluz/kumuluzee-security) (For easy integration with OAuth2/OpenID identity and access management providers)
+- [KumuluzEE Health](https://github.com/kumuluz/kumuluzee-health) (For implementing health checks and exposing microservice health information)
+- [KumuluzEE Fault Tolerance](https://github.com/kumuluz/kumuluzee-fault-tolerance) (For implementing fault tolerance patterns with microservices including circuit breakers and decoupling microservices)
+- [KumuluzEE Event Streaming](https://github.com/kumuluz/kumuluzee-streaming) (For event streaming support using Apache Kafka)
+- [KumuluzEE CORS](https://github.com/kumuluz/kumuluzee-cors) (For Cross-Origin Resource Sharing (CORS) support)
+
+If you already know how to use Java EE, then you already know how to use KumuluzEE. It is simple and straightforward. See the [getting started](https://github.com/kumuluz/KumuluzEE/wiki/Getting-started) wiki section to create your first light-weight standalone Java EE app in 5 minutes. Refer to [samples](https://github.com/kumuluz/kumuluzee-samples) for more examples.
 
-- [KumuluzEE Config (File and environment variables built-in)](https://github.com/kumuluz/kumuluzee/wiki/Configuration)
-- [KumuluzEE Logs](https://github.com/kumuluz/kumuluzee-logs)
+## MicroProfile
 
-If you already know how to use Java EE, then you already know how to use KumuluzEE. Its dead simple,
-see the [getting started](https://github.com/kumuluz/KumuluzEE/wiki/Getting-started) wiki section to create your first light-weight standalone
-Java EE app in 5 minutes.
+KumuluzEE is Eclipse MicroProfile compliant and provides support for:
+- MicroProfile 1.0 
+- MicroProfile 1.1
+
+It implements the following MicroProfile APIs:
+- [MicroProfile Config 1.1](https://github.com/kumuluz/kumuluzee-config-mp)
+- [MicroProfile Health 1.0](https://github.com/kumuluz/kumuluzee-health)
+- [MicroProfile Fault Tolerance 1.0](https://github.com/kumuluz/kumuluzee-fault-tolerance)
+- [MicroProfile Metrics 1.0](https://github.com/kumuluz/kumuluzee-metrics)
 
 ## Usage
 
-KumuluzEE ships with a BOM (bill of materials) which you can use to easily add the various components you need without
-worrying about the versions and their compatibility as it is required that all components are the same version. 
+KumuluzEE ships with a BOM (bill of materials) which you can use to easily add the various components you need without worrying about the versions and their compatibility as it is required that all components are the same version. 
 
-Using maven add the BOM module of the library as a dependency to your project. The `${kumuluzee.version}`
-variables represents the most current minor version. You can see the available version on the
+Using maven add the BOM module of the library as a dependency to your project. The `${kumuluzee.version}` variables represents the most current minor version. You can see the available version on the
 [Release Page](https://github.com/kumuluz/KumuluzEE/releases).
 
 ```xml
@@ -84,6 +108,7 @@ variables represents the most current minor version. You can see the available v
 Now you can either choose any single combinations of Java EE components or use one of the common pre-built profiles that
 ship as part of KumuluzEE. You can chose any of the following profiles:
 
+MicroProfile 1.0
 ```xml
 <!-- MicroProfile 1.0 -->
 <dependency>
@@ -92,8 +117,16 @@ ship as part of KumuluzEE. You can chose any of the following profiles:
 </dependency>
 ```
 
-To choose your Java EE components with fine grain control include them as your dependencies. You can chose any of the
-following artifacts:
+MicroProfile 1.1
+```xml
+<!-- MicroProfile 1.1 -->
+<dependency>
+    <groupId>com.kumuluz.ee</groupId>
+    <artifactId>kumuluzee-microProfile-1.1</artifactId>
+</dependency>
+```
+
+To choose your Java EE components with fine grain control include them as your dependencies. You can chose any of the following artifacts:
 
 ```xml
 <!-- Servlet (Jetty) -->
@@ -146,6 +179,12 @@ following artifacts:
     <artifactId>kumuluzee-jax-rs-jersey</artifactId>
 </dependency>
 
+<!-- JAX-WS (RI Metro) -->
+<dependency>
+    <groupId>com.kumuluz.ee</groupId>
+    <artifactId>kumuluzee-jax-ws-metro</artifactId>
+</dependency>
+
 <!-- JSF (Mojarra) -->
 <dependency>
     <groupId>com.kumuluz.ee</groupId>
@@ -163,16 +202,74 @@ following artifacts:
     <groupId>com.kumuluz.ee</groupId>
     <artifactId>kumuluzee-json-p-jsonp</artifactId>
 </dependency>
+
+<!-- JTA -->
+<dependency>
+    <groupId>com.kumuluz.ee</groupId>
+    <artifactId>kumuluzee-jta-narayana</artifactId>
+</dependency>
 ```
 
-To choose your KumuluzEE extensions include them as your dependencies. You can find the available implementations and
-options at their respected project pages:
+To choose your KumuluzEE extensions include them as your dependencies. You can find the available implementations and options at their respected project pages.
 
-- [KumuluzEE Logs](https://github.com/kumuluz/kumuluzee-logs)
+## Pack and run microservice as Uber JAR
+
+KumuluzEE (since version 2.4) provides support for packing and running microservices as Uber JARs. It also includes a Maven plugin that correctly packages the microservice. 
+
+To package a Kumuluz EE microservice into an Uber JAR, you need to add the following plugin declaration into your 
+REST module pom.xml:
+
+```xml
+<plugin>
+    <groupId>com.kumuluz.ee</groupId>
+    <artifactId>kumuluzee-maven-plugin</artifactId>
+    <version>${kumuluz.version}</version>
+    <executions>
+        <execution>
+            <id>package</id>
+            <goals>
+                <goal>repackage</goal>
+            </goals>
+            <configuration>
+                <finalName/>
+                <outputDirectory/>
+                <mainClass/>
+                <webappDir/>
+            </configuration>
+        </execution>
+    </executions>
+</plugin>
+```
+
+#### Parameters
+
+* __finalName__
+
+    Final name of the generated "uber" JAR.
+
+    __Default value is__: `${project.build.finalName}` or `${project.artifactId}-${project.version}`
+
+* __outputDirectory__
+
+    Directory containing the generated JAR.
+
+    __Default value is__: `${project.build.directory}`
+
+
+### Run
+Start the application using the following command:
+```cmd
+java -jar ${project.build.finalName}.jar
+```
+Example:
+```cmd
+java -jar my-app-1.0.0-SNAPSHOT.jar
+```
 
 ## Getting started
 
 You can find the getting started guide on the projects [wiki](https://github.com/kumuluz/KumuluzEE/wiki/Getting-started).
+You can find samples [for Java EE and KumuluzEE]( https://github.com/kumuluz/kumuluzee-samples)
 
 ## Building
 

bom/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>kumuluzee</artifactId>
         <groupId>com.kumuluz.ee</groupId>
-        <version>2.3.0-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
@@ -22,6 +22,11 @@
                 <artifactId>kumuluzee-micro-profile</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.kumuluz.ee</groupId>
+                <artifactId>kumuluzee-microProfile-1.1</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>com.kumuluz.ee</groupId>
@@ -88,6 +93,11 @@
                 <artifactId>kumuluzee-json-p-jsonp</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.kumuluz.ee</groupId>
+                <artifactId>kumuluzee-jta-narayana</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>kumuluzee</artifactId>
         <groupId>com.kumuluz.ee</groupId>
-        <version>2.3.0-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,7 +30,6 @@
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>

common/src/main/java/com/kumuluz/ee/common/Component.java

@@ -1,3 +1,23 @@
+/*
+ *  Copyright (c) 2014-2017 Kumuluz and/or its affiliates
+ *  and other contributors as indicated by the @author tags and
+ *  the contributor list.
+ *
+ *  Licensed under the MIT License (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  https://opensource.org/licenses/MIT
+ *
+ *  The software is provided "AS IS", WITHOUT WARRANTY OF ANY KIND, express or
+ *  implied, including but not limited to the warranties of merchantability,
+ *  fitness for a particular purpose and noninfringement. in no event shall the
+ *  authors or copyright holders be liable for any claim, damages or other
+ *  liability, whether in an action of contract, tort or otherwise, arising from,
+ *  out of or in connection with the software or the use or other dealings in the
+ *  software. See the License for the specific language governing permissions and
+ *  limitations under the License.
+*/
 package com.kumuluz.ee.common;
 
 import com.kumuluz.ee.common.config.EeConfig;

common/src/main/java/com/kumuluz/ee/common/ConfigExtension.java

@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2014-2017 Kumuluz and/or its affiliates
+ *  and other contributors as indicated by the @author tags and
+ *  the contributor list.
+ *
+ *  Licensed under the MIT License (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  https://opensource.org/licenses/MIT
+ *
+ *  The software is provided "AS IS", WITHOUT WARRANTY OF ANY KIND, express or
+ *  implied, including but not limited to the warranties of merchantability,
+ *  fitness for a particular purpose and noninfringement. in no event shall the
+ *  authors or copyright holders be liable for any claim, damages or other
+ *  liability, whether in an action of contract, tort or otherwise, arising from,
+ *  out of or in connection with the software or the use or other dealings in the
+ *  software. See the License for the specific language governing permissions and
+ *  limitations under the License.
+*/
+package com.kumuluz.ee.common;
+
+import com.kumuluz.ee.configuration.ConfigurationSource;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Tilen Faganel
+ * @since 2.3.0
+ */
+public interface ConfigExtension extends Extension {
+
+    /**
+     * @deprecated Use {@link #getConfigurationSources()} instead.
+     */
+    @Deprecated
+    ConfigurationSource getConfigurationSource();
+
+    default List<ConfigurationSource> getConfigurationSources() {
+        return Collections.emptyList();
+    }
+}