Skip to content
This repository has been archived by the owner on Oct 14, 2020. It is now read-only.

Pull new boosters fix #329

Merged
merged 3 commits into from
Aug 14, 2019
Merged

Pull new boosters fix #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
375a4ef
re-enable old unit tests, add new boms, new boosters and new unit tests
ajm01 Jul 25, 2019
a55a569
update format of the version based on Charles review comment
ajm01 Aug 2, 2019
a160dbb
Booster versioning and xml formating fix
awisniew90 Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 75 additions & 76 deletions boost-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,87 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (c) 2018 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 -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
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 -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>boost</groupId>
<artifactId>boost-common</artifactId>
<version>0.1.3-SNAPSHOT</version>
<groupId>boost</groupId>
<artifactId>boost-common</artifactId>
<version>0.1.3-SNAPSHOT</version>

<url>https://github.com/OpenLiberty/boost</url>
<url>https://github.com/OpenLiberty/boost</url>

<parent>
<groupId>net.wasdev.maven.parent</groupId>
<artifactId>parent</artifactId>
<version>1.4</version>
<relativePath />
</parent>
<parent>
<groupId>net.wasdev.maven.parent</groupId>
<artifactId>parent</artifactId>
<version>1.4</version>
<relativePath />
</parent>

<licenses>
<license>
<name>Eclipse Public License 1.0 (EPL-1.0)</name>
<url>https://raw.github.com/OpenLiberty/boost/master/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>
<licenses>
<license>
<name>Eclipse Public License 1.0 (EPL-1.0)</name>
<url>https://raw.github.com/OpenLiberty/boost/master/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<connection>scm:git:[email protected]:OpenLiberty/boost.git</connection>
<developerConnection>scm:git:[email protected]:OpenLiberty/boost.git</developerConnection>
<url>[email protected]:OpenLiberty/boost.git</url>
<tag>HEAD</tag>
</scm>
<scm>
<connection>scm:git:[email protected]:OpenLiberty/boost.git</connection>
<developerConnection>scm:git:[email protected]:OpenLiberty/boost.git</developerConnection>
<url>[email protected]:OpenLiberty/boost.git</url>
<tag>HEAD</tag>
</scm>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<dependencies>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>net.wasdev.wlp.common</groupId>
<artifactId>ci.common</artifactId>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>0.9.11</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.25.0-GA</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-rules</artifactId>
<version>1.16.0</version>
<scope>test</scope>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>net.wasdev.wlp.common</groupId>
<artifactId>ci.common</artifactId>
<version>1.3.3</version>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>0.9.11</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.25.0-GA</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-rules</artifactId>
<version>1.16.0</version>
<scope>test</scope>
</dependency>
</dependencies>

</project>
21 changes: 18 additions & 3 deletions boost-common/src/main/java/boost/common/boosters/AbstractBoosterConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
33 changes: 33 additions & 0 deletions boost-common/src/main/java/boost/common/boosters/JSONBBoosterConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<String, String> dependencies, BoostLoggerI logger) throws BoostException {
super(dependencies.get(getCoordinates(JSONBBoosterConfig.class)));
}

@Override
public List<String> getDependencies() {
return new ArrayList<String>();
}

}
32 changes: 32 additions & 0 deletions boost-common/src/main/java/boost/common/boosters/MPFaultToleranceBoosterConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<String, String> dependencies, BoostLoggerI logger) throws BoostException {
super(dependencies.get(getCoordinates(MPFaultToleranceBoosterConfig.class)));
}

@Override
public List<String> getDependencies() {
return new ArrayList<String>();
}
}
32 changes: 32 additions & 0 deletions boost-common/src/main/java/boost/common/boosters/MPMetricsBoosterConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<String, String> dependencies, BoostLoggerI logger) throws BoostException {
super(dependencies.get(getCoordinates(MPMetricsBoosterConfig.class)));
}

@Override
public List<String> getDependencies() {
return new ArrayList<String>();
}
}
32 changes: 32 additions & 0 deletions boost-common/src/main/java/boost/common/boosters/MPOpenAPIBoosterConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<String, String> dependencies, BoostLoggerI logger) throws BoostException {
super(dependencies.get(getCoordinates(MPOpenAPIBoosterConfig.class)));
}

@Override
public List<String> getDependencies() {
return new ArrayList<String>();
}
}
7 changes: 7 additions & 0 deletions boost-common/src/main/java/boost/common/config/ConfigConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}";
Expand Down
33 changes: 21 additions & 12 deletions boost-maven/boost-boms/boost-ee7-apis-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright (c) 2018 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 -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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 -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>boost.boosters</groupId>
<artifactId>boost-ee7-apis-bom</artifactId>
<!-- Versioned separately from the main project -->
<!-- Versioned separately from the main project -->
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>

<description>Boost EE7 APIs BOM</description>

<dependencyManagement>
<dependencies>
<!-- jaxrs -->
Expand All @@ -36,7 +35,17 @@
<artifactId>javax.transaction-api</artifactId>
<version>1.2</version>
</dependency>
</dependencies>
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<version>1.2</version>
</dependency>
</dependencies>
</dependencyManagement>

</project>
Loading