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

Commit 8cc53d6

Browse files
committed
Issue 335 add support for system properties for mp-jwt
2 parents b4cac73 + 34c24b9 commit 8cc53d6

File tree

137 files changed

+1099
-867
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+1099
-867
lines changed

.travis.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,7 @@ before_install:
2222
- echo "Deleting old .m2 artifacts..."
2323
- rm -rf $HOME/.m2/repository/net/wasdev
2424
- rm -rf $HOME/.m2/repository/io/openliberty
25-
- echo 'Installing ci.maven lib ....'
26-
- git clone https://github.com/OpenLiberty/ci.maven.git ./ci.maven
27-
- cd ./ci.maven
28-
- git checkout liberty-maven-3.0
29-
- mvn clean install
30-
- cd ..
25+
- rm -rf $HOME/.m2/repository/org/microshed
3126
- docker run -d -p 5000:5000 --restart=always --name registry registry:2
3227
install: true
3328
before_script:

boost-common/pom.xml

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<groupId>org.microshed.boost</groupId>
1212
<artifactId>boost-common</artifactId>
13-
<version>0.2</version>
13+
<version>0.2.2-SNAPSHOT</version>
1414

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

@@ -83,4 +83,77 @@
8383
</dependency>
8484
</dependencies>
8585

86+
87+
<build>
88+
<pluginManagement>
89+
<plugins>
90+
<plugin>
91+
<groupId>org.sonatype.plugins</groupId>
92+
<artifactId>nexus-staging-maven-plugin</artifactId>
93+
<version>1.6.8</version>
94+
<configuration>
95+
<serverId>ossrh</serverId>
96+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
97+
<autoReleaseAfterClose>false</autoReleaseAfterClose>
98+
<!-- Skip based on the maven.deploy.skip property -->
99+
<skipNexusStagingDeployMojo>${maven.deploy.skip}</skipNexusStagingDeployMojo>
100+
</configuration>
101+
</plugin>
102+
</plugins>
103+
</pluginManagement>
104+
</build>
105+
106+
<profiles>
107+
<profile>
108+
<id>oss-release</id>
109+
<build>
110+
<plugins>
111+
<plugin>
112+
<groupId>org.apache.maven.plugins</groupId>
113+
<artifactId>maven-source-plugin</artifactId>
114+
<executions>
115+
<execution>
116+
<id>attach-sources</id>
117+
<goals>
118+
<goal>jar</goal>
119+
</goals>
120+
</execution>
121+
</executions>
122+
</plugin>
123+
<plugin>
124+
<groupId>org.apache.maven.plugins</groupId>
125+
<artifactId>maven-javadoc-plugin</artifactId>
126+
<executions>
127+
<execution>
128+
<id>attach-javadocs</id>
129+
<goals>
130+
<goal>jar</goal>
131+
</goals>
132+
</execution>
133+
</executions>
134+
</plugin>
135+
<plugin>
136+
<groupId>org.apache.maven.plugins</groupId>
137+
<artifactId>maven-gpg-plugin</artifactId>
138+
<version>1.4</version>
139+
<executions>
140+
<execution>
141+
<id>sign-artifacts</id>
142+
<phase>verify</phase>
143+
<goals>
144+
<goal>sign</goal>
145+
</goals>
146+
</execution>
147+
</executions>
148+
</plugin>
149+
<plugin>
150+
<groupId>org.sonatype.plugins</groupId>
151+
<artifactId>nexus-staging-maven-plugin</artifactId>
152+
<extensions>true</extensions>
153+
</plugin>
154+
</plugins>
155+
</build>
156+
</profile>
157+
</profiles>
158+
86159
</project>

boost-common/src/main/java/boost/common/BoostException.java renamed to boost-common/src/main/java/org/microshed/boost/common/BoostException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* IBM Corporation - initial API and implementation
1010
*******************************************************************************/
1111

12-
package boost.common;
12+
package org.microshed.boost.common;
1313

1414
import io.openliberty.tools.common.plugins.util.PluginExecutionException;
1515

boost-common/src/main/java/boost/common/BoostLoggerI.java renamed to boost-common/src/main/java/org/microshed/boost/common/BoostLoggerI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Contributors:
99
* IBM Corporation - initial API and implementation
1010
*******************************************************************************/
11-
package boost.common;
11+
package org.microshed.boost.common;
1212

1313
public interface BoostLoggerI {
1414

boost-common/src/main/java/boost/common/boosters/AbstractBoosterConfig.java renamed to boost-common/src/main/java/org/microshed/boost/common/boosters/AbstractBoosterConfig.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* IBM Corporation - initial API and implementation
1010
*******************************************************************************/
1111

12-
package boost.common.boosters;
12+
package org.microshed.boost.common.boosters;
1313

1414
import java.lang.annotation.ElementType;
1515
import java.lang.annotation.Inherited;
@@ -18,7 +18,7 @@
1818
import java.lang.annotation.Target;
1919
import java.util.List;
2020

21-
import boost.common.BoostException;
21+
import org.microshed.boost.common.BoostException;
2222

2323
/**
2424
* Interface to describe common function across all technology Booster Pack
@@ -30,7 +30,7 @@ public abstract class AbstractBoosterConfig {
3030
// version string format:
3131
// <Major>.<Minor>-<boost version>-<Milestone>[-SNAPSHOT]
3232
public static final String milestone = "-M1";
33-
public static final String boostVersion = "-0.2";
33+
public static final String boostVersion = "-0.2.2";
3434
public static final String snapShot = "-SNAPSHOT";
3535
public static final String fullSnapshotString = milestone + snapShot;
3636
public static final String emptyString = "";
@@ -45,9 +45,9 @@ public abstract class AbstractBoosterConfig {
4545
public static final String JSONP_VERSION_11 = "1.1" + boostVersion + emptyString;
4646
public static final String JPA_VERSION_21 = "2.1" + boostVersion + emptyString;
4747
public static final String JPA_VERSION_22 = "2.2" + boostVersion + emptyString;
48+
public static final String MP_HEALTH_VERSION_10 = "1.0" + boostVersion + emptyString;
4849
public static final String MP_HEALTH_VERSION_20 = "2.0" + boostVersion + emptyString;
4950
public static final String BEANVALIDATION_VERSION_20 = "2.0" + boostVersion + emptyString;
50-
public static final String MP_HEALTH_VERSION_10 = "1.0" + boostVersion + emptyString;
5151
public static final String MP_CONFIG_VERSION_13 = "1.3" + boostVersion + emptyString;
5252
public static final String MP_JWT_VERSION_11 = "1.1" + boostVersion + emptyString;
5353
public static final String MP_METRICS_VERSION_11 = "1.1" + boostVersion + emptyString;

boost-common/src/main/java/boost/common/boosters/BeanValidationBoosterConfig.java renamed to boost-common/src/main/java/org/microshed/boost/common/boosters/BeanValidationBoosterConfig.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
* Contributors:
99
* IBM Corporation - initial API and implementation
1010
*******************************************************************************/
11-
package boost.common.boosters;
11+
package org.microshed.boost.common.boosters;
1212

1313
import java.util.ArrayList;
1414
import java.util.List;
1515

16-
import boost.common.BoostException;
17-
import boost.common.BoostLoggerI;
18-
import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19-
import boost.common.config.BoosterConfigParams;
16+
import org.microshed.boost.common.BoostException;
17+
import org.microshed.boost.common.BoostLoggerI;
18+
import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19+
import org.microshed.boost.common.config.BoosterConfigParams;
2020

2121
@BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":bean-validation")
2222
public class BeanValidationBoosterConfig extends AbstractBoosterConfig {

boost-common/src/main/java/boost/common/boosters/CDIBoosterConfig.java renamed to boost-common/src/main/java/org/microshed/boost/common/boosters/CDIBoosterConfig.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
* Contributors:
99
* IBM Corporation - initial API and implementation
1010
*******************************************************************************/
11-
package boost.common.boosters;
11+
package org.microshed.boost.common.boosters;
1212

1313
import java.util.ArrayList;
1414
import java.util.List;
1515

16-
import boost.common.BoostException;
17-
import boost.common.BoostLoggerI;
18-
import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19-
import boost.common.config.BoosterConfigParams;
16+
import org.microshed.boost.common.BoostException;
17+
import org.microshed.boost.common.BoostLoggerI;
18+
import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19+
import org.microshed.boost.common.config.BoosterConfigParams;
2020

2121
@BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":cdi")
2222
public class CDIBoosterConfig extends AbstractBoosterConfig {

boost-common/src/main/java/boost/common/boosters/JAXRSBoosterConfig.java renamed to boost-common/src/main/java/org/microshed/boost/common/boosters/JAXRSBoosterConfig.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
* Contributors:
99
* IBM Corporation - initial API and implementation
1010
*******************************************************************************/
11-
package boost.common.boosters;
11+
package org.microshed.boost.common.boosters;
1212

1313
import java.util.ArrayList;
1414
import java.util.List;
1515

16-
import boost.common.BoostException;
17-
import boost.common.BoostLoggerI;
18-
import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19-
import boost.common.config.BoosterConfigParams;
16+
import org.microshed.boost.common.BoostException;
17+
import org.microshed.boost.common.BoostLoggerI;
18+
import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19+
import org.microshed.boost.common.config.BoosterConfigParams;
2020

2121
@BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":jaxrs")
2222
public class JAXRSBoosterConfig extends AbstractBoosterConfig {

boost-common/src/main/java/boost/common/boosters/JDBCBoosterConfig.java renamed to boost-common/src/main/java/org/microshed/boost/common/boosters/JDBCBoosterConfig.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@
88
* Contributors:
99
* IBM Corporation - initial API and implementation
1010
*******************************************************************************/
11-
package boost.common.boosters;
11+
package org.microshed.boost.common.boosters;
1212

13-
import static boost.common.config.ConfigConstants.*;
13+
import static org.microshed.boost.common.config.ConfigConstants.*;
1414

1515
import java.util.ArrayList;
1616
import java.util.HashMap;
1717
import java.util.List;
1818
import java.util.Map;
1919
import java.util.Properties;
2020

21-
import boost.common.BoostException;
22-
import boost.common.BoostLoggerI;
23-
import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
24-
import boost.common.config.BoostProperties;
25-
import boost.common.config.BoosterConfigParams;
21+
import org.microshed.boost.common.BoostException;
22+
import org.microshed.boost.common.BoostLoggerI;
23+
import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
24+
import org.microshed.boost.common.config.BoostProperties;
25+
import org.microshed.boost.common.config.BoosterConfigParams;
2626

2727
@BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":jdbc")
2828
public class JDBCBoosterConfig extends AbstractBoosterConfig {

boost-common/src/main/java/boost/common/boosters/JPABoosterConfig.java renamed to boost-common/src/main/java/org/microshed/boost/common/boosters/JPABoosterConfig.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
* Contributors:
99
* IBM Corporation - initial API and implementation
1010
*******************************************************************************/
11-
package boost.common.boosters;
11+
package org.microshed.boost.common.boosters;
1212

1313
import java.util.ArrayList;
1414
import java.util.List;
1515

16-
import boost.common.BoostException;
17-
import boost.common.BoostLoggerI;
18-
import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19-
import boost.common.config.BoosterConfigParams;
16+
import org.microshed.boost.common.BoostException;
17+
import org.microshed.boost.common.BoostLoggerI;
18+
import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19+
import org.microshed.boost.common.config.BoosterConfigParams;
2020

2121
@BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":jpa")
2222
public class JPABoosterConfig extends AbstractBoosterConfig {

boost-common/src/main/java/boost/common/boosters/JSONBBoosterConfig.java renamed to boost-common/src/main/java/org/microshed/boost/common/boosters/JSONBBoosterConfig.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
* Contributors:
99
* IBM Corporation - initial API and implementation
1010
*******************************************************************************/
11-
package boost.common.boosters;
11+
package org.microshed.boost.common.boosters;
1212

1313
import java.util.ArrayList;
1414
import java.util.List;
1515

16-
import boost.common.BoostException;
17-
import boost.common.BoostLoggerI;
18-
import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19-
import boost.common.config.BoosterConfigParams;
16+
import org.microshed.boost.common.BoostException;
17+
import org.microshed.boost.common.BoostLoggerI;
18+
import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19+
import org.microshed.boost.common.config.BoosterConfigParams;
2020

2121
@BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":jsonb")
2222
public class JSONBBoosterConfig extends AbstractBoosterConfig {

boost-common/src/main/java/boost/common/boosters/JSONPBoosterConfig.java renamed to boost-common/src/main/java/org/microshed/boost/common/boosters/JSONPBoosterConfig.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
* Contributors:
99
* IBM Corporation - initial API and implementation
1010
*******************************************************************************/
11-
package boost.common.boosters;
11+
package org.microshed.boost.common.boosters;
1212

1313
import java.util.ArrayList;
1414
import java.util.List;
1515

16-
import boost.common.BoostException;
17-
import boost.common.BoostLoggerI;
18-
import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19-
import boost.common.config.BoosterConfigParams;
16+
import org.microshed.boost.common.BoostException;
17+
import org.microshed.boost.common.BoostLoggerI;
18+
import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19+
import org.microshed.boost.common.config.BoosterConfigParams;
2020

2121
@BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":jsonp")
2222
public class JSONPBoosterConfig extends AbstractBoosterConfig {

boost-common/src/main/java/boost/common/boosters/MPConfigBoosterConfig.java renamed to boost-common/src/main/java/org/microshed/boost/common/boosters/MPConfigBoosterConfig.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
* Contributors:
99
* IBM Corporation - initial API and implementation
1010
*******************************************************************************/
11-
package boost.common.boosters;
11+
package org.microshed.boost.common.boosters;
1212

1313
import java.util.ArrayList;
1414
import java.util.List;
1515

16-
import boost.common.BoostException;
17-
import boost.common.BoostLoggerI;
18-
import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19-
import boost.common.config.BoosterConfigParams;
16+
import org.microshed.boost.common.BoostException;
17+
import org.microshed.boost.common.BoostLoggerI;
18+
import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19+
import org.microshed.boost.common.config.BoosterConfigParams;
2020

2121
@BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":mp-config")
2222
public class MPConfigBoosterConfig extends AbstractBoosterConfig {

boost-common/src/main/java/boost/common/boosters/MPFaultToleranceBoosterConfig.java renamed to boost-common/src/main/java/org/microshed/boost/common/boosters/MPFaultToleranceBoosterConfig.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
* Contributors:
99
* IBM Corporation - initial API and implementation
1010
*******************************************************************************/
11-
package boost.common.boosters;
11+
package org.microshed.boost.common.boosters;
1212

1313
import java.util.ArrayList;
1414
import java.util.List;
1515

16-
import boost.common.BoostException;
17-
import boost.common.BoostLoggerI;
18-
import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19-
import boost.common.config.BoosterConfigParams;
16+
import org.microshed.boost.common.BoostException;
17+
import org.microshed.boost.common.BoostLoggerI;
18+
import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19+
import org.microshed.boost.common.config.BoosterConfigParams;
2020

2121
@BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":mp-fault-tolerance")
2222
public class MPFaultToleranceBoosterConfig extends AbstractBoosterConfig {

boost-common/src/main/java/boost/common/boosters/MPHealthBoosterConfig.java renamed to boost-common/src/main/java/org/microshed/boost/common/boosters/MPHealthBoosterConfig.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
* Contributors:
99
* IBM Corporation - initial API and implementation
1010
*******************************************************************************/
11-
package boost.common.boosters;
11+
package org.microshed.boost.common.boosters;
1212

1313
import java.util.ArrayList;
1414
import java.util.List;
1515

16-
import boost.common.BoostException;
17-
import boost.common.BoostLoggerI;
18-
import boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19-
import boost.common.config.BoosterConfigParams;
16+
import org.microshed.boost.common.BoostException;
17+
import org.microshed.boost.common.BoostLoggerI;
18+
import org.microshed.boost.common.boosters.AbstractBoosterConfig.BoosterCoordinates;
19+
import org.microshed.boost.common.config.BoosterConfigParams;
2020

2121
@BoosterCoordinates(AbstractBoosterConfig.BOOSTERS_GROUP_ID + ":mp-health")
2222
public class MPHealthBoosterConfig extends AbstractBoosterConfig {

0 commit comments

Comments
 (0)