Issue 335 add mu-jwt system property support and testing

MicroShed · Sep 19, 2019 · 0f25afe · 0f25afe
2 parents b4cac73 + 34c24b9
commit 0f25afe
Show file tree

Hide file tree

Showing 139 changed files with 1,094 additions and 892 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</version>
+    <version>0.2.2-SNAPSHOT</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/...ain/java/boost/common/BoostException.java → ...icroshed/boost/common/BoostException.java b/...ain/java/boost/common/BoostException.java → ...icroshed/boost/common/BoostException.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package boost.common;
+package org.microshed.boost.common;
 
 import io.openliberty.tools.common.plugins.util.PluginExecutionException;
 

diff --git a/.../main/java/boost/common/BoostLoggerI.java → .../microshed/boost/common/BoostLoggerI.java b/.../main/java/boost/common/BoostLoggerI.java → .../microshed/boost/common/BoostLoggerI.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package boost.common;
+package org.microshed.boost.common;
 
 public interface BoostLoggerI {
 

diff --git a/...ommon/boosters/AbstractBoosterConfig.java → ...ommon/boosters/AbstractBoosterConfig.java b/...ommon/boosters/AbstractBoosterConfig.java → ...ommon/boosters/AbstractBoosterConfig.java
@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
-package boost.common.boosters;
+package org.microshed.boost.common.boosters;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -18,7 +18,7 @@
 import java.lang.annotation.Target;
 import java.util.List;
 
-import boost.common.BoostException;
+import org.microshed.boost.common.BoostException;
 
 /**
  * Interface to describe common function across all technology Booster Pack
@@ -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.2";
     public static final String snapShot = "-SNAPSHOT";
     public static final String fullSnapshotString = milestone + snapShot;
     public static final String emptyString = "";
@@ -45,9 +45,9 @@ public abstract class AbstractBoosterConfig {
     public static final String JSONP_VERSION_11 = "1.1" + boostVersion + emptyString;
     public static final String JPA_VERSION_21 = "2.1" + boostVersion + emptyString;
     public static final String JPA_VERSION_22 = "2.2" + boostVersion + emptyString;
+    public static final String MP_HEALTH_VERSION_10 = "1.0" + boostVersion + emptyString;
     public static final String MP_HEALTH_VERSION_20 = "2.0" + boostVersion + emptyString;
     public static final String BEANVALIDATION_VERSION_20 = "2.0" + boostVersion + emptyString;
-    public static final String MP_HEALTH_VERSION_10 = "1.0" + boostVersion + emptyString;
     public static final String MP_CONFIG_VERSION_13 = "1.3" + boostVersion + emptyString;
     public static final String MP_JWT_VERSION_11 = "1.1" + boostVersion + emptyString;
     public static final String MP_METRICS_VERSION_11 = "1.1" + boostVersion + emptyString;

diff --git a/...boosters/BeanValidationBoosterConfig.java → ...boosters/BeanValidationBoosterConfig.java b/...boosters/BeanValidationBoosterConfig.java → ...boosters/BeanValidationBoosterConfig.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package boost.common.boosters;
+package org.microshed.boost.common.boosters;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import boost.common.BoostException;
-import boost.common.BoostLoggerI;
-import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
-import boost.common.config.BoosterConfigParams;
+import org.microshed.boost.common.BoostException;
+import org.microshed.boost.common.BoostLoggerI;
+import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
+import org.microshed.boost.common.config.BoosterConfigParams;
 
 @BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":bean-validation")
 public class BeanValidationBoosterConfig extends AbstractBoosterConfig {

diff --git a/...ost/common/boosters/CDIBoosterConfig.java → ...ost/common/boosters/CDIBoosterConfig.java b/...ost/common/boosters/CDIBoosterConfig.java → ...ost/common/boosters/CDIBoosterConfig.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package boost.common.boosters;
+package org.microshed.boost.common.boosters;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import boost.common.BoostException;
-import boost.common.BoostLoggerI;
-import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
-import boost.common.config.BoosterConfigParams;
+import org.microshed.boost.common.BoostException;
+import org.microshed.boost.common.BoostLoggerI;
+import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
+import org.microshed.boost.common.config.BoosterConfigParams;
 
 @BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":cdi")
 public class CDIBoosterConfig extends AbstractBoosterConfig {

diff --git a/...t/common/boosters/JAXRSBoosterConfig.java → ...t/common/boosters/JAXRSBoosterConfig.java b/...t/common/boosters/JAXRSBoosterConfig.java → ...t/common/boosters/JAXRSBoosterConfig.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package boost.common.boosters;
+package org.microshed.boost.common.boosters;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import boost.common.BoostException;
-import boost.common.BoostLoggerI;
-import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
-import boost.common.config.BoosterConfigParams;
+import org.microshed.boost.common.BoostException;
+import org.microshed.boost.common.BoostLoggerI;
+import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
+import org.microshed.boost.common.config.BoosterConfigParams;
 
 @BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":jaxrs")
 public class JAXRSBoosterConfig extends AbstractBoosterConfig {

diff --git a/...st/common/boosters/JDBCBoosterConfig.java → ...st/common/boosters/JDBCBoosterConfig.java b/...st/common/boosters/JDBCBoosterConfig.java → ...st/common/boosters/JDBCBoosterConfig.java
@@ -8,21 +8,21 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package boost.common.boosters;
+package org.microshed.boost.common.boosters;
 
-import static boost.common.config.ConfigConstants.*;
+import static org.microshed.boost.common.config.ConfigConstants.*;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import boost.common.BoostException;
-import boost.common.BoostLoggerI;
-import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
-import boost.common.config.BoostProperties;
-import boost.common.config.BoosterConfigParams;
+import org.microshed.boost.common.BoostException;
+import org.microshed.boost.common.BoostLoggerI;
+import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
+import org.microshed.boost.common.config.BoostProperties;
+import org.microshed.boost.common.config.BoosterConfigParams;
 
 @BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":jdbc")
 public class JDBCBoosterConfig extends AbstractBoosterConfig {

diff --git a/...ost/common/boosters/JPABoosterConfig.java → ...ost/common/boosters/JPABoosterConfig.java b/...ost/common/boosters/JPABoosterConfig.java → ...ost/common/boosters/JPABoosterConfig.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package boost.common.boosters;
+package org.microshed.boost.common.boosters;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import boost.common.BoostException;
-import boost.common.BoostLoggerI;
-import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
-import boost.common.config.BoosterConfigParams;
+import org.microshed.boost.common.BoostException;
+import org.microshed.boost.common.BoostLoggerI;
+import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
+import org.microshed.boost.common.config.BoosterConfigParams;
 
 @BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":jpa")
 public class JPABoosterConfig extends AbstractBoosterConfig {

diff --git a/...t/common/boosters/JSONBBoosterConfig.java → ...t/common/boosters/JSONBBoosterConfig.java b/...t/common/boosters/JSONBBoosterConfig.java → ...t/common/boosters/JSONBBoosterConfig.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package boost.common.boosters;
+package org.microshed.boost.common.boosters;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import boost.common.BoostException;
-import boost.common.BoostLoggerI;
-import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
-import boost.common.config.BoosterConfigParams;
+import org.microshed.boost.common.BoostException;
+import org.microshed.boost.common.BoostLoggerI;
+import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
+import org.microshed.boost.common.config.BoosterConfigParams;
 
 @BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":jsonb")
 public class JSONBBoosterConfig extends AbstractBoosterConfig {

diff --git a/...t/common/boosters/JSONPBoosterConfig.java → ...t/common/boosters/JSONPBoosterConfig.java b/...t/common/boosters/JSONPBoosterConfig.java → ...t/common/boosters/JSONPBoosterConfig.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package boost.common.boosters;
+package org.microshed.boost.common.boosters;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import boost.common.BoostException;
-import boost.common.BoostLoggerI;
-import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
-import boost.common.config.BoosterConfigParams;
+import org.microshed.boost.common.BoostException;
+import org.microshed.boost.common.BoostLoggerI;
+import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
+import org.microshed.boost.common.config.BoosterConfigParams;
 
 @BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":jsonp")
 public class JSONPBoosterConfig extends AbstractBoosterConfig {

diff --git a/...ommon/boosters/MPConfigBoosterConfig.java → ...ommon/boosters/MPConfigBoosterConfig.java b/...ommon/boosters/MPConfigBoosterConfig.java → ...ommon/boosters/MPConfigBoosterConfig.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package boost.common.boosters;
+package org.microshed.boost.common.boosters;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import boost.common.BoostException;
-import boost.common.BoostLoggerI;
-import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
-import boost.common.config.BoosterConfigParams;
+import org.microshed.boost.common.BoostException;
+import org.microshed.boost.common.BoostLoggerI;
+import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
+import org.microshed.boost.common.config.BoosterConfigParams;
 
 @BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":mp-config")
 public class MPConfigBoosterConfig extends AbstractBoosterConfig {

diff --git a/...osters/MPFaultToleranceBoosterConfig.java → ...osters/MPFaultToleranceBoosterConfig.java b/...osters/MPFaultToleranceBoosterConfig.java → ...osters/MPFaultToleranceBoosterConfig.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package boost.common.boosters;
+package org.microshed.boost.common.boosters;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import boost.common.BoostException;
-import boost.common.BoostLoggerI;
-import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
-import boost.common.config.BoosterConfigParams;
+import org.microshed.boost.common.BoostException;
+import org.microshed.boost.common.BoostLoggerI;
+import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
+import org.microshed.boost.common.config.BoosterConfigParams;
 
 @BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":mp-fault-tolerance")
 public class MPFaultToleranceBoosterConfig extends AbstractBoosterConfig {

diff --git a/...ommon/boosters/MPHealthBoosterConfig.java → ...ommon/boosters/MPHealthBoosterConfig.java b/...ommon/boosters/MPHealthBoosterConfig.java → ...ommon/boosters/MPHealthBoosterConfig.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package boost.common.boosters;
+package org.microshed.boost.common.boosters;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import boost.common.BoostException;
-import boost.common.BoostLoggerI;
-import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
-import boost.common.config.BoosterConfigParams;
+import org.microshed.boost.common.BoostException;
+import org.microshed.boost.common.BoostLoggerI;
+import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
+import org.microshed.boost.common.config.BoosterConfigParams;
 
 @BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":mp-health")
 public class MPHealthBoosterConfig extends AbstractBoosterConfig {