Merge pull request #393 from scottkurz/v021

V021
MicroShed · Sep 18, 2019 · ea7b46b · ea7b46b
2 parents ce73b1a + 94a4ef8
commit ea7b46b
Show file tree

Hide file tree

Showing 70 changed files with 368 additions and 228 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,12 +22,7 @@ before_install:
      - echo "Deleting old .m2 artifacts..."
      - rm -rf $HOME/.m2/repository/net/wasdev
      - rm -rf $HOME/.m2/repository/io/openliberty
-     - echo 'Installing ci.maven lib ....'
-     - git clone https://github.com/OpenLiberty/ci.maven.git ./ci.maven
-     - cd ./ci.maven
-     - git checkout liberty-maven-3.0
-     - mvn clean install
-     - cd ..
+     - rm -rf $HOME/.m2/repository/org/microshed
      - docker run -d -p 5000:5000 --restart=always --name registry registry:2
 install: true
 before_script:

diff --git a/boost-common/pom.xml b/boost-common/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>org.microshed.boost</groupId>
     <artifactId>boost-common</artifactId>
-    <version>0.2-SNAPSHOT</version>
+    <version>0.2.1</version>
 
     <url>https://github.com/OpenLiberty/boost</url>
 
@@ -83,4 +83,77 @@
         </dependency>
     </dependencies>
 
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.sonatype.plugins</groupId>
+                    <artifactId>nexus-staging-maven-plugin</artifactId>
+                    <version>1.6.8</version>
+                    <configuration>
+                        <serverId>ossrh</serverId>
+                        <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                        <autoReleaseAfterClose>false</autoReleaseAfterClose>
+                        <!-- Skip based on the maven.deploy.skip property -->
+                        <skipNexusStagingDeployMojo>${maven.deploy.skip}</skipNexusStagingDeployMojo>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>oss-release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.4</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <extensions>true</extensions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>
diff --git a/boost-common/src/main/java/org/microshed/boost/common/boosters/AbstractBoosterConfig.java b/boost-common/src/main/java/org/microshed/boost/common/boosters/AbstractBoosterConfig.java
@@ -30,7 +30,7 @@ public abstract class AbstractBoosterConfig {
     // version string format:
     // <Major>.<Minor>-<boost version>-<Milestone>[-SNAPSHOT]
     public static final String milestone = "-M1";
-    public static final String boostVersion = "-0.2";
+    public static final String boostVersion = "-0.2.1";
     public static final String snapShot = "-SNAPSHOT";
     public static final String fullSnapshotString = milestone + snapShot;
     public static final String emptyString = "";

diff --git a/boost-maven/README.md b/boost-maven/README.md
@@ -23,7 +23,7 @@ Edit your project pom.xml and place the following plugin stanza into your build:
 <plugin>
 	<groupId>org.microshed.boost</groupId>
 	<artifactId>boost-maven-plugin</artifactId>
-	<version>0.2</version>
+	<version>0.2.1</version>
 	<executions>
 		<execution>
 			<goals>

diff --git a/boost-maven/boost-boms/boost-ee7-apis-bom/pom.xml b/boost-maven/boost-boms/boost-ee7-apis-bom/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.microshed.boost</groupId>
         <artifactId>boost-boms</artifactId>
-        <version>0.2-SNAPSHOT</version>
+        <version>0.2.1</version>
     </parent>
 
 	<groupId>org.microshed.boost.boms</groupId>

diff --git a/boost-maven/boost-boms/boost-ee8-apis-bom/pom.xml b/boost-maven/boost-boms/boost-ee8-apis-bom/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.microshed.boost</groupId>
         <artifactId>boost-boms</artifactId>
-        <version>0.2-SNAPSHOT</version>
+        <version>0.2.1</version>
     </parent>
 
     <groupId>org.microshed.boost.boms</groupId>

diff --git a/boost-maven/boost-boms/boost-mp14-apis-bom/pom.xml b/boost-maven/boost-boms/boost-mp14-apis-bom/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.microshed.boost</groupId>
         <artifactId>boost-boms</artifactId>
-        <version>0.2-SNAPSHOT</version>
+        <version>0.2.1</version>
     </parent>
 
 	<groupId>org.microshed.boost.boms</groupId>

diff --git a/boost-maven/boost-boms/boost-mp20-apis-bom/pom.xml b/boost-maven/boost-boms/boost-mp20-apis-bom/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.microshed.boost</groupId>
         <artifactId>boost-boms</artifactId>
-        <version>0.2-SNAPSHOT</version>
+        <version>0.2.1</version>
     </parent>
 
 	<groupId>org.microshed.boost.boms</groupId>

diff --git a/boost-maven/boost-boms/boost-mp21-apis-bom/pom.xml b/boost-maven/boost-boms/boost-mp21-apis-bom/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.microshed.boost</groupId>
         <artifactId>boost-boms</artifactId>
-        <version>0.2-SNAPSHOT</version>
+        <version>0.2.1</version>
     </parent>
 
 	<groupId>org.microshed.boost.boms</groupId>

diff --git a/boost-maven/boost-boms/boost-mp22-apis-bom/pom.xml b/boost-maven/boost-boms/boost-mp22-apis-bom/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.microshed.boost</groupId>
         <artifactId>boost-boms</artifactId>
-        <version>0.2-SNAPSHOT</version>
+        <version>0.2.1</version>
     </parent>
 
 	<groupId>org.microshed.boost.boms</groupId>

diff --git a/boost-maven/boost-boms/boost-mp30-apis-bom/pom.xml b/boost-maven/boost-boms/boost-mp30-apis-bom/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.microshed.boost</groupId>
         <artifactId>boost-boms</artifactId>
-        <version>0.2-SNAPSHOT</version>
+        <version>0.2.1</version>
     </parent>
 
 	<groupId>org.microshed.boost.boms</groupId>

diff --git a/boost-maven/boost-boms/booster-ee7-bom/pom.xml b/boost-maven/boost-boms/booster-ee7-bom/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.microshed.boost</groupId>
         <artifactId>boost-boms</artifactId>
-        <version>0.2-SNAPSHOT</version>
+        <version>0.2.1</version>
     </parent>
 
     <groupId>org.microshed.boost.boms</groupId>
@@ -24,14 +24,14 @@
             <dependency>
                 <groupId>org.microshed.boost.boms</groupId>
                 <artifactId>boost-ee7-apis-bom</artifactId>
-                <version>0.2-SNAPSHOT</version>
+                <version>0.2.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.microshed.boost.boms</groupId>
                 <artifactId>runtimes-bom</artifactId>
-                <version>0.2-SNAPSHOT</version>
+                <version>0.2.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -42,31 +42,31 @@
                     version -->
                 <!-- Could also use 7.0, 8.0 for EE7, 8 -->
                 <!-- Probably will be 1.0 for initial GA -->
-                <version>2.0-0.2-SNAPSHOT</version>
+                <version>2.0-0.2.1</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.microshed.boost.boosters</groupId>
                 <artifactId>jdbc</artifactId>
-                <version>0.2-SNAPSHOT</version>
+                <version>0.2.1</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.microshed.boost.boosters</groupId>
                 <artifactId>jpa</artifactId>
-                <version>2.1-0.2-SNAPSHOT</version>
+                <version>2.1-0.2.1</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.microshed.boost.boosters</groupId>
                 <artifactId>cdi</artifactId>
-                <version>1.2-0.2-SNAPSHOT</version>
+                <version>1.2-0.2.1</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.microshed.boost.boosters</groupId>
                 <artifactId>jsonp</artifactId>
-                <version>1.0-0.2-SNAPSHOT</version>
+                <version>1.0-0.2.1</version>
                 <scope>provided</scope>
             </dependency>
         </dependencies>

diff --git a/boost-maven/boost-boms/booster-ee8-bom/pom.xml b/boost-maven/boost-boms/booster-ee8-bom/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.microshed.boost</groupId>
         <artifactId>boost-boms</artifactId>
-        <version>0.2-SNAPSHOT</version>
+        <version>0.2.1</version>
     </parent>
 
     <groupId>org.microshed.boost.boms</groupId>
@@ -24,14 +24,14 @@
             <dependency>
                 <groupId>org.microshed.boost.boms</groupId>
                 <artifactId>boost-ee8-apis-bom</artifactId>
-                <version>0.2-SNAPSHOT</version>
+                <version>0.2.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.microshed.boost.boms</groupId>
                 <artifactId>runtimes-bom</artifactId>
-                <version>0.2-SNAPSHOT</version>
+                <version>0.2.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -42,37 +42,37 @@
                     version -->
                 <!-- Could also use 7.0, 8.0 for EE7, 8 -->
                 <!-- Probably will be 1.0 for initial GA -->
-                <version>2.1-0.2-SNAPSHOT</version>
+                <version>2.1-0.2.1</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.microshed.boost.boosters</groupId>
                 <artifactId>jdbc</artifactId>
-                <version>0.2-SNAPSHOT</version>
+                <version>0.2.1</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.microshed.boost.boosters</groupId>
                 <artifactId>jpa</artifactId>
-                <version>2.2-0.2-SNAPSHOT</version>
+                <version>2.2-0.2.1</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.microshed.boost.boosters</groupId>
                 <artifactId>cdi</artifactId>
-                <version>2.0-0.2-SNAPSHOT</version>
+                <version>2.0-0.2.1</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.microshed.boost.boosters</groupId>
                 <artifactId>jsonp</artifactId>
-                <version>1.1-0.2-SNAPSHOT</version>
+                <version>1.1-0.2.1</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.microshed.boost.boosters</groupId>
                 <artifactId>bean-validation</artifactId>
-                <version>2.0-0.2-SNAPSHOT</version>
+                <version>2.0-0.2.1</version>
                 <scope>provided</scope>
             </dependency>
         </dependencies>