diff --git a/boost-common/pom.xml b/boost-common/pom.xml index fff124d5..3d62072f 100644 --- a/boost-common/pom.xml +++ b/boost-common/pom.xml @@ -1,87 +1,86 @@ - - 4.0.0 + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 which accompanies this distribution, + and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: + IBM Corporation - initial API and implementation --> + + 4.0.0 - boost - boost-common - 0.1.3-SNAPSHOT + boost + boost-common + 0.1.3-SNAPSHOT - https://github.com/OpenLiberty/boost + https://github.com/OpenLiberty/boost - - net.wasdev.maven.parent - parent - 1.4 - - + + net.wasdev.maven.parent + parent + 1.4 + + - - - Eclipse Public License 1.0 (EPL-1.0) - https://raw.github.com/OpenLiberty/boost/master/LICENSE - repo - - + + + Eclipse Public License 1.0 (EPL-1.0) + https://raw.github.com/OpenLiberty/boost/master/LICENSE + repo + + - - scm:git:git@github.com:OpenLiberty/boost.git - scm:git:git@github.com:OpenLiberty/boost.git - git@github.com:OpenLiberty/boost.git - HEAD - + + scm:git:git@github.com:OpenLiberty/boost.git + scm:git:git@github.com:OpenLiberty/boost.git + git@github.com:OpenLiberty/boost.git + HEAD + - - UTF-8 - UTF-8 - 1.8 - 1.8 - + + UTF-8 + UTF-8 + 1.8 + 1.8 + - - - com.google.code.gson - gson - 2.8.0 - - - commons-io - commons-io - 2.6 - - - net.wasdev.wlp.common - ci.common - 1.3.3 - - - org.reflections - reflections - 0.9.11 - - - org.javassist - javassist - 3.25.0-GA - - - junit - junit - 4.12 - test - - - com.github.stefanbirkner - system-rules - 1.16.0 - test - - + + + com.google.code.gson + gson + 2.8.0 + + + commons-io + commons-io + 2.6 + + + net.wasdev.wlp.common + ci.common + 1.3.3 + + + org.reflections + reflections + 0.9.11 + + + org.javassist + javassist + 3.25.0-GA + + + junit + junit + 4.12 + test + + + com.github.stefanbirkner + system-rules + 1.16.0 + test + + diff --git a/boost-common/src/main/java/boost/common/boosters/AbstractBoosterConfig.java b/boost-common/src/main/java/boost/common/boosters/AbstractBoosterConfig.java index 12912161..a62f92a5 100644 --- a/boost-common/src/main/java/boost/common/boosters/AbstractBoosterConfig.java +++ b/boost-common/src/main/java/boost/common/boosters/AbstractBoosterConfig.java @@ -27,11 +27,26 @@ */ public abstract class AbstractBoosterConfig { + public static final String milestone = "M1"; public static final String RUNTIMES_GROUP_ID = "boost.runtimes"; public static final String BOOSTERS_GROUP_ID = "boost.boosters"; - public static final String EE_7_VERSION = "0.1-SNAPSHOT"; - public static final String EE_8_VERSION = "0.2-SNAPSHOT"; - public static final String MP_20_VERSION = "0.2-SNAPSHOT"; + public static final String CDI_VERSION_12 = "1.2."+milestone+"-SNAPSHOT"; + public static final String CDI_VERSION_20 = "2.0."+milestone+"-SNAPSHOT"; + public static final String JAXRS_VERSION_20 = "2.0."+milestone+"-SNAPSHOT"; + public static final String JAXRS_VERSION_21 = "2.1."+milestone+"-SNAPSHOT"; + public static final String JSONB_VERSION_10 = "1.0."+milestone+"-SNAPSHOT"; + public static final String JSONP_VERSION_10 = "1.0."+milestone+"-SNAPSHOT"; + public static final String JSONP_VERSION_11 = "1.1."+milestone+"-SNAPSHOT"; + public static final String JPA_VERSION_21 = "2.1."+milestone+"-SNAPSHOT"; + public static final String JPA_VERSION_22 = "2.2."+milestone+"-SNAPSHOT"; + public static final String MP_HEALTH_VERSION_10 = "1.0."+milestone+"-SNAPSHOT"; + public static final String MP_CONFIG_VERSION_13 = "1.3."+milestone+"-SNAPSHOT"; + public static final String MP_METRICS_VERSION_11 = "1.1."+milestone+"-SNAPSHOT"; + public static final String MP_FAULTTOLERANCE_VERSION_11 = "1.1."+milestone+"-SNAPSHOT"; + public static final String MP_OPENAPI_VERSION_10 = "1.0."+milestone+"-SNAPSHOT"; + public static final String MP_OPENTRACING_VERSION_11 = "1.1."+milestone+"-SNAPSHOT"; + public static final String MP_OPENTRACING_VERSION_12 = "1.2."+milestone+"-SNAPSHOT"; + public static final String MP_RESTCLIENT_VERSION_11 = "1.1."+milestone+"-SNAPSHOT"; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) diff --git a/boost-common/src/main/java/boost/common/boosters/JSONBBoosterConfig.java b/boost-common/src/main/java/boost/common/boosters/JSONBBoosterConfig.java new file mode 100644 index 00000000..70008290 --- /dev/null +++ b/boost-common/src/main/java/boost/common/boosters/JSONBBoosterConfig.java @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2018, 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package boost.common.boosters; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import boost.common.BoostException; +import boost.common.BoostLoggerI; +import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates; + +@BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":jsonb") +public class JSONBBoosterConfig extends AbstractBoosterConfig { + + public JSONBBoosterConfig(Map dependencies, BoostLoggerI logger) throws BoostException { + super(dependencies.get(getCoordinates(JSONBBoosterConfig.class))); + } + + @Override + public List getDependencies() { + return new ArrayList(); + } + +} \ No newline at end of file diff --git a/boost-common/src/main/java/boost/common/boosters/MPFaultToleranceBoosterConfig.java b/boost-common/src/main/java/boost/common/boosters/MPFaultToleranceBoosterConfig.java new file mode 100644 index 00000000..5657896f --- /dev/null +++ b/boost-common/src/main/java/boost/common/boosters/MPFaultToleranceBoosterConfig.java @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 2018, 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package boost.common.boosters; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import boost.common.BoostException; +import boost.common.BoostLoggerI; +import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates; + +@BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":mpFaultTolerance") +public class MPFaultToleranceBoosterConfig extends AbstractBoosterConfig { + + public MPFaultToleranceBoosterConfig(Map dependencies, BoostLoggerI logger) throws BoostException { + super(dependencies.get(getCoordinates(MPFaultToleranceBoosterConfig.class))); + } + + @Override + public List getDependencies() { + return new ArrayList(); + } +} diff --git a/boost-common/src/main/java/boost/common/boosters/MPMetricsBoosterConfig.java b/boost-common/src/main/java/boost/common/boosters/MPMetricsBoosterConfig.java new file mode 100644 index 00000000..98958939 --- /dev/null +++ b/boost-common/src/main/java/boost/common/boosters/MPMetricsBoosterConfig.java @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 2018, 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package boost.common.boosters; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import boost.common.BoostException; +import boost.common.BoostLoggerI; +import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates; + +@BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":mpMetrics") +public class MPMetricsBoosterConfig extends AbstractBoosterConfig { + + public MPMetricsBoosterConfig(Map dependencies, BoostLoggerI logger) throws BoostException { + super(dependencies.get(getCoordinates(MPMetricsBoosterConfig.class))); + } + + @Override + public List getDependencies() { + return new ArrayList(); + } +} diff --git a/boost-common/src/main/java/boost/common/boosters/MPOpenAPIBoosterConfig.java b/boost-common/src/main/java/boost/common/boosters/MPOpenAPIBoosterConfig.java new file mode 100644 index 00000000..4cb0ffe9 --- /dev/null +++ b/boost-common/src/main/java/boost/common/boosters/MPOpenAPIBoosterConfig.java @@ -0,0 +1,32 @@ +/******************************************************************************* + * Copyright (c) 2018, 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package boost.common.boosters; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import boost.common.BoostException; +import boost.common.BoostLoggerI; +import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates; + +@BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":mpOpenAPI") +public class MPOpenAPIBoosterConfig extends AbstractBoosterConfig { + + public MPOpenAPIBoosterConfig(Map dependencies, BoostLoggerI logger) throws BoostException { + super(dependencies.get(getCoordinates(MPOpenAPIBoosterConfig.class))); + } + + @Override + public List getDependencies() { + return new ArrayList(); + } +} diff --git a/boost-common/src/main/java/boost/common/config/ConfigConstants.java b/boost-common/src/main/java/boost/common/config/ConfigConstants.java index 4e2e1a6d..40a8ab86 100644 --- a/boost-common/src/main/java/boost/common/config/ConfigConstants.java +++ b/boost-common/src/main/java/boost/common/config/ConfigConstants.java @@ -100,12 +100,19 @@ public final class ConfigConstants { public static final String JDBC_43 = "jdbc-4.3"; public static final String JPA_21 = "jpa-2.1"; public static final String JPA_22 = "jpa-2.2"; + public static final String CDI_12 = "cdi-1.2"; public static final String CDI_20 = "cdi-2.0"; public static final String MPHEALTH_10 = "mpHealth-1.0"; + public static final String MPOPENAPI_10 = "mpOpenAPI-1.0"; public static final String MPRESTCLIENT_11 = "mpRestClient-1.1"; + public static final String MPMETRICS_11 = "mpMetrics-1.1"; + public static final String MPFAULTTOLERANCE_11 = "mpFaultTolerance-1.1"; + public static final String JSONB_10 = "jsonb-1.0"; + public static final String JSONP_10 = "jsonp-1.0"; public static final String JSONP_11 = "jsonp-1.1"; public static final String MPCONFIG_13 = "mpConfig-1.3"; public static final String MPOPENTRACING_11 = "mpOpenTracing-1.1"; + public static final String MPOPENTRACING_12 = "mpOpenTracing-1.2"; public static final String SHARED_RESOURCES_DIR = "${shared.resource.dir}"; public static final String SERVER_OUTPUT_DIR = "${server.output.dir}"; diff --git a/boost-maven/boost-boms/boost-ee7-apis-bom/pom.xml b/boost-maven/boost-boms/boost-ee7-apis-bom/pom.xml index 2f0b29db..98bc11cc 100644 --- a/boost-maven/boost-boms/boost-ee7-apis-bom/pom.xml +++ b/boost-maven/boost-boms/boost-ee7-apis-bom/pom.xml @@ -1,22 +1,21 @@ - + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 which accompanies this distribution, + and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: + IBM Corporation - initial API and implementation --> + 4.0.0 - + boost.boosters boost-ee7-apis-bom - + 0.1-SNAPSHOT pom Boost EE7 APIs BOM - + @@ -36,7 +35,17 @@ javax.transaction-api 1.2 - + + javax.json + javax.json-api + 1.0 + + + javax.enterprise + cdi-api + 1.2 + + - + diff --git a/boost-maven/boost-boms/boost-ee8-apis-bom/pom.xml b/boost-maven/boost-boms/boost-ee8-apis-bom/pom.xml index 8de3018a..644e4944 100644 --- a/boost-maven/boost-boms/boost-ee8-apis-bom/pom.xml +++ b/boost-maven/boost-boms/boost-ee8-apis-bom/pom.xml @@ -1,25 +1,24 @@ - - 4.0.0 - - boost.boosters - boost-ee8-apis-bom - - 0.1-SNAPSHOT - pom + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 which accompanies this distribution, + and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: + IBM Corporation - initial API and implementation --> + + 4.0.0 - Boost EE8 APIs BOM + boost.boosters + boost-ee8-apis-bom + + 0.1-SNAPSHOT + pom - - - + Boost EE8 APIs BOM + + + + javax.ws.rs javax.ws.rs-api @@ -46,6 +45,11 @@ javax.json-api 1.1 - - + + javax.json.bind + javax.json.bind-api + 1.0 + + + diff --git a/boost-maven/boost-boms/boost-mp14-apis-bom/pom.xml b/boost-maven/boost-boms/boost-mp14-apis-bom/pom.xml new file mode 100644 index 00000000..772e0775 --- /dev/null +++ b/boost-maven/boost-boms/boost-mp14-apis-bom/pom.xml @@ -0,0 +1,82 @@ + + + 4.0.0 + + boost.boosters + boost-mp14-apis-bom + + 0.1-SNAPSHOT + pom + + Booster MP14 APIs Bom + + + + + 1.3 + 1.1 + 1.0 + 1.1 + 1.1 + 1.0 + 1.1 + 1.1 + + + + + + + boost.boosters + boost-ee8-apis-bom + 0.1-SNAPSHOT + + + org.eclipse.microprofile.config + microprofile-config-api + ${config-version} + + + org.eclipse.microprofile.fault-tolerance + microprofile-fault-tolerance-api + ${ft-version} + + + org.eclipse.microprofile.health + microprofile-health-api + ${health-version} + + + org.eclipse.microprofile.metrics + microprofile-metrics-api + ${metrics-version} + + + org.eclipse.microprofile.jwt + microprofile-jwt-auth-api + ${jwt-version} + + + org.eclipse.microprofile.openapi + microprofile-openapi-api + ${openapi-version} + + + org.eclipse.microprofile.rest.client + microprofile-rest-client-api + ${rest-client-version} + + + org.eclipse.microprofile.opentracing + microprofile-opentracing-api + ${opentracing-version} + + + + + diff --git a/boost-maven/boost-boms/boost-mp20-apis-bom/pom.xml b/boost-maven/boost-boms/boost-mp20-apis-bom/pom.xml index 0c289bfd..5554f2b9 100644 --- a/boost-maven/boost-boms/boost-mp20-apis-bom/pom.xml +++ b/boost-maven/boost-boms/boost-mp20-apis-bom/pom.xml @@ -1,30 +1,23 @@ - - 4.0.0 + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 which accompanies this distribution, + and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: + IBM Corporation - initial API and implementation --> + + 4.0.0 boost.boosters boost-mp20-apis-bom - + 0.1-SNAPSHOT pom - Booster MP20 APIs Bom - + Booster MP20 APIs Bom + - - 2.0 - 2.1 - 1.1 - 1.0 - 1.2 - + 1.3 1.1 1.0 @@ -38,26 +31,11 @@ - - javax.enterprise - cdi-api - ${cdi-version} - - - javax.ws.rs - javax.ws.rs-api - ${jaxrs-version} - - - javax.json - javax.json-api - ${jsonp-version} - - - javax.annotation - javax.annotation-api - ${annotation-version} - + + boost.boosters + boost-ee8-apis-bom + 0.1-SNAPSHOT + org.eclipse.microprofile.config microprofile-config-api @@ -98,21 +76,6 @@ microprofile-opentracing-api ${opentracing-version} - - boost.boosters - jaxrs - ${jaxrs-version} - - - boost.boosters - cdi - ${cdi-version} - - - boost.boosters - jsonp - ${jsonp-version} - diff --git a/boost-maven/boost-boms/boost-mp21-apis-bom/pom.xml b/boost-maven/boost-boms/boost-mp21-apis-bom/pom.xml new file mode 100644 index 00000000..22b2a3a0 --- /dev/null +++ b/boost-maven/boost-boms/boost-mp21-apis-bom/pom.xml @@ -0,0 +1,81 @@ + + + 4.0.0 + + boost.boosters + boost-mp21-apis-bom + + 0.1-SNAPSHOT + pom + + Booster MP21 APIs Bom + + + + 1.3 + 1.1 + 1.0 + 1.1 + 1.1 + 1.0 + 1.1 + 1.2 + + + + + + + boost.boosters + boost-ee8-apis-bom + 0.1-SNAPSHOT + + + org.eclipse.microprofile.config + microprofile-config-api + ${config-version} + + + org.eclipse.microprofile.fault-tolerance + microprofile-fault-tolerance-api + ${ft-version} + + + org.eclipse.microprofile.health + microprofile-health-api + ${health-version} + + + org.eclipse.microprofile.metrics + microprofile-metrics-api + ${metrics-version} + + + org.eclipse.microprofile.jwt + microprofile-jwt-auth-api + ${jwt-version} + + + org.eclipse.microprofile.openapi + microprofile-openapi-api + ${openapi-version} + + + org.eclipse.microprofile.rest.client + microprofile-rest-client-api + ${rest-client-version} + + + org.eclipse.microprofile.opentracing + microprofile-opentracing-api + ${opentracing-version} + + + + + diff --git a/boost-maven/boost-boms/booster-ee7-bom/pom.xml b/boost-maven/boost-boms/booster-ee7-bom/pom.xml index e8ffcf0b..5334e18d 100644 --- a/boost-maven/boost-boms/booster-ee7-bom/pom.xml +++ b/boost-maven/boost-boms/booster-ee7-bom/pom.xml @@ -1,64 +1,76 @@ - - 4.0.0 + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 which accompanies this distribution, + and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: + IBM Corporation - initial API and implementation --> + + 4.0.0 - - boost - boost-maven-parent - 0.1.3-SNAPSHOT - ../.. - + + boost + boost-maven-parent + 0.1.3-SNAPSHOT + ../.. + - boost.boosters - ee7-bom - pom + boost.boosters + ee7-bom + pom - Booster EE7 Feature Bom + Booster EE7 Feature Bom - - - - boost.boosters - boost-ee7-apis-bom - 0.1-SNAPSHOT - import - pom - - - boost.runtimes - runtimes-bom - 0.1.3-SNAPSHOT - import - pom - - - boost.boosters - jaxrs - - - - 0.1-SNAPSHOT - provided - - - boost.boosters - jdbc - 0.1-SNAPSHOT - provided - - - boost.boosters - jpa - 0.1-SNAPSHOT - provided - - - + + + + boost.boosters + boost-ee7-apis-bom + 0.1-SNAPSHOT + import + pom + + + boost.runtimes + runtimes-bom + 0.1.3-SNAPSHOT + import + pom + + + boost.boosters + jaxrs + + + + 2.0.M1-SNAPSHOT + provided + + + boost.boosters + jdbc + 0.1-SNAPSHOT + provided + + + boost.boosters + jpa + 2.1.M1-SNAPSHOT + provided + + + boost.boosters + cdi + 1.2.M1-SNAPSHOT + provided + + + boost.boosters + jsonp + 1.0.M1-SNAPSHOT + provided + + + diff --git a/boost-maven/boost-boms/booster-ee8-bom/pom.xml b/boost-maven/boost-boms/booster-ee8-bom/pom.xml index a9b98643..555a4018 100644 --- a/boost-maven/boost-boms/booster-ee8-bom/pom.xml +++ b/boost-maven/boost-boms/booster-ee8-bom/pom.xml @@ -1,74 +1,74 @@ - - 4.0.0 + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 which accompanies this distribution, + and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: + IBM Corporation - initial API and implementation --> + + 4.0.0 - - boost - boost-maven-parent - 0.1.3-SNAPSHOT - ../.. - + + boost + boost-maven-parent + 0.1.3-SNAPSHOT + ../.. + - boost.boosters - ee8-bom - pom + boost.boosters + ee8-bom + pom - Booster EE8 Feature Bom + Booster EE8 Feature Bom - - - - boost.boosters - boost-ee8-apis-bom - 0.1-SNAPSHOT - import - pom - - - boost.runtimes - runtimes-bom - 0.1.3-SNAPSHOT - import - pom - - - boost.boosters - jaxrs - - - - 0.2-SNAPSHOT - provided - - - boost.boosters - jdbc - 0.1-SNAPSHOT - provided - - - boost.boosters - jpa - 0.2-SNAPSHOT - provided - - - io.openliberty.boosters - cdi - 0.2-SNAPSHOT - - - io.openliberty.boosters - jsonp - 0.2-SNAPSHOT - - - + + + + boost.boosters + boost-ee8-apis-bom + 0.1-SNAPSHOT + import + pom + + + boost.runtimes + runtimes-bom + 0.1.3-SNAPSHOT + import + pom + + + boost.boosters + jaxrs + + + + 2.1.M1-SNAPSHOT + provided + + + boost.boosters + jdbc + 0.1-SNAPSHOT + provided + + + boost.boosters + jpa + 2.2.M1-SNAPSHOT + provided + + + boost.boosters + cdi + 2.0.M1-SNAPSHOT + + + boost.boosters + jsonp + 1.1.M1-SNAPSHOT + + + diff --git a/boost-maven/boost-boms/booster-mp14-bom/pom.xml b/boost-maven/boost-boms/booster-mp14-bom/pom.xml new file mode 100644 index 00000000..c8e8b6fd --- /dev/null +++ b/boost-maven/boost-boms/booster-mp14-bom/pom.xml @@ -0,0 +1,90 @@ + + + 4.0.0 + + + boost + boost-maven-parent + 0.1.3-SNAPSHOT + ../.. + + + boost.boosters + mp14-bom + pom + + Booster MP14 Feature Bom + + + + + boost.boosters + boost-mp14-apis-bom + 0.1-SNAPSHOT + import + pom + + + boost.boosters + ee8-bom + 0.1.3-SNAPSHOT + import + pom + + + boost.boosters + mpHealth + 1.0.M1-SNAPSHOT + provided + + + boost.boosters + mpConfig + 1.3.M1-SNAPSHOT + provided + + + boost.boosters + mpOpenTracing + 1.1.M1-SNAPSHOT + provided + + + boost.boosters + mpMetrics + 1.1.M1-SNAPSHOT + provided + + + boost.boosters + mpRestClient + 1.1.M1-SNAPSHOT + provided + + + boost.boosters + jaxrs + 2.0.M1-SNAPSHOT + provided + + + boost.boosters + jsonp + 1.0.M1-SNAPSHOT + provided + + + boost.boosters + cdi + 1.2.M1-SNAPSHOT + provided + + + + + diff --git a/boost-maven/boost-boms/booster-mp20-bom/pom.xml b/boost-maven/boost-boms/booster-mp20-bom/pom.xml index 2a9b3192..5bdf4ab1 100644 --- a/boost-maven/boost-boms/booster-mp20-bom/pom.xml +++ b/boost-maven/boost-boms/booster-mp20-bom/pom.xml @@ -1,79 +1,108 @@ - - 4.0.0 + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 which accompanies this distribution, + and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: + IBM Corporation - initial API and implementation --> + + 4.0.0 - - boost - boost-maven-parent - 0.1.3-SNAPSHOT - ../.. - + + boost + boost-maven-parent + 0.1.3-SNAPSHOT + ../.. + - boost.boosters - mp20-bom - pom + boost.boosters + mp20-bom + pom - Booster MP20 Feature Bom + Booster MP20 Feature Bom - - - - boost.boosters - boost-mp20-apis-bom - 0.1-SNAPSHOT - import - pom - - - boost.boosters - ee8-bom - 0.1.3-SNAPSHOT - import - pom - - - boost.boosters - mpHealth - 0.2-SNAPSHOT - provided - - - boost.boosters - mpConfig - 0.2-SNAPSHOT - provided - - - boost.boosters - mpRestClient - 0.2-SNAPSHOT - provided - - - boost.boosters - jaxrs - 0.2-SNAPSHOT - provided - - - boost.boosters - jsonp - 0.2-SNAPSHOT - provided - - - boost.boosters - cdi - 0.2-SNAPSHOT - provided - - - + + + + boost.boosters + boost-mp20-apis-bom + 0.1-SNAPSHOT + import + pom + + + boost.boosters + ee8-bom + 0.1.3-SNAPSHOT + import + pom + + + boost.boosters + mpHealth + 1.0.M1-SNAPSHOT + provided + + + boost.boosters + mpConfig + 1.3.M1-SNAPSHOT + provided + + + boost.boosters + mpRestClient + 1.1.M1-SNAPSHOT + provided + + + boost.boosters + jaxrs + 2.1.M1-SNAPSHOT + provided + + + boost.boosters + jsonp + 1.1.M1-SNAPSHOT + provided + + + boost.boosters + cdi + 2.0.M1-SNAPSHOT + provided + + + boost.boosters + mpOpenTracing + 1.1.M1-SNAPSHOT + provided + + + boost.boosters + mpMetrics + 1.1.M1-SNAPSHOT + provided + + + boost.boosters + mpOpenAPI + 1.0.M1-SNAPSHOT + provided + + + boost.boosters + fault-tolerance + 1.1.M1-SNAPSHOT + provided + + + boost.boosters + jsonb + 1.0.M1-SNAPSHOT + provided + + + diff --git a/boost-maven/boost-boms/booster-mp21-bom/pom.xml b/boost-maven/boost-boms/booster-mp21-bom/pom.xml new file mode 100644 index 00000000..c221a110 --- /dev/null +++ b/boost-maven/boost-boms/booster-mp21-bom/pom.xml @@ -0,0 +1,108 @@ + + + 4.0.0 + + + boost + boost-maven-parent + 0.1.3-SNAPSHOT + ../.. + + + boost.boosters + mp21-bom + pom + + Booster MP21 Feature Bom + + + + + boost.boosters + boost-mp21-apis-bom + 0.1-SNAPSHOT + import + pom + + + boost.boosters + ee8-bom + 0.1.3-SNAPSHOT + import + pom + + + boost.boosters + mpHealth + 1.0.0.M1-SNAPSHOT + provided + + + boost.boosters + mpConfig + 1.3.M1-SNAPSHOT + provided + + + boost.boosters + mpOpenAPI + 1.0.M1-SNAPSHOT + provided + + + boost.boosters + mpRestClient + 1.1.M1-SNAPSHOT + provided + + + boost.boosters + jaxrs + 2.1.M1-SNAPSHOT + provided + + + boost.boosters + jsonp + 1.1.M1-SNAPSHOT + provided + + + boost.boosters + cdi + 2.0.M1-SNAPSHOT + provided + + + boost.boosters + mpOpenTracing + 1.2.M1-SNAPSHOT + provided + + + boost.boosters + jsonb + 1.0.M1-SNAPSHOT + provided + + + boost.boosters + mpMetrics + 1.1.M1-SNAPSHOT + provided + + + boost.boosters + fault-tolerance + 1.1.M1-SNAPSHOT + provided + + + + + diff --git a/boost-maven/boost-boms/booster-runtimes-bom/pom.xml b/boost-maven/boost-boms/booster-runtimes-bom/pom.xml index 15a44773..6c7218ea 100644 --- a/boost-maven/boost-boms/booster-runtimes-bom/pom.xml +++ b/boost-maven/boost-boms/booster-runtimes-bom/pom.xml @@ -1,46 +1,41 @@ - - 4.0.0 + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 which accompanies this distribution, + and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: + IBM Corporation - initial API and implementation --> + + 4.0.0 - - boost - boost-maven-parent - 0.1.3-SNAPSHOT - ../.. - + + boost + boost-maven-parent + 0.1.3-SNAPSHOT + ../.. + - boost.runtimes - runtimes-bom - pom + boost.runtimes + runtimes-bom + pom - Booster Supported Runtimes BOM + Booster Supported Runtimes BOM - - - - boost.runtimes - openliberty - 0.1-SNAPSHOT - - - - boost.runtimes - tomee - 0.1-SNAPSHOT - - - + + + + boost.runtimes + openliberty + 0.1-SNAPSHOT + + + + boost.runtimes + tomee + 0.1-SNAPSHOT + + + diff --git a/boost-maven/boost-boms/pom.xml b/boost-maven/boost-boms/pom.xml index c6c8f044..ed47b18c 100644 --- a/boost-maven/boost-boms/pom.xml +++ b/boost-maven/boost-boms/pom.xml @@ -1,11 +1,10 @@ - + This program and the accompanying materials are made available under the + terms of the Eclipse Public License v1.0 which accompanies this distribution, + and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: + IBM Corporation - initial API and implementation --> + 4.0.0 @@ -13,19 +12,22 @@ boost-maven-parent 0.1.3-SNAPSHOT - - boost-boms - pom - - - boost-ee7-apis-bom - booster-ee7-bom - boost-ee8-apis-bom - booster-ee8-bom - boost-mp20-apis-bom - booster-mp20-bom - booster-runtimes-bom - + + boost-boms + pom + + + boost-ee7-apis-bom + booster-ee7-bom + boost-ee8-apis-bom + booster-ee8-bom + boost-mp14-apis-bom + booster-mp14-bom + boost-mp20-apis-bom + booster-mp20-bom + boost-mp21-apis-bom + booster-runtimes-bom + diff --git a/boost-maven/boost-boosters/booster-cdi-ee8/pom.xml b/boost-maven/boost-boosters/booster-cdi-ee8/pom.xml deleted file mode 100644 index 0111d9b5..00000000 --- a/boost-maven/boost-boosters/booster-cdi-ee8/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - boost.boosters - cdi - 0.2-SNAPSHOT - - - - - boost.boosters - boost-mp20-apis-bom - 0.1-SNAPSHOT - import - pom - - - - - - - javax.enterprise - cdi-api - - - - diff --git a/boost-maven/boost-boosters/booster-cdi12/pom.xml b/boost-maven/boost-boosters/booster-cdi12/pom.xml new file mode 100644 index 00000000..dbc96b01 --- /dev/null +++ b/boost-maven/boost-boosters/booster-cdi12/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + cdi + 1.2.M1-SNAPSHOT + + + + + boost.boosters + boost-ee7-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + javax.enterprise + cdi-api + + + + diff --git a/boost-maven/boost-boosters/booster-cdi20/pom.xml b/boost-maven/boost-boosters/booster-cdi20/pom.xml new file mode 100644 index 00000000..ba3498ab --- /dev/null +++ b/boost-maven/boost-boosters/booster-cdi20/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + cdi + 2.0.M1-SNAPSHOT + + + + + boost.boosters + boost-ee8-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + javax.enterprise + cdi-api + + + + diff --git a/boost-maven/boost-boosters/booster-jaxrs-ee7/pom.xml b/boost-maven/boost-boosters/booster-jaxrs-ee7/pom.xml deleted file mode 100644 index 13906ca3..00000000 --- a/boost-maven/boost-boosters/booster-jaxrs-ee7/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - boost.boosters - jaxrs - 0.1-SNAPSHOT - - - - - boost.boosters - boost-ee7-apis-bom - 0.1-SNAPSHOT - import - pom - - - - - - - javax.ws.rs - javax.ws.rs-api - - - - \ No newline at end of file diff --git a/boost-maven/boost-boosters/booster-jaxrs-ee8/pom.xml b/boost-maven/boost-boosters/booster-jaxrs-ee8/pom.xml deleted file mode 100644 index 6be34ff8..00000000 --- a/boost-maven/boost-boosters/booster-jaxrs-ee8/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - boost.boosters - jaxrs - 0.2-SNAPSHOT - - - - - boost.boosters - boost-ee8-apis-bom - 0.1-SNAPSHOT - import - pom - - - - - - - javax.ws.rs - javax.ws.rs-api - - - - diff --git a/boost-maven/boost-boosters/booster-jaxrs20/pom.xml b/boost-maven/boost-boosters/booster-jaxrs20/pom.xml new file mode 100644 index 00000000..5c3e13ff --- /dev/null +++ b/boost-maven/boost-boosters/booster-jaxrs20/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + jaxrs + 2.0.M1-SNAPSHOT + + + + + boost.boosters + boost-ee7-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + javax.ws.rs + javax.ws.rs-api + + + + \ No newline at end of file diff --git a/boost-maven/boost-boosters/booster-jaxrs21/pom.xml b/boost-maven/boost-boosters/booster-jaxrs21/pom.xml new file mode 100644 index 00000000..95522387 --- /dev/null +++ b/boost-maven/boost-boosters/booster-jaxrs21/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + jaxrs + 2.1.M1-SNAPSHOT + + + + + boost.boosters + boost-ee8-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + javax.ws.rs + javax.ws.rs-api + + + + diff --git a/boost-maven/boost-boosters/booster-jdbc/pom.xml b/boost-maven/boost-boosters/booster-jdbc/pom.xml index 9979390d..d0593ff8 100644 --- a/boost-maven/boost-boosters/booster-jdbc/pom.xml +++ b/boost-maven/boost-boosters/booster-jdbc/pom.xml @@ -1,11 +1,10 @@ - - 4.0.0 + + 4.0.0 + + boost.boosters + jdbc + 0.1-SNAPSHOT - boost.boosters - jdbc - 0.1-SNAPSHOT - \ No newline at end of file diff --git a/boost-maven/boost-boosters/booster-jpa-ee7/pom.xml b/boost-maven/boost-boosters/booster-jpa-ee7/pom.xml deleted file mode 100644 index 8d5125b8..00000000 --- a/boost-maven/boost-boosters/booster-jpa-ee7/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - - boost.boosters - jpa - 0.1-SNAPSHOT - - - - - boost.boosters - boost-ee7-apis-bom - 0.1-SNAPSHOT - import - pom - - - boost.boosters - ee7-bom - 0.1.3-SNAPSHOT - import - pom - - - - - - - - boost.boosters - jdbc - compile - - - - - org.eclipse.persistence - javax.persistence - - - javax.transaction - javax.transaction-api - - - - diff --git a/boost-maven/boost-boosters/booster-jpa-ee8/pom.xml b/boost-maven/boost-boosters/booster-jpa-ee8/pom.xml deleted file mode 100644 index afb963f9..00000000 --- a/boost-maven/boost-boosters/booster-jpa-ee8/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - - boost.boosters - jpa - 0.2-SNAPSHOT - - - - - boost.boosters - boost-ee8-apis-bom - 0.1-SNAPSHOT - import - pom - - - boost.boosters - ee8-bom - 0.1.3-SNAPSHOT - import - pom - - - - - - - - boost.boosters - jdbc - compile - - - - - org.eclipse.persistence - javax.persistence - - - javax.transaction - javax.transaction-api - - - - diff --git a/boost-maven/boost-boosters/booster-jpa21/pom.xml b/boost-maven/boost-boosters/booster-jpa21/pom.xml new file mode 100644 index 00000000..da13dc96 --- /dev/null +++ b/boost-maven/boost-boosters/booster-jpa21/pom.xml @@ -0,0 +1,48 @@ + + + 4.0.0 + + boost.boosters + jpa + 2.1.M1-SNAPSHOT + + + + + boost.boosters + boost-ee7-apis-bom + 0.1-SNAPSHOT + import + pom + + + boost.boosters + ee7-bom + 0.1.3-SNAPSHOT + import + pom + + + + + + + + boost.boosters + jdbc + compile + + + + + org.eclipse.persistence + javax.persistence + + + javax.transaction + javax.transaction-api + + + + diff --git a/boost-maven/boost-boosters/booster-jpa22/pom.xml b/boost-maven/boost-boosters/booster-jpa22/pom.xml new file mode 100644 index 00000000..6e56352e --- /dev/null +++ b/boost-maven/boost-boosters/booster-jpa22/pom.xml @@ -0,0 +1,48 @@ + + + 4.0.0 + + boost.boosters + jpa + 2.2.M1-SNAPSHOT + + + + + boost.boosters + boost-ee7-apis-bom + 0.1-SNAPSHOT + import + pom + + + boost.boosters + ee7-bom + 0.1.3-SNAPSHOT + import + pom + + + + + + + + boost.boosters + jdbc + compile + + + + + org.eclipse.persistence + javax.persistence + + + javax.transaction + javax.transaction-api + + + + diff --git a/boost-maven/boost-boosters/booster-jsonb10/pom.xml b/boost-maven/boost-boosters/booster-jsonb10/pom.xml new file mode 100644 index 00000000..7513648c --- /dev/null +++ b/boost-maven/boost-boosters/booster-jsonb10/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + jsonb + 1.0.M1-SNAPSHOT + + + + + boost.boosters + boost-ee8-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + javax.json.bind + javax.json.bind-api + + + + diff --git a/boost-maven/boost-boosters/booster-jsonp-ee8/pom.xml b/boost-maven/boost-boosters/booster-jsonp-ee8/pom.xml deleted file mode 100644 index 901d3ca8..00000000 --- a/boost-maven/boost-boosters/booster-jsonp-ee8/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - boost.boosters - jsonp - 0.2-SNAPSHOT - - - - - boost.boosters - boost-mp20-apis-bom - 0.1-SNAPSHOT - import - pom - - - - - - - javax.json - javax.json-api - - - - diff --git a/boost-maven/boost-boosters/booster-jsonp10/pom.xml b/boost-maven/boost-boosters/booster-jsonp10/pom.xml new file mode 100644 index 00000000..106715f3 --- /dev/null +++ b/boost-maven/boost-boosters/booster-jsonp10/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + jsonp + 1.0.M1-SNAPSHOT + + + + + boost.boosters + boost-ee7-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + javax.json + javax.json-api + + + + diff --git a/boost-maven/boost-boosters/booster-jsonp11/pom.xml b/boost-maven/boost-boosters/booster-jsonp11/pom.xml new file mode 100644 index 00000000..99b9b15a --- /dev/null +++ b/boost-maven/boost-boosters/booster-jsonp11/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + jsonp + 1.1.M1-SNAPSHOT + + + + + boost.boosters + boost-ee8-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + javax.json + javax.json-api + + + + diff --git a/boost-maven/boost-boosters/booster-mpConfig-20/pom.xml b/boost-maven/boost-boosters/booster-mpConfig-20/pom.xml deleted file mode 100644 index 5f152129..00000000 --- a/boost-maven/boost-boosters/booster-mpConfig-20/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - boost.boosters - mpConfig - 0.2-SNAPSHOT - - - - - boost.boosters - boost-mp20-apis-bom - 0.1-SNAPSHOT - import - pom - - - - - - - org.eclipse.microprofile.config - microprofile-config-api - - - - diff --git a/boost-maven/boost-boosters/booster-mpConfig13/pom.xml b/boost-maven/boost-boosters/booster-mpConfig13/pom.xml new file mode 100644 index 00000000..ab8bad80 --- /dev/null +++ b/boost-maven/boost-boosters/booster-mpConfig13/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + mpConfig + 1.3.M1-SNAPSHOT + + + + + boost.boosters + boost-mp14-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + org.eclipse.microprofile.config + microprofile-config-api + + + + diff --git a/boost-maven/boost-boosters/booster-mpFaultTolerance11/pom.xml b/boost-maven/boost-boosters/booster-mpFaultTolerance11/pom.xml new file mode 100644 index 00000000..000bc401 --- /dev/null +++ b/boost-maven/boost-boosters/booster-mpFaultTolerance11/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + mpFaultTolerance + 1.1.M1-SNAPSHOT + + + + + boost.boosters + boost-mp14-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + org.eclipse.microprofile.fault-tolerance + microprofile-fault-tolerance-api + + + + diff --git a/boost-maven/boost-boosters/booster-mpFaultTolerance20/pom.xml b/boost-maven/boost-boosters/booster-mpFaultTolerance20/pom.xml new file mode 100644 index 00000000..5dfbd411 --- /dev/null +++ b/boost-maven/boost-boosters/booster-mpFaultTolerance20/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + mpFaultTolerance + 2.0.M1-SNAPSHOT + + + + + boost.boosters + boost-mp22-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + org.eclipse.microprofile.fault-tolerance + microprofile-fault-tolerance-api + + + + diff --git a/boost-maven/boost-boosters/booster-mpHealth-20/pom.xml b/boost-maven/boost-boosters/booster-mpHealth-20/pom.xml deleted file mode 100644 index 55dab55d..00000000 --- a/boost-maven/boost-boosters/booster-mpHealth-20/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - boost.boosters - mpHealth - 0.2-SNAPSHOT - - - - - boost.boosters - boost-mp20-apis-bom - 0.1-SNAPSHOT - import - pom - - - - - - - org.eclipse.microprofile.health - microprofile-health-api - - - - diff --git a/boost-maven/boost-boosters/booster-mpHealth10/pom.xml b/boost-maven/boost-boosters/booster-mpHealth10/pom.xml new file mode 100644 index 00000000..166e1828 --- /dev/null +++ b/boost-maven/boost-boosters/booster-mpHealth10/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + mpHealth + 1.0.M1-SNAPSHOT + + + + + boost.boosters + boost-mp14-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + org.eclipse.microprofile.health + microprofile-health-api + + + + diff --git a/boost-maven/boost-boosters/booster-mpMetrics11/pom.xml b/boost-maven/boost-boosters/booster-mpMetrics11/pom.xml new file mode 100644 index 00000000..32883f99 --- /dev/null +++ b/boost-maven/boost-boosters/booster-mpMetrics11/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + mpMetrics + 1.1.M1-SNAPSHOT + + + + + boost.boosters + boost-mp14-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + org.eclipse.microprofile.metrics + microprofile-metrics-api + + + + diff --git a/boost-maven/boost-boosters/booster-mpOpenAPI10/pom.xml b/boost-maven/boost-boosters/booster-mpOpenAPI10/pom.xml new file mode 100644 index 00000000..05f78334 --- /dev/null +++ b/boost-maven/boost-boosters/booster-mpOpenAPI10/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + mpOpenAPI + 1.0.M1-SNAPSHOT + + + + + boost.boosters + boost-mp14-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + org.eclipse.microprofile.openapi + microprofile-openapi-api + + + + diff --git a/boost-maven/boost-boosters/booster-mpOpenAPI11/pom.xml b/boost-maven/boost-boosters/booster-mpOpenAPI11/pom.xml new file mode 100644 index 00000000..aad83f7c --- /dev/null +++ b/boost-maven/boost-boosters/booster-mpOpenAPI11/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + mpOpenAPI + 1.1.M1-SNAPSHOT + + + + + boost.boosters + boost-mp22-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + org.eclipse.microprofile.openapi + microprofile-openapi-api + + + + diff --git a/boost-maven/boost-boosters/booster-mpOpenTracing-20/pom.xml b/boost-maven/boost-boosters/booster-mpOpenTracing-20/pom.xml deleted file mode 100644 index c0b8a741..00000000 --- a/boost-maven/boost-boosters/booster-mpOpenTracing-20/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - boost.boosters - mpOpenTracing - 0.2-SNAPSHOT - - - - - boost.boosters - boost-mp20-apis-bom - 0.1-SNAPSHOT - import - pom - - - - - - - org.eclipse.microprofile.opentracing - microprofile-opentracing-api - - - - diff --git a/boost-maven/boost-boosters/booster-mpOpenTracing11/pom.xml b/boost-maven/boost-boosters/booster-mpOpenTracing11/pom.xml new file mode 100644 index 00000000..2cc3bbcd --- /dev/null +++ b/boost-maven/boost-boosters/booster-mpOpenTracing11/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + mpOpenTracing + 1.1.M1-SNAPSHOT + + + + + boost.boosters + boost-mp14-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + org.eclipse.microprofile.opentracing + microprofile-opentracing-api + + + + diff --git a/boost-maven/boost-boosters/booster-mpOpenTracing12/pom.xml b/boost-maven/boost-boosters/booster-mpOpenTracing12/pom.xml new file mode 100644 index 00000000..4a375eb7 --- /dev/null +++ b/boost-maven/boost-boosters/booster-mpOpenTracing12/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + mpOpenTracing + 1.2.M1-SNAPSHOT + + + + + boost.boosters + boost-mp20-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + org.eclipse.microprofile.opentracing + microprofile-opentracing-api + + + + diff --git a/boost-maven/boost-boosters/booster-mpOpenTracing13/pom.xml b/boost-maven/boost-boosters/booster-mpOpenTracing13/pom.xml new file mode 100644 index 00000000..12147bd8 --- /dev/null +++ b/boost-maven/boost-boosters/booster-mpOpenTracing13/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + mpOpenTracing + 1.3.M1-SNAPSHOT + + + + + boost.boosters + boost-mp22-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + org.eclipse.microprofile.opentracing + microprofile-opentracing-api + + + + diff --git a/boost-maven/boost-boosters/booster-mpRestClient-20/pom.xml b/boost-maven/boost-boosters/booster-mpRestClient-20/pom.xml deleted file mode 100644 index 7d227803..00000000 --- a/boost-maven/boost-boosters/booster-mpRestClient-20/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - boost.boosters - mpRestClient - 0.2-SNAPSHOT - - - - - boost.boosters - boost-mp20-apis-bom - 0.1-SNAPSHOT - import - pom - - - - - - - org.eclipse.microprofile.rest.client - microprofile-rest-client-api - - - - diff --git a/boost-maven/boost-boosters/booster-mpRestClient11/pom.xml b/boost-maven/boost-boosters/booster-mpRestClient11/pom.xml new file mode 100644 index 00000000..1eb80b17 --- /dev/null +++ b/boost-maven/boost-boosters/booster-mpRestClient11/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + mpRestClient + 1.1.M1-SNAPSHOT + + + + + boost.boosters + boost-mp14-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + org.eclipse.microprofile.rest.client + microprofile-rest-client-api + + + + diff --git a/boost-maven/boost-boosters/booster-mpRestClient12/pom.xml b/boost-maven/boost-boosters/booster-mpRestClient12/pom.xml new file mode 100644 index 00000000..ac00dc64 --- /dev/null +++ b/boost-maven/boost-boosters/booster-mpRestClient12/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + boost.boosters + mpRestClient + 1.2.M1-SNAPSHOT + + + + + boost.boosters + boost-mp22-apis-bom + 0.1-SNAPSHOT + import + pom + + + + + + + org.eclipse.microprofile.rest.client + microprofile-rest-client-api + + + + diff --git a/boost-maven/boost-boosters/pom.xml b/boost-maven/boost-boosters/pom.xml index 410a91a8..e29de7cc 100644 --- a/boost-maven/boost-boosters/pom.xml +++ b/boost-maven/boost-boosters/pom.xml @@ -1,29 +1,36 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - boost - boost-maven-parent - 0.1.3-SNAPSHOT - + + boost + boost-maven-parent + 0.1.3-SNAPSHOT + boost-boosters pom - booster-jaxrs-ee7 - booster-jaxrs-ee8 - booster-cdi-ee8 + booster-jaxrs20 + booster-jaxrs21 + booster-cdi12 + booster-cdi20 booster-jdbc - booster-jpa-ee7 - booster-jpa-ee8 - booster-jsonp-ee8 - booster-mpConfig-20 - booster-mpHealth-20 - booster-mpOpenTracing-20 - booster-mpRestClient-20 + booster-jpa21 + booster-jpa22 + booster-jsonb10 + booster-jsonp10 + booster-jsonp11 + booster-mpConfig13 + booster-mpMetrics11 + booster-mpFaultTolerance11 + booster-mpHealth10 + booster-mpOpenAPI10 + booster-mpOpenTracing11 + booster-mpOpenTracing12 + booster-mpRestClient11 diff --git a/boost-maven/boost-maven-plugin/pom.xml b/boost-maven/boost-maven-plugin/pom.xml index 17d2ba51..809f1149 100644 --- a/boost-maven/boost-maven-plugin/pom.xml +++ b/boost-maven/boost-maven-plugin/pom.xml @@ -4,150 +4,151 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html Contributors: IBM Corporation - initial API and implementation --> - - 4.0.0 + + 4.0.0 - - boost - boost-maven-parent - 0.1.3-SNAPSHOT - + + boost + boost-maven-parent + 0.1.3-SNAPSHOT + - boost-maven-plugin - maven-plugin + boost-maven-plugin + maven-plugin - + - - - boost - boost-common - 0.1.3-SNAPSHOT - - - net.wasdev.wlp.maven.plugins - liberty-maven-plugin - 2.6.3 - + + + boost + boost-common + 0.1.3-SNAPSHOT + + + net.wasdev.wlp.maven.plugins + liberty-maven-plugin + 2.6.3 + - - - org.apache.maven - maven-plugin-api - 2.0 - - - org.apache.maven.plugin-tools - maven-plugin-annotations - 3.4 - provided - - - org.twdata.maven - mojo-executor - 2.3.0 - - - org.eclipse.aether - aether-api - 0.9.0.M2 - - - org.codehaus.mojo - plugin-support - 1.0-alpha-1 - - - org.apache.maven - maven-project - - - org.apache.maven - maven-artifact - - - org.apache.maven - maven-plugin-api - - - - + + + org.apache.maven + maven-plugin-api + 2.0 + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.4 + provided + + + org.twdata.maven + mojo-executor + 2.3.0 + + + org.eclipse.aether + aether-api + 0.9.0.M2 + + + org.codehaus.mojo + plugin-support + 1.0-alpha-1 + + + org.apache.maven + maven-project + + + org.apache.maven + maven-artifact + + + org.apache.maven + maven-plugin-api + + + + - - - it - - - - org.apache.maven.plugins - maven-invoker-plugin - 3.1.0 - - false - - install - - src/it - ${project.build.directory}/it - true - - ${boostRuntime} - - 9000 - - - - - integration-test - - install - run - - - - - - - - + + + it + + + + org.apache.maven.plugins + maven-invoker-plugin + 3.1.0 + + false + + install + + src/it + ${project.build.directory}/it + true + + ${boostRuntime} + + 9000 + + + + + integration-test + + install + run + + + + + + + + - - - - ../other-legal - META-INF - - README.md - - - - - .. - - LICENSE - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.0 - - - org.apache.maven.plugins - maven-plugin-plugin - 3.5.2 - - - generated-helpmojo - - helpmojo - - - - - - + + + + ../other-legal + META-INF + + README.md + + + + + .. + + LICENSE + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.0 + + + org.apache.maven.plugins + maven-plugin-plugin + 3.5.2 + + + generated-helpmojo + + helpmojo + + + + + + diff --git a/boost-maven/boost-runtimes/pom.xml b/boost-maven/boost-runtimes/pom.xml index 4fc8d339..424d4728 100644 --- a/boost-maven/boost-runtimes/pom.xml +++ b/boost-maven/boost-runtimes/pom.xml @@ -1,21 +1,21 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - boost - boost-maven-parent - 0.1.3-SNAPSHOT - + + boost + boost-maven-parent + 0.1.3-SNAPSHOT + boost-runtimes pom - runtime-openliberty - - runtime-tomee + runtime-openliberty + + runtime-tomee diff --git a/boost-maven/boost-runtimes/runtime-openliberty/pom.xml b/boost-maven/boost-runtimes/runtime-openliberty/pom.xml index 15eb2092..e1d05c1e 100644 --- a/boost-maven/boost-runtimes/runtime-openliberty/pom.xml +++ b/boost-maven/boost-runtimes/runtime-openliberty/pom.xml @@ -1,15 +1,14 @@ - + 4.0.0 - boost.runtimes - openliberty - 0.1-SNAPSHOT + boost.runtimes + openliberty + 0.1-SNAPSHOT jar - + UTF-8 UTF-8 1.8 @@ -18,65 +17,77 @@ - boost - boost-common - 0.1.3-SNAPSHOT - + boost + boost-common + 0.1.3-SNAPSHOT + boost boost-maven-plugin 0.1.3-SNAPSHOT - - net.wasdev.wlp.maven.plugins - liberty-maven-plugin - 2.6.3 - - org.apache.maven - maven-plugin-api - 2.0 - - - org.apache.maven.plugin-tools - maven-plugin-annotations - 3.4 - provided - - - org.twdata.maven - mojo-executor - 2.3.0 - - - com.spotify - docker-client - 8.11.7 - - - org.eclipse.aether - aether-api - 0.9.0.M2 - - - org.codehaus.mojo - plugin-support - 1.0-alpha-1 - - - org.apache.maven - maven-project - - - org.apache.maven - maven-artifact - - - org.apache.maven - maven-plugin-api - - - + net.wasdev.wlp.maven.plugins + liberty-maven-plugin + 2.6.3 + + + org.apache.maven + maven-plugin-api + 2.0 + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.4 + provided + + + org.twdata.maven + mojo-executor + 2.3.0 + + + com.spotify + docker-client + 8.11.7 + + + org.eclipse.aether + aether-api + 0.9.0.M2 + + + junit + junit + 4.12 + test + + + com.github.stefanbirkner + system-rules + 1.16.0 + test + + + org.codehaus.mojo + plugin-support + 1.0-alpha-1 + + + org.apache.maven + maven-project + + + org.apache.maven + maven-artifact + + + org.apache.maven + maven-plugin-api + + + diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/CDIBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/CDIBoosterTest.java deleted file mode 100644 index db0e7766..00000000 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/CDIBoosterTest.java +++ /dev/null @@ -1,76 +0,0 @@ -package io.openliberty.boost.common.boosters; - -import static io.openliberty.boost.common.config.ConfigConstants.*; -import static io.openliberty.boost.common.utils.DOMUtils.getDirectChildrenByTag; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.TransformerException; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.contrib.java.lang.system.RestoreSystemProperties; -import org.junit.rules.TemporaryFolder; -import org.w3c.dom.Element; - -import boost.runtimes.LibertyServerConfigGenerator; - -import io.openliberty.boost.common.BoostException; -import io.openliberty.boost.common.BoostLoggerI; -import io.openliberty.boost.common.config.BoostProperties; -import io.openliberty.boost.common.config.BoosterConfigurator; -import io.openliberty.boost.common.utils.BoostUtil; -import io.openliberty.boost.common.utils.BoosterUtil; -import io.openliberty.boost.common.utils.CommonLogger; -import io.openliberty.boost.common.utils.ConfigFileUtils; - -public class CDIBoosterTest { - - @Rule - public TemporaryFolder outputDir = new TemporaryFolder(); - - @Rule - public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); - - // private Map getCDIDependency(String version) throws - // BoostException { - // return - // BoosterUtil.createDependenciesWithBoosterAndVersion(CDIBoosterConfig.class, - // version); - // } - - BoostLoggerI logger = CommonLogger.getInstance(); - - /** - * Test that the cdi-2.0 feature is added to server.xml when the CDI booster - * version is set to 0.2-SNAPSHOT - * - */ - @Test - public void testCDIBoosterFeature_20() throws Exception { - - LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( - outputDir.getRoot().getAbsolutePath(), logger); - - List boosters = BoosterConfigurator.getBoosterConfigs( - BoosterUtil.createDependenciesWithBoosterAndVersion(CDIBoosterConfig.class, "0.2-SNAPSHOT"), logger); - - System.out.println("AJM: lib feature: " + boosters.get(0).getLibertyFeature()); - serverConfig.addFeature(boosters.get(0).getLibertyFeature()); - serverConfig.writeToServer(); - - String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; - boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, "" + CDI_20 + ""); - - assertTrue("The " + CDI_20 + " feature was not found in the server configuration", featureFound); - - } - -} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/JSONPBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/JSONPBoosterTest.java deleted file mode 100644 index 7da5db74..00000000 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/JSONPBoosterTest.java +++ /dev/null @@ -1,68 +0,0 @@ -package io.openliberty.boost.common.boosters; - -import static io.openliberty.boost.common.config.ConfigConstants.*; -import static io.openliberty.boost.common.utils.DOMUtils.getDirectChildrenByTag; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.TransformerException; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.contrib.java.lang.system.RestoreSystemProperties; -import org.junit.rules.TemporaryFolder; -import org.w3c.dom.Element; - -import boost.runtimes.LibertyServerConfigGenerator; - -import io.openliberty.boost.common.BoostException; -import io.openliberty.boost.common.BoostLoggerI; -import io.openliberty.boost.common.config.BoostProperties; -import io.openliberty.boost.common.config.BoosterConfigurator; -import io.openliberty.boost.common.utils.BoostUtil; -import io.openliberty.boost.common.utils.BoosterUtil; -import io.openliberty.boost.common.utils.CommonLogger; -import io.openliberty.boost.common.utils.ConfigFileUtils; - -public class JSONPBoosterTest { - - @Rule - public TemporaryFolder outputDir = new TemporaryFolder(); - - @Rule - public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); - - BoostLoggerI logger = CommonLogger.getInstance(); - - /** - * Test that the jsonp-1.1 feature is added to server.xml when the jsonp booster - * version is set to 0.2-SNAPSHOT - * - */ - @Test - public void testJSONPBoosterFeature() throws Exception { - - LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( - outputDir.getRoot().getAbsolutePath(), logger); - - List boosters = BoosterConfigurator.getBoosterConfigs( - BoosterUtil.createDependenciesWithBoosterAndVersion(JSONPBoosterConfig.class, "0.2-SNAPSHOT"), logger); - - serverConfig.addFeature(boosters.get(0).getLibertyFeature()); - serverConfig.writeToServer(); - - String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; - boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, "" + JSONP_11 + ""); - - assertTrue("The " + JSONP_11 + " feature was not found in the server configuration", featureFound); - - } - -} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/MPConfigBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/MPConfigBoosterTest.java deleted file mode 100644 index e39ee59c..00000000 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/MPConfigBoosterTest.java +++ /dev/null @@ -1,70 +0,0 @@ -package io.openliberty.boost.common.boosters; - -import static io.openliberty.boost.common.config.ConfigConstants.*; -import static io.openliberty.boost.common.utils.DOMUtils.getDirectChildrenByTag; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.TransformerException; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.contrib.java.lang.system.RestoreSystemProperties; -import org.junit.rules.TemporaryFolder; -import org.w3c.dom.Element; - -import boost.runtimes.LibertyServerConfigGenerator; - -import io.openliberty.boost.common.BoostException; -import io.openliberty.boost.common.BoostLoggerI; -import io.openliberty.boost.common.config.BoostProperties; -import io.openliberty.boost.common.config.BoosterConfigurator; -import io.openliberty.boost.common.utils.BoostUtil; -import io.openliberty.boost.common.utils.BoosterUtil; -import io.openliberty.boost.common.utils.CommonLogger; -import io.openliberty.boost.common.utils.ConfigFileUtils; - -public class MPConfigBoosterTest { - - @Rule - public TemporaryFolder outputDir = new TemporaryFolder(); - - @Rule - public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); - - BoostLoggerI logger = CommonLogger.getInstance(); - - /** - * Test that the mpConfig-1.3 feature is added to server.xml when the MPConfig - * booster version is set to 0.2-SNAPSHOT - * - */ - @Test - public void testMPConfigBoosterFeature_MP20() throws Exception { - - LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( - outputDir.getRoot().getAbsolutePath(), logger); - - List boosters = BoosterConfigurator.getBoosterConfigs( - BoosterUtil.createDependenciesWithBoosterAndVersion(MPConfigBoosterConfig.class, "0.2-SNAPSHOT"), - logger); - - serverConfig.addFeature(boosters.get(0).getLibertyFeature()); - serverConfig.writeToServer(); - - String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; - boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, - "" + MPCONFIG_13 + ""); - - assertTrue("The " + MPCONFIG_13 + " feature was not found in the server configuration", featureFound); - - } - -} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/MPHealthBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/MPHealthBoosterTest.java deleted file mode 100644 index ed8fcfe8..00000000 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/MPHealthBoosterTest.java +++ /dev/null @@ -1,70 +0,0 @@ -package io.openliberty.boost.common.boosters; - -import static io.openliberty.boost.common.config.ConfigConstants.*; -import static io.openliberty.boost.common.utils.DOMUtils.getDirectChildrenByTag; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.TransformerException; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.contrib.java.lang.system.RestoreSystemProperties; -import org.junit.rules.TemporaryFolder; -import org.w3c.dom.Element; - -import boost.runtimes.LibertyServerConfigGenerator; - -import io.openliberty.boost.common.BoostException; -import io.openliberty.boost.common.BoostLoggerI; -import io.openliberty.boost.common.config.BoostProperties; -import io.openliberty.boost.common.config.BoosterConfigurator; -import io.openliberty.boost.common.utils.BoostUtil; -import io.openliberty.boost.common.utils.BoosterUtil; -import io.openliberty.boost.common.utils.CommonLogger; -import io.openliberty.boost.common.utils.ConfigFileUtils; - -public class MPHealthBoosterTest { - - @Rule - public TemporaryFolder outputDir = new TemporaryFolder(); - - @Rule - public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); - - BoostLoggerI logger = CommonLogger.getInstance(); - - /** - * Test that the mpHealth-1.0 feature is added to server.xml when the MPHealth - * booster version is set to 0.2-SNAPSHOT - * - */ - @Test - public void testMPHealthBoosterFeature_MP20() throws Exception { - - LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( - outputDir.getRoot().getAbsolutePath(), logger); - - List boosters = BoosterConfigurator.getBoosterConfigs( - BoosterUtil.createDependenciesWithBoosterAndVersion(MPHealthBoosterConfig.class, "0.2-SNAPSHOT"), - logger); - - serverConfig.addFeature(boosters.get(0).getLibertyFeature()); - serverConfig.writeToServer(); - - String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; - boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, - "" + MPHEALTH_10 + ""); - - assertTrue("The " + MPHEALTH_10 + " feature was not found in the server configuration", featureFound); - - } - -} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/MPOpenTracingBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/MPOpenTracingBoosterTest.java deleted file mode 100644 index a352d95a..00000000 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/MPOpenTracingBoosterTest.java +++ /dev/null @@ -1,70 +0,0 @@ -package io.openliberty.boost.common.boosters; - -import static io.openliberty.boost.common.config.ConfigConstants.*; -import static io.openliberty.boost.common.utils.DOMUtils.getDirectChildrenByTag; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.TransformerException; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.contrib.java.lang.system.RestoreSystemProperties; -import org.junit.rules.TemporaryFolder; -import org.w3c.dom.Element; - -import boost.runtimes.LibertyServerConfigGenerator; - -import io.openliberty.boost.common.BoostException; -import io.openliberty.boost.common.BoostLoggerI; -import io.openliberty.boost.common.config.BoostProperties; -import io.openliberty.boost.common.config.BoosterConfigurator; -import io.openliberty.boost.common.utils.BoostUtil; -import io.openliberty.boost.common.utils.BoosterUtil; -import io.openliberty.boost.common.utils.CommonLogger; -import io.openliberty.boost.common.utils.ConfigFileUtils; - -public class MPOpenTracingBoosterTest { - - @Rule - public TemporaryFolder outputDir = new TemporaryFolder(); - - @Rule - public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); - - BoostLoggerI logger = CommonLogger.getInstance(); - - /** - * Test that the mpOpenTracing-1.1 feature is added to server.xml when the - * MPOpenTracing booster version is set to 0.2-SNAPSHOT - * - */ - @Test - public void testMPOpenTracingBoosterFeature_MP20() throws Exception { - - LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( - outputDir.getRoot().getAbsolutePath(), logger); - - List boosters = BoosterConfigurator.getBoosterConfigs( - BoosterUtil.createDependenciesWithBoosterAndVersion(MPOpenTracingBoosterConfig.class, "0.2-SNAPSHOT"), - logger); - - serverConfig.addFeature(boosters.get(0).getLibertyFeature()); - serverConfig.writeToServer(); - - String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; - boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, - "" + MPOPENTRACING_11 + ""); - - assertTrue("The " + MPOPENTRACING_11 + " feature was not found in the server configuration", featureFound); - - } - -} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/MPRestClientBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/MPRestClientBoosterTest.java deleted file mode 100644 index 699cf21a..00000000 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/MPRestClientBoosterTest.java +++ /dev/null @@ -1,70 +0,0 @@ -package io.openliberty.boost.common.boosters; - -import static io.openliberty.boost.common.config.ConfigConstants.*; -import static io.openliberty.boost.common.utils.DOMUtils.getDirectChildrenByTag; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.TransformerException; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.contrib.java.lang.system.RestoreSystemProperties; -import org.junit.rules.TemporaryFolder; -import org.w3c.dom.Element; - -import boost.runtimes.LibertyServerConfigGenerator; - -import io.openliberty.boost.common.BoostException; -import io.openliberty.boost.common.BoostLoggerI; -import io.openliberty.boost.common.config.BoostProperties; -import io.openliberty.boost.common.config.BoosterConfigurator; -import io.openliberty.boost.common.utils.BoostUtil; -import io.openliberty.boost.common.utils.BoosterUtil; -import io.openliberty.boost.common.utils.CommonLogger; -import io.openliberty.boost.common.utils.ConfigFileUtils; - -public class MPRestClientBoosterTest { - - @Rule - public TemporaryFolder outputDir = new TemporaryFolder(); - - @Rule - public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); - - BoostLoggerI logger = CommonLogger.getInstance(); - - /** - * Test that the mpRestClient-1.1 feature is added to server.xml when the - * MPRestClient booster version is set to 0.2-SNAPSHOT - * - */ - @Test - public void testMPRestClientBoosterFeature_MP20() throws Exception { - - LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( - outputDir.getRoot().getAbsolutePath(), logger); - - List boosters = BoosterConfigurator.getBoosterConfigs( - BoosterUtil.createDependenciesWithBoosterAndVersion(MPRestClientBoosterConfig.class, "0.2-SNAPSHOT"), - logger); - - serverConfig.addFeature(boosters.get(0).getLibertyFeature()); - serverConfig.writeToServer(); - - String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; - boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, - "" + MPRESTCLIENT_11 + ""); - - assertTrue("The " + MPRESTCLIENT_11 + " feature was not found in the server configuration", featureFound); - - } - -} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/utils/BoosterUtil.java b/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/utils/BoosterUtil.java deleted file mode 100644 index 598825df..00000000 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/utils/BoosterUtil.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.openliberty.boost.common.utils; - -import java.util.HashMap; -import java.util.Map; - -import io.openliberty.boost.common.BoostException; -import io.openliberty.boost.common.boosters.AbstractBoosterConfig; -import io.openliberty.boost.common.boosters.JDBCBoosterConfig; - -public class BoosterUtil { - - public static Map createDependenciesWithBoosterAndVersion(Class booster, String version) - throws BoostException { - Map map = new HashMap(); - map.put(AbstractBoosterConfig.getCoordinates(booster), version); - return map; - } - - public static Map getJDBCDependency() throws BoostException { - return BoosterUtil.createDependenciesWithBoosterAndVersion(JDBCBoosterConfig.class, "0.1-SNAPSHOT"); - } -} \ No newline at end of file diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyCDIBoosterConfig.java b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyCDIBoosterConfig.java index 202ea448..b1567143 100644 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyCDIBoosterConfig.java +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyCDIBoosterConfig.java @@ -10,7 +10,7 @@ *******************************************************************************/ package boost.runtimes.openliberty.boosters; -import static boost.common.config.ConfigConstants.CDI_20; +import static boost.common.config.ConfigConstants.*; import java.util.Map; @@ -27,10 +27,15 @@ public LibertyCDIBoosterConfig(Map dependencies, BoostLoggerI lo } public String getFeature() { - if (getVersion().equals(MP_20_VERSION)) { + if (getVersion().equals(CDI_VERSION_20)) { return CDI_20; } - return null; + if (getVersion().equals(CDI_VERSION_12)) { + return CDI_12; + } + else { + return null; + } } public void addServerConfig(LibertyServerConfigGenerator libertyServerConfigGenerator) { diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJaxRSBoosterConfig.java b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJAXRSBoosterConfig.java similarity index 84% rename from boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJaxRSBoosterConfig.java rename to boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJAXRSBoosterConfig.java index f9c1c85a..1b6792a1 100644 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJaxRSBoosterConfig.java +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJAXRSBoosterConfig.java @@ -21,17 +21,17 @@ import boost.runtimes.openliberty.LibertyServerConfigGenerator; import boost.runtimes.openliberty.boosters.LibertyBoosterI; -public class LibertyJaxRSBoosterConfig extends JAXRSBoosterConfig implements LibertyBoosterI { +public class LibertyJAXRSBoosterConfig extends JAXRSBoosterConfig implements LibertyBoosterI { - public LibertyJaxRSBoosterConfig(Map dependencies, BoostLoggerI logger) throws BoostException { + public LibertyJAXRSBoosterConfig(Map dependencies, BoostLoggerI logger) throws BoostException { super(dependencies, logger); } @Override public String getFeature() { - if (getVersion().equals(EE_7_VERSION)) { + if (getVersion().equals(JAXRS_VERSION_20)) { return JAXRS_20; - } else if (getVersion().equals(EE_8_VERSION)) { + } else if (getVersion().equals(JAXRS_VERSION_21)) { return JAXRS_21; } return null; diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJPABoosterConfig.java b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJPABoosterConfig.java index 69498982..06eb254b 100644 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJPABoosterConfig.java +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJPABoosterConfig.java @@ -29,9 +29,9 @@ public LibertyJPABoosterConfig(Map dependencies, BoostLoggerI lo @Override public String getFeature() { - if (getVersion().equals(EE_7_VERSION)) { + if (getVersion().equals(JPA_VERSION_21)) { return JPA_21; - } else if (getVersion().equals(EE_8_VERSION)) { + } else if (getVersion().equals(JPA_VERSION_22)) { return JPA_22; } return null; diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJSONBBoosterConfig.java b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJSONBBoosterConfig.java new file mode 100644 index 00000000..15a7acbb --- /dev/null +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJSONBBoosterConfig.java @@ -0,0 +1,42 @@ +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package boost.runtimes.openliberty.boosters; + +import static boost.common.config.ConfigConstants.*; + +import java.util.Map; + +import boost.common.BoostException; +import boost.common.BoostLoggerI; +import boost.common.boosters.JSONBBoosterConfig; +import boost.common.boosters.JSONPBoosterConfig; +import boost.runtimes.openliberty.LibertyServerConfigGenerator; +import boost.runtimes.openliberty.boosters.LibertyBoosterI; + +public class LibertyJSONBBoosterConfig extends JSONBBoosterConfig implements LibertyBoosterI { + + public LibertyJSONBBoosterConfig(Map dependencies, BoostLoggerI logger) throws BoostException { + super(dependencies, logger); + } + + @Override + public String getFeature() { + if (getVersion().equals(JSONB_VERSION_10)) { + return JSONB_10; + } + return null; + } + + @Override + public void addServerConfig(LibertyServerConfigGenerator libertyServerConfigGenerator) { + + } +} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJSONPBoosterConfig.java b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJSONPBoosterConfig.java index 851d6881..3ebbde5f 100644 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJSONPBoosterConfig.java +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyJSONPBoosterConfig.java @@ -10,7 +10,7 @@ *******************************************************************************/ package boost.runtimes.openliberty.boosters; -import static boost.common.config.ConfigConstants.JSONP_11; +import static boost.common.config.ConfigConstants.*; import java.util.Map; @@ -28,7 +28,10 @@ public LibertyJSONPBoosterConfig(Map dependencies, BoostLoggerI @Override public String getFeature() { - if (getVersion().equals(MP_20_VERSION)) { + if (getVersion().equals(JSONP_VERSION_10)) { + return JSONP_10; + } + else if (getVersion().equals(JSONP_VERSION_11)) { return JSONP_11; } return null; diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPConfigBoosterConfig.java b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPConfigBoosterConfig.java index 071c7917..4a118020 100644 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPConfigBoosterConfig.java +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPConfigBoosterConfig.java @@ -28,7 +28,7 @@ public LibertyMPConfigBoosterConfig(Map dependencies, BoostLogge @Override public String getFeature() { - if (getVersion().equals(MP_20_VERSION)) { + if (getVersion().equals(MP_CONFIG_VERSION_13)) { return MPCONFIG_13; } return null; diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPFaultToleranceBoosterConfig.java b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPFaultToleranceBoosterConfig.java new file mode 100644 index 00000000..24c7b633 --- /dev/null +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPFaultToleranceBoosterConfig.java @@ -0,0 +1,41 @@ +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package boost.runtimes.openliberty.boosters; + +import static boost.common.config.ConfigConstants.MPFAULTTOLERANCE_11; + +import java.util.Map; + +import boost.common.BoostException; +import boost.common.BoostLoggerI; +import boost.common.boosters.MPFaultToleranceBoosterConfig; +import boost.runtimes.openliberty.LibertyServerConfigGenerator; +import boost.runtimes.openliberty.boosters.LibertyBoosterI; + +public class LibertyMPFaultToleranceBoosterConfig extends MPFaultToleranceBoosterConfig implements LibertyBoosterI { + + public LibertyMPFaultToleranceBoosterConfig(Map dependencies, BoostLoggerI logger) throws BoostException { + super(dependencies, logger); + } + + @Override + public String getFeature() { + if (getVersion().equals(MP_FAULTTOLERANCE_VERSION_11)) { + return MPFAULTTOLERANCE_11; + } + return null; + } + + @Override + public void addServerConfig(LibertyServerConfigGenerator libertyServerConfigGenerator) { + + } +} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPHealthBoosterConfig.java b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPHealthBoosterConfig.java index 3144ff2d..999584bd 100644 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPHealthBoosterConfig.java +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPHealthBoosterConfig.java @@ -28,7 +28,7 @@ public LibertyMPHealthBoosterConfig(Map dependencies, BoostLogge @Override public String getFeature() { - if (getVersion().equals(MP_20_VERSION)) { + if (getVersion().equals(MP_HEALTH_VERSION_10)) { return MPHEALTH_10; } return null; diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPMetricsBoosterConfig.java b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPMetricsBoosterConfig.java new file mode 100644 index 00000000..057f8c07 --- /dev/null +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPMetricsBoosterConfig.java @@ -0,0 +1,41 @@ +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package boost.runtimes.openliberty.boosters; + +import static boost.common.config.ConfigConstants.MPMETRICS_11; + +import java.util.Map; + +import boost.common.BoostException; +import boost.common.BoostLoggerI; +import boost.common.boosters.MPMetricsBoosterConfig; +import boost.runtimes.openliberty.LibertyServerConfigGenerator; +import boost.runtimes.openliberty.boosters.LibertyBoosterI; + +public class LibertyMPMetricsBoosterConfig extends MPMetricsBoosterConfig implements LibertyBoosterI { + + public LibertyMPMetricsBoosterConfig(Map dependencies, BoostLoggerI logger) throws BoostException { + super(dependencies, logger); + } + + @Override + public String getFeature() { + if (getVersion().equals(MP_METRICS_VERSION_11)) { + return MPMETRICS_11; + } + return null; + } + + @Override + public void addServerConfig(LibertyServerConfigGenerator libertyServerConfigGenerator) { + + } +} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPOpenAPIBoosterConfig.java b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPOpenAPIBoosterConfig.java new file mode 100644 index 00000000..cb194b9d --- /dev/null +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPOpenAPIBoosterConfig.java @@ -0,0 +1,41 @@ +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package boost.runtimes.openliberty.boosters; + +import static boost.common.config.ConfigConstants.MPOPENAPI_10; + +import java.util.Map; + +import boost.common.BoostException; +import boost.common.BoostLoggerI; +import boost.common.boosters.MPOpenAPIBoosterConfig; +import boost.runtimes.openliberty.LibertyServerConfigGenerator; +import boost.runtimes.openliberty.boosters.LibertyBoosterI; + +public class LibertyMPOpenAPIBoosterConfig extends MPOpenAPIBoosterConfig implements LibertyBoosterI { + + public LibertyMPOpenAPIBoosterConfig(Map dependencies, BoostLoggerI logger) throws BoostException { + super(dependencies, logger); + } + + @Override + public String getFeature() { + if (getVersion().equals(MP_OPENAPI_VERSION_10)) { + return MPOPENAPI_10; + } + return null; + } + + @Override + public void addServerConfig(LibertyServerConfigGenerator libertyServerConfigGenerator) { + + } +} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPOpenTracingBoosterConfig.java b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPOpenTracingBoosterConfig.java index b90b5143..ec19254c 100644 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPOpenTracingBoosterConfig.java +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPOpenTracingBoosterConfig.java @@ -10,7 +10,7 @@ *******************************************************************************/ package boost.runtimes.openliberty.boosters; -import static boost.common.config.ConfigConstants.MPOPENTRACING_11; +import static boost.common.config.ConfigConstants.*; import java.util.Map; @@ -29,9 +29,13 @@ public LibertyMPOpenTracingBoosterConfig(Map dependencies, Boost @Override public String getFeature() { - if (getVersion().equals(MP_20_VERSION)) { + if (getVersion().equals(MP_OPENTRACING_VERSION_11)) { return MPOPENTRACING_11; } + else if (getVersion().equals(MP_OPENTRACING_VERSION_12)) { + return MPOPENTRACING_12; + } + return null; } diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPRestClientBoosterConfig.java b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPRestClientBoosterConfig.java index fb13d9fa..33fb08eb 100644 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPRestClientBoosterConfig.java +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/main/java/boost/runtimes/openliberty/boosters/LibertyMPRestClientBoosterConfig.java @@ -29,7 +29,7 @@ public LibertyMPRestClientBoosterConfig(Map dependencies, BoostL @Override public String getFeature() { - if (getVersion().equals(MP_20_VERSION)) { + if (getVersion().equals(MP_RESTCLIENT_VERSION_11)) { return MPRESTCLIENT_11; } return null; diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/CDIBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/CDIBoosterTest.java new file mode 100644 index 00000000..c6675b03 --- /dev/null +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/CDIBoosterTest.java @@ -0,0 +1,85 @@ +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package io.openliberty.boost.runtimes.boosters; + +import static boost.common.config.ConfigConstants.*; +import static org.junit.Assert.assertTrue; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.contrib.java.lang.system.RestoreSystemProperties; +import org.junit.rules.TemporaryFolder; +import boost.runtimes.openliberty.LibertyServerConfigGenerator; + +import boost.common.BoostLoggerI; +import io.openliberty.boost.runtimes.utils.BoosterUtil; +import io.openliberty.boost.runtimes.utils.CommonLogger; +import io.openliberty.boost.runtimes.utils.ConfigFileUtils; +import boost.runtimes.openliberty.boosters.*; + +public class CDIBoosterTest { + + @Rule + public TemporaryFolder outputDir = new TemporaryFolder(); + + @Rule + public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); + + BoostLoggerI logger = CommonLogger.getInstance(); + + /** + * Test that the cdi-1.2 feature is added to server.xml when the CDI booster + * version is set to 1.2-M1-SNAPSHOT + * + */ + @Test + public void testCDIBoosterFeature_12() throws Exception { + + LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( + outputDir.getRoot().getAbsolutePath(), logger); + + LibertyCDIBoosterConfig libCDIConfig = new LibertyCDIBoosterConfig(BoosterUtil.createDependenciesWithBoosterAndVersion(LibertyCDIBoosterConfig.class, "1.2.M1-SNAPSHOT"), logger); + + serverConfig.addFeature(libCDIConfig.getFeature()); + serverConfig.writeToServer(); + + String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; + boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, "" + CDI_12 + ""); + + assertTrue("The " + CDI_12 + " feature was not found in the server configuration", featureFound); + + } + + /** + * Test that the cdi-2.0 feature is added to server.xml when the CDI booster + * version is set to 2.0-M1-SNAPSHOT + * + */ + @Test + public void testCDIBoosterFeature_20() throws Exception { + + LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( + outputDir.getRoot().getAbsolutePath(), logger); + + LibertyCDIBoosterConfig libCDIConfig = new LibertyCDIBoosterConfig(BoosterUtil.createDependenciesWithBoosterAndVersion(LibertyCDIBoosterConfig.class, "2.0.M1-SNAPSHOT"), logger); + + serverConfig.addFeature(libCDIConfig.getFeature()); + serverConfig.writeToServer(); + + String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; + boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, "" + CDI_20 + ""); + + assertTrue("The " + CDI_20 + " feature was not found in the server configuration", featureFound); + + } + +} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/JAXRSBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/JAXRSBoosterTest.java new file mode 100644 index 00000000..73d33b0f --- /dev/null +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/JAXRSBoosterTest.java @@ -0,0 +1,87 @@ +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package io.openliberty.boost.runtimes.boosters; + +import static boost.common.config.ConfigConstants.*; +import static org.junit.Assert.assertTrue; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.contrib.java.lang.system.RestoreSystemProperties; +import org.junit.rules.TemporaryFolder; +import boost.runtimes.openliberty.LibertyServerConfigGenerator; + +import boost.common.BoostLoggerI; +import io.openliberty.boost.runtimes.utils.BoosterUtil; +import io.openliberty.boost.runtimes.utils.CommonLogger; +import io.openliberty.boost.runtimes.utils.ConfigFileUtils; +import boost.runtimes.openliberty.boosters.*; + +public class JAXRSBoosterTest { + + @Rule + public TemporaryFolder outputDir = new TemporaryFolder(); + + @Rule + public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); + + BoostLoggerI logger = CommonLogger.getInstance(); + + /** + * Test that the jaxrs-2.0 feature is added to server.xml when the jaxrs booster + * version is set to 2.0-M1-SNAPSHOT + * + */ + @Test + public void testJAXRSBoosterFeature20() throws Exception { + + LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( + outputDir.getRoot().getAbsolutePath(), logger); + + LibertyJAXRSBoosterConfig libJAXRSConfig = new LibertyJAXRSBoosterConfig(BoosterUtil.createDependenciesWithBoosterAndVersion(LibertyJAXRSBoosterConfig.class, "2.0.M1-SNAPSHOT"), logger); + + + serverConfig.addFeature(libJAXRSConfig.getFeature()); + serverConfig.writeToServer(); + + String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; + boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, "" + JAXRS_20 + ""); + + assertTrue("The " + JAXRS_20 + " feature was not found in the server configuration", featureFound); + + } + + /** + * Test that the jaxrs-2.1 feature is added to server.xml when the jaxrs booster + * version is set to 2.1-M1-SNAPSHOT + * + */ + @Test + public void testJAXRSBoosterFeature21() throws Exception { + + LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( + outputDir.getRoot().getAbsolutePath(), logger); + + LibertyJAXRSBoosterConfig libJAXRSConfig = new LibertyJAXRSBoosterConfig(BoosterUtil.createDependenciesWithBoosterAndVersion(LibertyJAXRSBoosterConfig.class, "2.1.M1-SNAPSHOT"), logger); + + + serverConfig.addFeature(libJAXRSConfig.getFeature()); + serverConfig.writeToServer(); + + String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; + boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, "" + JAXRS_21 + ""); + + assertTrue("The " + JAXRS_21 + " feature was not found in the server configuration", featureFound); + + } + +} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/JDBCBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/JDBCBoosterTest.java similarity index 76% rename from boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/JDBCBoosterTest.java rename to boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/JDBCBoosterTest.java index 1a2389d1..f671897b 100644 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/boosters/JDBCBoosterTest.java +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/JDBCBoosterTest.java @@ -1,12 +1,21 @@ -package io.openliberty.boost.common.boosters; - -import static io.openliberty.boost.common.config.ConfigConstants.*; +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package io.openliberty.boost.runtimes.boosters; + +import static boost.common.config.ConfigConstants.*; import static org.junit.Assert.assertTrue; import java.io.IOException; import java.lang.reflect.InvocationTargetException; -import java.util.List; - import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; @@ -14,16 +23,15 @@ import org.junit.Test; import org.junit.contrib.java.lang.system.RestoreSystemProperties; import org.junit.rules.TemporaryFolder; +import boost.runtimes.openliberty.LibertyServerConfigGenerator; -import boost.runtimes.LibertyServerConfigGenerator; - -import io.openliberty.boost.common.BoostException; -import io.openliberty.boost.common.BoostLoggerI; -import io.openliberty.boost.common.config.BoostProperties; -import io.openliberty.boost.common.config.BoosterConfigurator; -import io.openliberty.boost.common.utils.BoosterUtil; -import io.openliberty.boost.common.utils.CommonLogger; -import io.openliberty.boost.common.utils.ConfigFileUtils; +import boost.common.BoostException; +import boost.common.BoostLoggerI; +import boost.common.config.BoostProperties; +import io.openliberty.boost.runtimes.utils.BoosterUtil; +import io.openliberty.boost.runtimes.utils.CommonLogger; +import io.openliberty.boost.runtimes.utils.ConfigFileUtils; +import boost.runtimes.openliberty.boosters.*; public class JDBCBoosterTest { @@ -59,9 +67,9 @@ public void testAddJdbcBoosterFeature_SE_16() throws Exception { // Set compiler target property System.setProperty(BoostProperties.INTERNAL_COMPILER_TARGET, "1.6"); - List boosters = BoosterConfigurator.getBoosterConfigs(BoosterUtil.getJDBCDependency(), logger); - - serverConfig.addFeature(boosters.get(0).getLibertyFeature()); + LibertyJDBCBoosterConfig libJDBCConfig = new LibertyJDBCBoosterConfig(BoosterUtil.getJDBCDependency(), logger); + + serverConfig.addFeature(libJDBCConfig.getFeature()); serverConfig.writeToServer(); String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; @@ -88,9 +96,9 @@ public void testAddJdbcBoosterFeature_SE_17() throws Exception { // Set compiler target property System.setProperty(BoostProperties.INTERNAL_COMPILER_TARGET, "1.7"); - List boosters = BoosterConfigurator.getBoosterConfigs(BoosterUtil.getJDBCDependency(), logger); - - serverConfig.addFeature(boosters.get(0).getLibertyFeature()); + LibertyJDBCBoosterConfig libJDBCConfig = new LibertyJDBCBoosterConfig(BoosterUtil.getJDBCDependency(), logger); + + serverConfig.addFeature(libJDBCConfig.getFeature()); serverConfig.writeToServer(); String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; @@ -117,9 +125,9 @@ public void testAddJdbcBoosterFeature_SE_7() throws Exception { // Set compiler target property System.setProperty(BoostProperties.INTERNAL_COMPILER_TARGET, "7"); - List boosters = BoosterConfigurator.getBoosterConfigs(BoosterUtil.getJDBCDependency(), logger); + LibertyJDBCBoosterConfig libJDBCConfig = new LibertyJDBCBoosterConfig(BoosterUtil.getJDBCDependency(), logger); - serverConfig.addFeature(boosters.get(0).getLibertyFeature()); + serverConfig.addFeature(libJDBCConfig.getFeature()); serverConfig.writeToServer(); String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; @@ -146,9 +154,9 @@ public void testAddJdbcBoosterFeature_SE_18() throws Exception { // Set compiler target property System.setProperty(BoostProperties.INTERNAL_COMPILER_TARGET, "1.8"); - List boosters = BoosterConfigurator.getBoosterConfigs(BoosterUtil.getJDBCDependency(), logger); + LibertyJDBCBoosterConfig libJDBCConfig = new LibertyJDBCBoosterConfig(BoosterUtil.getJDBCDependency(), logger); - serverConfig.addFeature(boosters.get(0).getLibertyFeature()); + serverConfig.addFeature(libJDBCConfig.getFeature()); serverConfig.writeToServer(); String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; @@ -175,9 +183,9 @@ public void testAddJdbcBoosterFeature_SE_8() throws Exception { // Set compiler target property System.setProperty(BoostProperties.INTERNAL_COMPILER_TARGET, "8"); - List boosters = BoosterConfigurator.getBoosterConfigs(BoosterUtil.getJDBCDependency(), logger); + LibertyJDBCBoosterConfig libJDBCConfig = new LibertyJDBCBoosterConfig(BoosterUtil.getJDBCDependency(), logger); - serverConfig.addFeature(boosters.get(0).getLibertyFeature()); + serverConfig.addFeature(libJDBCConfig.getFeature()); serverConfig.writeToServer(); String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; @@ -204,9 +212,9 @@ public void testAddJdbcBoosterFeature_SE9() throws Exception { // Set compiler target property System.setProperty(BoostProperties.INTERNAL_COMPILER_TARGET, "9"); - List boosters = BoosterConfigurator.getBoosterConfigs(BoosterUtil.getJDBCDependency(), logger); + LibertyJDBCBoosterConfig libJDBCConfig = new LibertyJDBCBoosterConfig(BoosterUtil.getJDBCDependency(), logger); - serverConfig.addFeature(boosters.get(0).getLibertyFeature()); + serverConfig.addFeature(libJDBCConfig.getFeature()); serverConfig.writeToServer(); String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; @@ -233,9 +241,9 @@ public void testAddJdbcBoosterFeature_SE11() throws Exception { // Set compiler target property System.setProperty(BoostProperties.INTERNAL_COMPILER_TARGET, "11"); - List boosters = BoosterConfigurator.getBoosterConfigs(BoosterUtil.getJDBCDependency(), logger); + LibertyJDBCBoosterConfig libJDBCConfig = new LibertyJDBCBoosterConfig(BoosterUtil.getJDBCDependency(), logger); - serverConfig.addFeature(boosters.get(0).getLibertyFeature()); + serverConfig.addFeature(libJDBCConfig.getFeature()); serverConfig.writeToServer(); String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/JSONBBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/JSONBBoosterTest.java new file mode 100644 index 00000000..1ff93598 --- /dev/null +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/JSONBBoosterTest.java @@ -0,0 +1,63 @@ +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package io.openliberty.boost.runtimes.boosters; + +import static boost.common.config.ConfigConstants.*; +import static org.junit.Assert.assertTrue; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.contrib.java.lang.system.RestoreSystemProperties; +import org.junit.rules.TemporaryFolder; +import boost.runtimes.openliberty.LibertyServerConfigGenerator; + +import boost.common.BoostLoggerI; +import io.openliberty.boost.runtimes.utils.BoosterUtil; +import io.openliberty.boost.runtimes.utils.CommonLogger; +import io.openliberty.boost.runtimes.utils.ConfigFileUtils; +import boost.runtimes.openliberty.boosters.*; + +public class JSONBBoosterTest { + + @Rule + public TemporaryFolder outputDir = new TemporaryFolder(); + + @Rule + public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); + + BoostLoggerI logger = CommonLogger.getInstance(); + + /** + * Test that the jsonb-1.0 feature is added to server.xml when the jsonb booster + * version is set to 1.0-M1-SNAPSHOT + * + */ + @Test + public void testJSONBBoosterFeature10() throws Exception { + + LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( + outputDir.getRoot().getAbsolutePath(), logger); + + LibertyJSONBBoosterConfig libJSONBConfig = new LibertyJSONBBoosterConfig(BoosterUtil.createDependenciesWithBoosterAndVersion(LibertyJSONBBoosterConfig.class, "1.0.M1-SNAPSHOT"), logger); + + + serverConfig.addFeature(libJSONBConfig.getFeature()); + serverConfig.writeToServer(); + + String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; + boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, "" + JSONB_10 + ""); + + assertTrue("The " + JSONB_10 + " feature was not found in the server configuration", featureFound); + + } + +} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/JSONPBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/JSONPBoosterTest.java new file mode 100644 index 00000000..4716c138 --- /dev/null +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/JSONPBoosterTest.java @@ -0,0 +1,86 @@ +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package io.openliberty.boost.runtimes.boosters; + +import static boost.common.config.ConfigConstants.*; +import static org.junit.Assert.assertTrue; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.contrib.java.lang.system.RestoreSystemProperties; +import org.junit.rules.TemporaryFolder; +import boost.runtimes.openliberty.LibertyServerConfigGenerator; + +import boost.common.BoostLoggerI; +import io.openliberty.boost.runtimes.utils.BoosterUtil; +import io.openliberty.boost.runtimes.utils.CommonLogger; +import io.openliberty.boost.runtimes.utils.ConfigFileUtils; +import boost.runtimes.openliberty.boosters.*; + +public class JSONPBoosterTest { + + @Rule + public TemporaryFolder outputDir = new TemporaryFolder(); + + @Rule + public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); + + BoostLoggerI logger = CommonLogger.getInstance(); + + /** + * Test that the jsonp-1.0 feature is added to server.xml when the jsonp booster + * version is set to 1.0-M1-SNAPSHOT + * + */ + @Test + public void testJSONPBoosterFeature10() throws Exception { + + LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( + outputDir.getRoot().getAbsolutePath(), logger); + + LibertyJSONPBoosterConfig libJSONPConfig = new LibertyJSONPBoosterConfig(BoosterUtil.createDependenciesWithBoosterAndVersion(LibertyJSONPBoosterConfig.class, "1.0.M1-SNAPSHOT"), logger); + + + serverConfig.addFeature(libJSONPConfig.getFeature()); + serverConfig.writeToServer(); + + String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; + boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, "" + JSONP_10 + ""); + + assertTrue("The " + JSONP_10 + " feature was not found in the server configuration", featureFound); + + } + + /** + * Test that the jsonp-1.1 feature is added to server.xml when the jsonp booster + * version is set to 1.1-M1-SNAPSHOT + * + */ + @Test + public void testJSONPBoosterFeature11() throws Exception { + + LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( + outputDir.getRoot().getAbsolutePath(), logger); + + LibertyJSONPBoosterConfig libJSONPConfig = new LibertyJSONPBoosterConfig(BoosterUtil.createDependenciesWithBoosterAndVersion(LibertyJSONPBoosterConfig.class, "1.1.M1-SNAPSHOT"), logger); + + serverConfig.addFeature(libJSONPConfig.getFeature()); + serverConfig.writeToServer(); + + String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; + boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, "" + JSONP_11 + ""); + + assertTrue("The " + JSONP_11 + " feature was not found in the server configuration", featureFound); + + } + +} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPConfigBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPConfigBoosterTest.java new file mode 100644 index 00000000..6f2051ca --- /dev/null +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPConfigBoosterTest.java @@ -0,0 +1,64 @@ +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package io.openliberty.boost.runtimes.boosters; + +import static boost.common.config.ConfigConstants.*; +import static org.junit.Assert.assertTrue; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.contrib.java.lang.system.RestoreSystemProperties; +import org.junit.rules.TemporaryFolder; +import boost.runtimes.openliberty.LibertyServerConfigGenerator; + +import boost.common.BoostLoggerI; +import io.openliberty.boost.runtimes.utils.BoosterUtil; +import io.openliberty.boost.runtimes.utils.CommonLogger; +import io.openliberty.boost.runtimes.utils.ConfigFileUtils; +import boost.runtimes.openliberty.boosters.*; + +public class MPConfigBoosterTest { + + @Rule + public TemporaryFolder outputDir = new TemporaryFolder(); + + @Rule + public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); + + BoostLoggerI logger = CommonLogger.getInstance(); + + /** + * Test that the mpConfig-1.3 feature is added to server.xml when the MPConfig + * booster version is set to 1.3-M1-SNAPSHOT + * + */ + @Test + public void testMPConfigBoosterFeature13() throws Exception { + + LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( + outputDir.getRoot().getAbsolutePath(), logger); + + LibertyMPConfigBoosterConfig libMPConfigConfig = new LibertyMPConfigBoosterConfig(BoosterUtil.createDependenciesWithBoosterAndVersion(LibertyMPConfigBoosterConfig.class, "1.3.M1-SNAPSHOT"), logger); + + + serverConfig.addFeature(libMPConfigConfig.getFeature()); + serverConfig.writeToServer(); + + String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; + boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, + "" + MPCONFIG_13 + ""); + + assertTrue("The " + MPCONFIG_13 + " feature was not found in the server configuration", featureFound); + + } + +} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPFaultToleranceBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPFaultToleranceBoosterTest.java new file mode 100644 index 00000000..8ae9c605 --- /dev/null +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPFaultToleranceBoosterTest.java @@ -0,0 +1,64 @@ +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package io.openliberty.boost.runtimes.boosters; + +import static boost.common.config.ConfigConstants.*; +import static org.junit.Assert.assertTrue; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.contrib.java.lang.system.RestoreSystemProperties; +import org.junit.rules.TemporaryFolder; +import boost.runtimes.openliberty.LibertyServerConfigGenerator; + +import boost.common.BoostLoggerI; +import io.openliberty.boost.runtimes.utils.BoosterUtil; +import io.openliberty.boost.runtimes.utils.CommonLogger; +import io.openliberty.boost.runtimes.utils.ConfigFileUtils; +import boost.runtimes.openliberty.boosters.*; + +public class MPFaultToleranceBoosterTest { + + @Rule + public TemporaryFolder outputDir = new TemporaryFolder(); + + @Rule + public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); + + BoostLoggerI logger = CommonLogger.getInstance(); + + /** + * Test that the mpFaultTolerance-1.1 feature is added to server.xml when the MPFaultTolerance + * booster version is set to 1.1-M1-SNAPSHOT + * + */ + @Test + public void testMPFaultToleranceBoosterFeature11() throws Exception { + + LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( + outputDir.getRoot().getAbsolutePath(), logger); + + LibertyMPFaultToleranceBoosterConfig libMPFTConfig = new LibertyMPFaultToleranceBoosterConfig(BoosterUtil.createDependenciesWithBoosterAndVersion(LibertyMPFaultToleranceBoosterConfig.class, "1.1.M1-SNAPSHOT"), logger); + + + serverConfig.addFeature(libMPFTConfig.getFeature()); + serverConfig.writeToServer(); + + String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; + boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, + "" + MPFAULTTOLERANCE_11 + ""); + + assertTrue("The " + MPFAULTTOLERANCE_11 + " feature was not found in the server configuration", featureFound); + + } + +} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPHealthBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPHealthBoosterTest.java new file mode 100644 index 00000000..60b09a5d --- /dev/null +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPHealthBoosterTest.java @@ -0,0 +1,64 @@ +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package io.openliberty.boost.runtimes.boosters; + +import static boost.common.config.ConfigConstants.*; +import static org.junit.Assert.assertTrue; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.contrib.java.lang.system.RestoreSystemProperties; +import org.junit.rules.TemporaryFolder; +import boost.runtimes.openliberty.LibertyServerConfigGenerator; + +import boost.common.BoostLoggerI; +import io.openliberty.boost.runtimes.utils.BoosterUtil; +import io.openliberty.boost.runtimes.utils.CommonLogger; +import io.openliberty.boost.runtimes.utils.ConfigFileUtils; +import boost.runtimes.openliberty.boosters.*; + +public class MPHealthBoosterTest { + + @Rule + public TemporaryFolder outputDir = new TemporaryFolder(); + + @Rule + public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); + + BoostLoggerI logger = CommonLogger.getInstance(); + + /** + * Test that the mpHealth-1.0 feature is added to server.xml when the MPHealth + * booster version is set to 1.0-M1-SNAPSHOT + * + */ + @Test + public void testMPHealthBoosterFeature10() throws Exception { + + LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( + outputDir.getRoot().getAbsolutePath(), logger); + + LibertyMPHealthBoosterConfig libMPHealthConfig = new LibertyMPHealthBoosterConfig(BoosterUtil.createDependenciesWithBoosterAndVersion(LibertyMPHealthBoosterConfig.class, "1.0.M1-SNAPSHOT"), logger); + + + serverConfig.addFeature(libMPHealthConfig.getFeature()); + serverConfig.writeToServer(); + + String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; + boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, + "" + MPHEALTH_10 + ""); + + assertTrue("The " + MPHEALTH_10 + " feature was not found in the server configuration", featureFound); + + } + +} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPMetricsBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPMetricsBoosterTest.java new file mode 100644 index 00000000..a175151d --- /dev/null +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPMetricsBoosterTest.java @@ -0,0 +1,64 @@ +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package io.openliberty.boost.runtimes.boosters; + +import static boost.common.config.ConfigConstants.*; +import static org.junit.Assert.assertTrue; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.contrib.java.lang.system.RestoreSystemProperties; +import org.junit.rules.TemporaryFolder; +import boost.runtimes.openliberty.LibertyServerConfigGenerator; + +import boost.common.BoostLoggerI; +import io.openliberty.boost.runtimes.utils.BoosterUtil; +import io.openliberty.boost.runtimes.utils.CommonLogger; +import io.openliberty.boost.runtimes.utils.ConfigFileUtils; +import boost.runtimes.openliberty.boosters.*; + +public class MPMetricsBoosterTest { + + @Rule + public TemporaryFolder outputDir = new TemporaryFolder(); + + @Rule + public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); + + BoostLoggerI logger = CommonLogger.getInstance(); + + /** + * Test that the mpMetrics-1.1 feature is added to server.xml when the MPMetrics + * booster version is set to 1.1-M1-SNAPSHOT + * + */ + @Test + public void testMPMetricsBoosterFeature11() throws Exception { + + LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( + outputDir.getRoot().getAbsolutePath(), logger); + + LibertyMPMetricsBoosterConfig libMPMetricsConfig = new LibertyMPMetricsBoosterConfig(BoosterUtil.createDependenciesWithBoosterAndVersion(LibertyMPMetricsBoosterConfig.class, "1.1.M1-SNAPSHOT"), logger); + + + serverConfig.addFeature(libMPMetricsConfig.getFeature()); + serverConfig.writeToServer(); + + String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; + boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, + "" + MPMETRICS_11 + ""); + + assertTrue("The " + MPMETRICS_11 + " feature was not found in the server configuration", featureFound); + + } + +} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPOpenAPIBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPOpenAPIBoosterTest.java new file mode 100644 index 00000000..0ade0dc6 --- /dev/null +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPOpenAPIBoosterTest.java @@ -0,0 +1,64 @@ +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package io.openliberty.boost.runtimes.boosters; + +import static boost.common.config.ConfigConstants.*; +import static org.junit.Assert.assertTrue; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.contrib.java.lang.system.RestoreSystemProperties; +import org.junit.rules.TemporaryFolder; +import boost.runtimes.openliberty.LibertyServerConfigGenerator; + +import boost.common.BoostLoggerI; +import io.openliberty.boost.runtimes.utils.BoosterUtil; +import io.openliberty.boost.runtimes.utils.CommonLogger; +import io.openliberty.boost.runtimes.utils.ConfigFileUtils; +import boost.runtimes.openliberty.boosters.*; + +public class MPOpenAPIBoosterTest { + + @Rule + public TemporaryFolder outputDir = new TemporaryFolder(); + + @Rule + public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); + + BoostLoggerI logger = CommonLogger.getInstance(); + + /** + * Test that the mpOpenAPI-1.0 feature is added to server.xml when the MPOpenAPI + * booster version is set to 1.0-SNAPSHOT + * + */ + @Test + public void testMPOpenAPIBoosterFeature10() throws Exception { + + LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( + outputDir.getRoot().getAbsolutePath(), logger); + + LibertyMPOpenAPIBoosterConfig libMPOpenAPIConfig = new LibertyMPOpenAPIBoosterConfig(BoosterUtil.createDependenciesWithBoosterAndVersion(LibertyMPOpenAPIBoosterConfig.class, "1.0.M1-SNAPSHOT"), logger); + + + serverConfig.addFeature(libMPOpenAPIConfig.getFeature()); + serverConfig.writeToServer(); + + String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; + boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, + "" + MPOPENAPI_10 + ""); + + assertTrue("The " + MPOPENAPI_10 + " feature was not found in the server configuration", featureFound); + + } + +} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPOpenTracingBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPOpenTracingBoosterTest.java new file mode 100644 index 00000000..638d1e0c --- /dev/null +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPOpenTracingBoosterTest.java @@ -0,0 +1,87 @@ +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package io.openliberty.boost.runtimes.boosters; + +import static boost.common.config.ConfigConstants.*; +import static org.junit.Assert.assertTrue; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.contrib.java.lang.system.RestoreSystemProperties; +import org.junit.rules.TemporaryFolder; +import boost.runtimes.openliberty.LibertyServerConfigGenerator; + +import boost.common.BoostLoggerI; +import io.openliberty.boost.runtimes.utils.BoosterUtil; +import io.openliberty.boost.runtimes.utils.CommonLogger; +import io.openliberty.boost.runtimes.utils.ConfigFileUtils; +import boost.runtimes.openliberty.boosters.*; + +public class MPOpenTracingBoosterTest { + + @Rule + public TemporaryFolder outputDir = new TemporaryFolder(); + + @Rule + public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); + + BoostLoggerI logger = CommonLogger.getInstance(); + + /** + * Test that the mpOpenTracing-1.1 feature is added to server.xml when the + * MPOpenTracing booster version is set to 1.1-M1-SNAPSHOT + * + */ + @Test + public void testMPOpenTracingBoosterFeature11() throws Exception { + + LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( + outputDir.getRoot().getAbsolutePath(), logger); + + LibertyMPOpenTracingBoosterConfig libMPOpenTracingConfig = new LibertyMPOpenTracingBoosterConfig(BoosterUtil.createDependenciesWithBoosterAndVersion(LibertyMPOpenTracingBoosterConfig.class, "1.1.M1-SNAPSHOT"), logger); + + serverConfig.addFeature(libMPOpenTracingConfig.getFeature()); + serverConfig.writeToServer(); + + String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; + boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, + "" + MPOPENTRACING_11 + ""); + + assertTrue("The " + MPOPENTRACING_11 + " feature was not found in the server configuration", featureFound); + + } + + /** + * Test that the mpOpenTracing-1.1 feature is added to server.xml when the + * MPOpenTracing booster version is set to 0.2-SNAPSHOT + * + */ + @Test + public void testMPOpenTracingBoosterFeature12() throws Exception { + + LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( + outputDir.getRoot().getAbsolutePath(), logger); + + LibertyMPOpenTracingBoosterConfig libMPOpenTracingConfig = new LibertyMPOpenTracingBoosterConfig(BoosterUtil.createDependenciesWithBoosterAndVersion(LibertyMPOpenTracingBoosterConfig.class, "1.2.M1-SNAPSHOT"), logger); + + serverConfig.addFeature(libMPOpenTracingConfig.getFeature()); + serverConfig.writeToServer(); + + String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; + boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, + "" + MPOPENTRACING_12 + ""); + + assertTrue("The " + MPOPENTRACING_12 + " feature was not found in the server configuration", featureFound); + + } + +} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPRestClientBoosterTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPRestClientBoosterTest.java new file mode 100644 index 00000000..f78df090 --- /dev/null +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/boosters/MPRestClientBoosterTest.java @@ -0,0 +1,63 @@ +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package io.openliberty.boost.runtimes.boosters; + +import static boost.common.config.ConfigConstants.*; +import static org.junit.Assert.assertTrue; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.contrib.java.lang.system.RestoreSystemProperties; +import org.junit.rules.TemporaryFolder; +import boost.runtimes.openliberty.LibertyServerConfigGenerator; + +import boost.common.BoostLoggerI; +import io.openliberty.boost.runtimes.utils.BoosterUtil; +import io.openliberty.boost.runtimes.utils.CommonLogger; +import io.openliberty.boost.runtimes.utils.ConfigFileUtils; +import boost.runtimes.openliberty.boosters.*; + +public class MPRestClientBoosterTest { + + @Rule + public TemporaryFolder outputDir = new TemporaryFolder(); + + @Rule + public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties(); + + BoostLoggerI logger = CommonLogger.getInstance(); + + /** + * Test that the mpRestClient-1.1 feature is added to server.xml when the + * MPRestClient booster version is set to 1.1-M1-SNAPSHOT + * + */ + @Test + public void testMPRestClientBoosterFeature11() throws Exception { + + LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( + outputDir.getRoot().getAbsolutePath(), logger); + + LibertyMPRestClientBoosterConfig libMPOpenTracingConfig = new LibertyMPRestClientBoosterConfig(BoosterUtil.createDependenciesWithBoosterAndVersion(LibertyMPRestClientBoosterConfig.class, "1.1.M1-SNAPSHOT"), logger); + + serverConfig.addFeature(libMPOpenTracingConfig.getFeature()); + serverConfig.writeToServer(); + + String serverXML = outputDir.getRoot().getAbsolutePath() + "/server.xml"; + boolean featureFound = ConfigFileUtils.findStringInServerXml(serverXML, + "" + MPRESTCLIENT_11 + ""); + + assertTrue("The " + MPRESTCLIENT_11 + " feature was not found in the server configuration", featureFound); + + } + +} diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/config/LibertyServerConfigGeneratorTest.java b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/config/LibertyServerConfigGeneratorTest.java similarity index 88% rename from boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/config/LibertyServerConfigGeneratorTest.java rename to boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/config/LibertyServerConfigGeneratorTest.java index 58f159c2..62aed212 100644 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/config/LibertyServerConfigGeneratorTest.java +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/config/LibertyServerConfigGeneratorTest.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package io.openliberty.boost.common.config; +package io.openliberty.boost.runtimes.config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -29,16 +29,21 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -import boost.runtimes.LibertyServerConfigGenerator; +import boost.runtimes.openliberty.LibertyServerConfigGenerator; -import io.openliberty.boost.common.utils.BoostUtil; -import io.openliberty.boost.common.utils.CommonLogger; -import io.openliberty.boost.common.utils.ConfigFileUtils; -import io.openliberty.boost.common.BoostLoggerI; -import io.openliberty.boost.common.boosters.JDBCBoosterConfig; +import boost.common.config.BoostProperties; +import boost.common.utils.BoostUtil; +import io.openliberty.boost.runtimes.utils.CommonLogger; +import io.openliberty.boost.runtimes.utils.ConfigFileUtils; +import boost.common.BoostLoggerI; +import boost.common.boosters.JDBCBoosterConfig; + +import static boost.common.config.ConfigConstants.*; +import static io.openliberty.boost.runtimes.utils.DOMUtils.getDirectChildrenByTag; +import boost.runtimes.openliberty.boosters.LibertyJDBCBoosterConfig; +import java.util.*; +import io.openliberty.boost.runtimes.utils.BoosterUtil; -import static io.openliberty.boost.common.config.ConfigConstants.*; -import static io.openliberty.boost.common.utils.DOMUtils.getDirectChildrenByTag; public class LibertyServerConfigGeneratorTest { @@ -93,7 +98,9 @@ public void testAddDatasource_Derby() throws Exception { datasourceProperties.put(BoostProperties.DATASOURCE_DATABASE_NAME, DERBY_DB); datasourceProperties.put(BoostProperties.DATASOURCE_CREATE_DATABASE, "create"); - serverConfig.addDataSource(JDBCBoosterConfig.DERBY, datasourceProperties); + //serverConfig.addDataSource(JDBCBoosterConfig.DERBY, datasourceProperties); + LibertyJDBCBoosterConfig jdbcConfig = new LibertyJDBCBoosterConfig(BoosterUtil.getJDBCDependency(), logger); + jdbcConfig.addServerConfig(serverConfig); serverConfig.writeToServer(); // Parse server.xml @@ -174,11 +181,11 @@ public void testAddDatasource_DB2() throws Exception { LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( outputDir.getRoot().getAbsolutePath(), logger); - // Add basic properties - Properties datasourceProperties = new Properties(); - datasourceProperties.put(BoostProperties.DATASOURCE_URL, DB2_URL); - - serverConfig.addDataSource(JDBCBoosterConfig.DB2, datasourceProperties); + Map jdbcDependency = BoosterUtil.getJDBCDependency(); + jdbcDependency.put(JDBCBoosterConfig.DB2_DEPENDENCY, "the db2 dependency version"); + System.setProperty(BoostProperties.DATASOURCE_URL, DB2_URL); + LibertyJDBCBoosterConfig jdbcConfig = new LibertyJDBCBoosterConfig(jdbcDependency, logger); + jdbcConfig.addServerConfig(serverConfig); serverConfig.writeToServer(); // Parse server.xml @@ -249,13 +256,13 @@ public void testAddJdbcBoosterConfig_MySQL() throws Exception { LibertyServerConfigGenerator serverConfig = new LibertyServerConfigGenerator( outputDir.getRoot().getAbsolutePath(), logger); - // Add basic properties - Properties datasourceProperties = new Properties(); - datasourceProperties.put(BoostProperties.DATASOURCE_URL, MYSQL_URL); - - serverConfig.addDataSource(JDBCBoosterConfig.MYSQL, datasourceProperties); + Map jdbcDependency = BoosterUtil.getJDBCDependency(); + jdbcDependency.put(JDBCBoosterConfig.MYSQL_DEPENDENCY, "the mysql dependency version"); + System.setProperty(BoostProperties.DATASOURCE_URL, MYSQL_URL); + LibertyJDBCBoosterConfig jdbcConfig = new LibertyJDBCBoosterConfig(jdbcDependency, logger); + jdbcConfig.addServerConfig(serverConfig); serverConfig.writeToServer(); - + File serverXml = new File(outputDir.getRoot().getAbsolutePath() + "/server.xml"); DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance(); DocumentBuilder dBuilder = dbFactory.newDocumentBuilder(); diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/utils/BoosterUtil.java b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/utils/BoosterUtil.java new file mode 100644 index 00000000..e7479b33 --- /dev/null +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/utils/BoosterUtil.java @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package io.openliberty.boost.runtimes.utils; + +import java.util.HashMap; +import java.util.Map; + +import boost.common.BoostException; +import boost.common.boosters.AbstractBoosterConfig; +import boost.common.boosters.JDBCBoosterConfig; + +public class BoosterUtil { + + public static Map createDependenciesWithBoosterAndVersion(Class booster, String version) + throws BoostException { + Map map = new HashMap(); + map.put(AbstractBoosterConfig.getCoordinates(booster), version); + return map; + } + + public static Map getJDBCDependency() throws BoostException { + return BoosterUtil.createDependenciesWithBoosterAndVersion(JDBCBoosterConfig.class, "0.1-SNAPSHOT"); + } +} \ No newline at end of file diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/utils/CommonLogger.java b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/utils/CommonLogger.java similarity index 60% rename from boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/utils/CommonLogger.java rename to boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/utils/CommonLogger.java index 49ef83f7..70633870 100644 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/utils/CommonLogger.java +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/utils/CommonLogger.java @@ -1,6 +1,17 @@ -package io.openliberty.boost.common.utils; - -import io.openliberty.boost.common.BoostLoggerI; +/******************************************************************************* + * Copyright (c) 2019 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ + +package io.openliberty.boost.runtimes.utils; + +import boost.common.BoostLoggerI; public class CommonLogger implements BoostLoggerI { diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/utils/ConfigFileUtils.java b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/utils/ConfigFileUtils.java similarity index 98% rename from boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/utils/ConfigFileUtils.java rename to boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/utils/ConfigFileUtils.java index e7eb2fd4..66b120f8 100644 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/utils/ConfigFileUtils.java +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/utils/ConfigFileUtils.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package io.openliberty.boost.common.utils; +package io.openliberty.boost.runtimes.utils; import static org.junit.Assert.fail; diff --git a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/utils/DOMUtils.java b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/utils/DOMUtils.java similarity index 96% rename from boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/utils/DOMUtils.java rename to boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/utils/DOMUtils.java index b860dd80..796ca325 100644 --- a/boost-maven/boost-runtimes/runtime-openliberty/src/it/java/boost/runtimes/utils/DOMUtils.java +++ b/boost-maven/boost-runtimes/runtime-openliberty/src/test/java/io/openliberty/boost/runtimes/utils/DOMUtils.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package io.openliberty.boost.common.utils; +package io.openliberty.boost.runtimes.utils; import java.util.ArrayList; import java.util.List; diff --git a/boost-maven/boost-runtimes/runtime-tomee/pom.xml b/boost-maven/boost-runtimes/runtime-tomee/pom.xml index d1fd3090..000da972 100644 --- a/boost-maven/boost-runtimes/runtime-tomee/pom.xml +++ b/boost-maven/boost-runtimes/runtime-tomee/pom.xml @@ -1,14 +1,13 @@ - + 4.0.0 - boost.runtimes - tomee - 0.1-SNAPSHOT + boost.runtimes + tomee + 0.1-SNAPSHOT jar - + UTF-8 UTF-8 @@ -18,25 +17,25 @@ - boost - boost-common - 0.1.3-SNAPSHOT - + boost + boost-common + 0.1.3-SNAPSHOT + boost boost-maven-plugin 0.1.3-SNAPSHOT - org.apache.maven - maven-plugin-api - 2.0 - - - org.twdata.maven - mojo-executor - 2.3.0 - + org.apache.maven + maven-plugin-api + 2.0 + + + org.twdata.maven + mojo-executor + 2.3.0 + diff --git a/boost-maven/boost-runtimes/runtime-wlp/pom.xml b/boost-maven/boost-runtimes/runtime-wlp/pom.xml index a5f51480..807408dd 100644 --- a/boost-maven/boost-runtimes/runtime-wlp/pom.xml +++ b/boost-maven/boost-runtimes/runtime-wlp/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 - boost.runtimes - wlp - 0.1-SNAPSHOT + boost.runtimes + wlp + 0.1-SNAPSHOT