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

Commit

Permalink
Booster versioning and xml formating fix
Browse files Browse the repository at this point in the history
  • Loading branch information
awisniew90 committed Aug 7, 2019
1 parent a55a569 commit a160dbb
Show file tree
Hide file tree
Showing 53 changed files with 1,465 additions and 1,570 deletions.
151 changes: 75 additions & 76 deletions boost-common/pom.xml
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>
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,23 @@ 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 CDI_VERSION_12 = "1.2.0."+milestone+"-SNAPSHOT";
public static final String CDI_VERSION_20 = "2.0.0."+milestone+"-SNAPSHOT";
public static final String JAXRS_VERSION_20 = "2.0.0."+milestone+"-SNAPSHOT";
public static final String JAXRS_VERSION_21 = "2.1.0."+milestone+"-SNAPSHOT";
public static final String JSONB_VERSION_10 = "1.0.0."+milestone+"-SNAPSHOT";
public static final String JSONP_VERSION_10 = "1.0.0."+milestone+"-SNAPSHOT";
public static final String JSONP_VERSION_11 = "1.1.0."+milestone+"-SNAPSHOT";
public static final String JPA_VERSION_21 = "2.1.0."+milestone+"-SNAPSHOT";
public static final String JPA_VERSION_22 = "2.2.0."+milestone+"-SNAPSHOT";
public static final String MP_HEALTH_VERSION_10 = "1.0.0."+milestone+"-SNAPSHOT";
public static final String MP_CONFIG_VERSION_13 = "1.3.0."+milestone+"-SNAPSHOT";
public static final String MP_METRICS_VERSION_11 = "1.1.0."+milestone+"-SNAPSHOT";
public static final String MP_FAULTTOLERANCE_VERSION_11 = "1.1.0."+milestone+"-SNAPSHOT";
public static final String MP_OPENAPI_VERSION_10 = "1.0.0."+milestone+"-SNAPSHOT";
public static final String MP_OPENTRACING_VERSION_11 = "1.1.0."+milestone+"-SNAPSHOT";
public static final String MP_OPENTRACING_VERSION_12 = "1.2.0."+milestone+"-SNAPSHOT";
public static final String MP_RESTCLIENT_VERSION_11 = "1.1.0."+milestone+"-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
23 changes: 11 additions & 12 deletions boost-maven/boost-boms/boost-ee7-apis-bom/pom.xml
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 Down Expand Up @@ -46,7 +45,7 @@
<artifactId>cdi-api</artifactId>
<version>1.2</version>
</dependency>
</dependencies>
</dependencies>
</dependencyManagement>

</project>
39 changes: 19 additions & 20 deletions boost-maven/boost-boms/boost-ee8-apis-bom/pom.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
<?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>

<groupId>boost.boosters</groupId>
<artifactId>boost-ee8-apis-bom</artifactId>
<!-- Versioned separately from the main project -->
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
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>

<description>Boost EE8 APIs BOM</description>
<groupId>boost.boosters</groupId>
<artifactId>boost-ee8-apis-bom</artifactId>
<!-- Versioned separately from the main project -->
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>

<dependencyManagement>
<dependencies>
<!-- jaxrs -->
<description>Boost EE8 APIs BOM</description>

<dependencyManagement>
<dependencies>
<!-- jaxrs -->
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
Expand Down Expand Up @@ -51,6 +50,6 @@
<artifactId>javax.json.bind-api</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
</dependencyManagement>
</dependencies>
</dependencyManagement>
</project>
Loading

0 comments on commit a160dbb

Please sign in to comment.