You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by rm...@apache.org on 2020/11/10 15:27:38 UTC
[openwebbeans-meecrowave] branch master updated (8e3a59c -> 279d2fd)
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git.
from 8e3a59c [MEECROWAVE-267] oauth2 claim support (basic)
new 2ca73a2 [MEECROWAVE-268] log4j2 2.14.0
new 94f7181 [MEECROWAVE-269] oauth2-minimal pom
new 279d2fd minor updated to build on java 11 and upgrade jbake for the doc
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
integration-tests/app-groovy/pom.xml | 2 +-
meecrowave-core/pom.xml | 2 +-
.../meecrowave/openwebbeans/KnownJarsFilter.java | 1 +
meecrowave-doc/pom.xml | 41 ++++++-
.../main/java/org/apache/meecrowave/doc/JBake.java | 14 +--
.../jbake/content/meecrowave-oauth2/index.adoc | 11 ++
.../pom.xml | 95 ++++-----------
.../oauth2/configuration/JCacheConfigurer.java | 0
.../oauth2/configuration/JPAAdapter.java | 6 +-
.../oauth2/configuration/OAuth2Configurer.java | 0
.../oauth2/configuration/OAuth2Options.java | 0
.../oauth2/data/RefreshTokenEnabledProvider.java | 0
.../oauth2/provider/JCacheCodeDataProvider.java | 0
.../oauth2/resource/OAuth2Application.java | 0
.../OAuth2AuthorizationCodeGrantService.java | 0
.../oauth2/resource/OAuth2RevokeTokenService.java | 0
.../oauth2/resource/OAuth2TokenService.java | 0
.../src/main/resources/META-INF/LICENSE | 0
.../src/main/resources/META-INF/NOTICE | 0
.../src/main/resources/META-INF/beans.xml | 0
.../org.apache.meecrowave.runner.Cli$Options | 0
.../src/main/resources/default-oauth2.jcs | 0
.../org/apache/meecrowave/oauth2/Keystores.java | 0
.../org/apache/meecrowave/oauth2/OAuth2Test.java | 0
meecrowave-oauth2/pom.xml | 130 ++++-----------------
meecrowave-proxy/pom.xml | 7 +-
pom.xml | 8 +-
27 files changed, 117 insertions(+), 200 deletions(-)
copy {meecrowave-oauth2 => meecrowave-oauth2-minimal}/pom.xml (65%)
rename {meecrowave-oauth2 => meecrowave-oauth2-minimal}/src/main/java/org/apache/meecrowave/oauth2/configuration/JCacheConfigurer.java (100%)
rename {meecrowave-oauth2 => meecrowave-oauth2-minimal}/src/main/java/org/apache/meecrowave/oauth2/configuration/JPAAdapter.java (94%)
rename {meecrowave-oauth2 => meecrowave-oauth2-minimal}/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java (100%)
rename {meecrowave-oauth2 => meecrowave-oauth2-minimal}/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Options.java (100%)
rename {meecrowave-oauth2 => meecrowave-oauth2-minimal}/src/main/java/org/apache/meecrowave/oauth2/data/RefreshTokenEnabledProvider.java (100%)
rename {meecrowave-oauth2 => meecrowave-oauth2-minimal}/src/main/java/org/apache/meecrowave/oauth2/provider/JCacheCodeDataProvider.java (100%)
rename {meecrowave-oauth2 => meecrowave-oauth2-minimal}/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2Application.java (100%)
rename {meecrowave-oauth2 => meecrowave-oauth2-minimal}/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java (100%)
rename {meecrowave-oauth2 => meecrowave-oauth2-minimal}/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2RevokeTokenService.java (100%)
rename {meecrowave-oauth2 => meecrowave-oauth2-minimal}/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2TokenService.java (100%)
rename {meecrowave-oauth2 => meecrowave-oauth2-minimal}/src/main/resources/META-INF/LICENSE (100%)
rename {meecrowave-oauth2 => meecrowave-oauth2-minimal}/src/main/resources/META-INF/NOTICE (100%)
rename {meecrowave-oauth2 => meecrowave-oauth2-minimal}/src/main/resources/META-INF/beans.xml (100%)
rename {meecrowave-oauth2 => meecrowave-oauth2-minimal}/src/main/resources/META-INF/services/org.apache.meecrowave.runner.Cli$Options (100%)
rename {meecrowave-oauth2 => meecrowave-oauth2-minimal}/src/main/resources/default-oauth2.jcs (100%)
rename {meecrowave-oauth2 => meecrowave-oauth2-minimal}/src/test/java/org/apache/meecrowave/oauth2/Keystores.java (100%)
rename {meecrowave-oauth2 => meecrowave-oauth2-minimal}/src/test/java/org/apache/meecrowave/oauth2/OAuth2Test.java (100%)
[openwebbeans-meecrowave] 01/03: [MEECROWAVE-268] log4j2 2.14.0
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git
commit 2ca73a2499d83fd1f98a44f369e3735668143037
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Tue Nov 10 15:50:03 2020 +0100
[MEECROWAVE-268] log4j2 2.14.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8639d41..28824a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
<cxf.version>3.4.1</cxf.version>
<openwebbeans.version>2.0.20-SNAPSHOT</openwebbeans.version>
<johnzon.version>1.2.8</johnzon.version>
- <log4j2.version>2.13.3</log4j2.version>
+ <log4j2.version>2.14.0</log4j2.version>
<deltaspike.version>1.8.2</deltaspike.version>
<jaxb.version>2.2.11</jaxb.version>
<openjpa.version>3.1.2</openjpa.version>
[openwebbeans-meecrowave] 03/03: minor updated to build on java 11
and upgrade jbake for the doc
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git
commit 279d2fd1eea662f4e25f94a2104c08e71f113b99
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Tue Nov 10 16:27:32 2020 +0100
minor updated to build on java 11 and upgrade jbake for the doc
---
integration-tests/app-groovy/pom.xml | 2 +-
meecrowave-core/pom.xml | 2 +-
.../meecrowave/openwebbeans/KnownJarsFilter.java | 1 +
meecrowave-doc/pom.xml | 41 +++++++++++++++++++---
.../main/java/org/apache/meecrowave/doc/JBake.java | 14 ++++----
.../jbake/content/meecrowave-oauth2/index.adoc | 11 ++++++
meecrowave-proxy/pom.xml | 7 +++-
7 files changed, 62 insertions(+), 16 deletions(-)
diff --git a/integration-tests/app-groovy/pom.xml b/integration-tests/app-groovy/pom.xml
index a63543d..8f09343 100644
--- a/integration-tests/app-groovy/pom.xml
+++ b/integration-tests/app-groovy/pom.xml
@@ -52,7 +52,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.8.1</version>
<configuration>
<compilerId>groovy-eclipse-compiler</compilerId>
</configuration>
diff --git a/meecrowave-core/pom.xml b/meecrowave-core/pom.xml
index 48726f1..ffcbc94 100644
--- a/meecrowave-core/pom.xml
+++ b/meecrowave-core/pom.xml
@@ -368,7 +368,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>3.8.1</version>
<executions>
<execution>
<id>log4j-plugin-processor</id>
diff --git a/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownJarsFilter.java b/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownJarsFilter.java
index 9153d90..8b69090 100644
--- a/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownJarsFilter.java
+++ b/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/KnownJarsFilter.java
@@ -32,6 +32,7 @@ import org.apache.tomcat.JarScanType;
public class KnownJarsFilter implements JarScanFilter {
private final Collection<String> forceIncludes = new HashSet<String>() {{
add("cxf-integration-cdi");
+ add("geronimo-jcache-simple");
}};
private final Collection<String> excludes = new HashSet<String>() {{
diff --git a/meecrowave-doc/pom.xml b/meecrowave-doc/pom.xml
index a9c4d0f..563da65 100644
--- a/meecrowave-doc/pom.xml
+++ b/meecrowave-doc/pom.xml
@@ -43,14 +43,35 @@
<dependencies>
<dependency>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctorj-pdf</artifactId>
- <version>1.5.0-alpha.16</version>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby</artifactId>
+ <version>9.2.13.0</version>
</dependency>
<dependency>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctorj</artifactId>
- <version>1.5.8.1</version>
+ <version>2.2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj-pdf</artifactId>
+ <version>1.5.0-alpha.16</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
@@ -109,7 +130,17 @@
<dependency>
<groupId>org.jbake</groupId>
<artifactId>jbake-core</artifactId>
- <version>2.6.4</version>
+ <version>2.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.10</version>
+ </dependency>
+ <dependency>
+ <groupId>com.orientechnologies</groupId>
+ <artifactId>orientdb-core</artifactId>
+ <version>3.0.30</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
diff --git a/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/JBake.java b/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/JBake.java
index 75801f9..9746ef4 100755
--- a/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/JBake.java
+++ b/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/JBake.java
@@ -59,6 +59,7 @@ import org.jbake.app.configuration.ConfigUtil;
import org.jbake.app.configuration.DefaultJBakeConfiguration;
import com.orientechnologies.orient.core.Orient;
+import org.jbake.app.configuration.JBakeConfigurationFactory;
public class JBake {
private JBake() {
@@ -115,9 +116,7 @@ public class JBake {
System.out.println("Building Meecrowave website in " + destination);
final Orient orient = Orient.instance();
try {
- orient.startup();
-
- final Oven oven = new Oven(source, destination, new CompositeConfiguration() {{
+ final Oven oven = new Oven(new JBakeConfigurationFactory().createDefaultJbakeConfiguration(source, destination, new CompositeConfiguration() {{
final CompositeConfiguration config = new CompositeConfiguration();
config.addConfiguration(new MapConfiguration(new HashMap<String, Object>() {{
put("asciidoctor.attributes", new ArrayList<String>() {{
@@ -129,8 +128,7 @@ public class JBake {
config.addConfiguration(DefaultJBakeConfiguration.class.cast(
new ConfigUtil().loadConfig(source)).getCompositeConfiguration());
addConfiguration(config);
- }}, true);
- oven.setupPaths();
+ }}, true));
System.out.println(" > baking");
oven.bake();
@@ -175,7 +173,7 @@ public class JBake {
try {
sleep(TimeUnit.SECONDS.toMillis(1));
} catch (final InterruptedException e) {
- Thread.interrupted();
+ Thread.currentThread().interrupt();
break;
}
}
@@ -212,7 +210,7 @@ public class JBake {
}
key.reset();
} catch (final InterruptedException e) {
- Thread.interrupted();
+ Thread.currentThread().interrupt();
run.compareAndSet(true, false);
} catch (final ClosedWatchServiceException cwse) {
if (!run.get()) {
@@ -233,7 +231,7 @@ public class JBake {
try {
thread.join();
} catch (final InterruptedException e) {
- Thread.interrupted();
+ Thread.currentThread().interrupt();
}
});
try {
diff --git a/meecrowave-doc/src/main/jbake/content/meecrowave-oauth2/index.adoc b/meecrowave-doc/src/main/jbake/content/meecrowave-oauth2/index.adoc
index 645f631..4bbea58 100755
--- a/meecrowave-doc/src/main/jbake/content/meecrowave-oauth2/index.adoc
+++ b/meecrowave-doc/src/main/jbake/content/meecrowave-oauth2/index.adoc
@@ -20,6 +20,17 @@ Coordinates:
</dependency>
----
+Or to not get JPA/JCache implementations:
+
+[source,xml]
+----
+<dependency>
+ <groupId>org.apache.meecrowave</groupId>
+ <artifactId>meecrowave-oauth2-minimal</artifactId>
+ <version>${meecrowave.version}</version>
+</dependency>
+----
+
A small OAuth2 server based on CXF implementation.
See http://cxf.apache.org/docs/jax-rs-oauth2.html for more details.
diff --git a/meecrowave-proxy/pom.xml b/meecrowave-proxy/pom.xml
index 0de91ae..71d6026 100644
--- a/meecrowave-proxy/pom.xml
+++ b/meecrowave-proxy/pom.xml
@@ -51,7 +51,12 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
-
+ <dependency> <!-- for multiparttest on java > 8 -->
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.meecrowave</groupId>
<artifactId>meecrowave-junit</artifactId>
[openwebbeans-meecrowave] 02/03: [MEECROWAVE-269] oauth2-minimal pom
Posted by rm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git
commit 94f7181bad08aa935db30c1e0d032ac9cd3e746f
Author: Romain Manni-Bucau <rm...@gmail.com>
AuthorDate: Tue Nov 10 16:27:08 2020 +0100
[MEECROWAVE-269] oauth2-minimal pom
---
.../pom.xml | 95 ++++-----------
.../oauth2/configuration/JCacheConfigurer.java | 0
.../oauth2/configuration/JPAAdapter.java | 6 +-
.../oauth2/configuration/OAuth2Configurer.java | 0
.../oauth2/configuration/OAuth2Options.java | 0
.../oauth2/data/RefreshTokenEnabledProvider.java | 0
.../oauth2/provider/JCacheCodeDataProvider.java | 0
.../oauth2/resource/OAuth2Application.java | 0
.../OAuth2AuthorizationCodeGrantService.java | 0
.../oauth2/resource/OAuth2RevokeTokenService.java | 0
.../oauth2/resource/OAuth2TokenService.java | 0
.../src/main/resources/META-INF/LICENSE | 0
.../src/main/resources/META-INF/NOTICE | 0
.../src/main/resources/META-INF/beans.xml | 0
.../org.apache.meecrowave.runner.Cli$Options | 0
.../src/main/resources/default-oauth2.jcs | 0
.../org/apache/meecrowave/oauth2/Keystores.java | 0
.../org/apache/meecrowave/oauth2/OAuth2Test.java | 0
meecrowave-oauth2/pom.xml | 130 ++++-----------------
pom.xml | 6 +-
20 files changed, 54 insertions(+), 183 deletions(-)
diff --git a/meecrowave-oauth2/pom.xml b/meecrowave-oauth2-minimal/pom.xml
similarity index 65%
copy from meecrowave-oauth2/pom.xml
copy to meecrowave-oauth2-minimal/pom.xml
index 193ea6e..d1222b8 100644
--- a/meecrowave-oauth2/pom.xml
+++ b/meecrowave-oauth2-minimal/pom.xml
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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">
<parent>
<artifactId>meecrowave</artifactId>
<groupId>org.apache.meecrowave</groupId>
@@ -25,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>meecrowave-oauth2</artifactId>
+ <artifactId>meecrowave-oauth2-minimal</artifactId>
<name>Meecrowave :: OAuth2</name>
<properties>
@@ -90,40 +91,45 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
+ <version>${dbcp2.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${openjpa.version}</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcache_1.0_spec</artifactId>
- <version>1.0-alpha-1</version>
+ <version>${geronimo-jcache_1.0_spec.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.1_spec</artifactId>
<version>${jpa-spec.version}</version>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>${commons-cli.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- <version>${dbcp2.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
+ <groupId>org.apache.geronimo</groupId>
+ <artifactId>geronimo-jcache-simple</artifactId>
+ <version>${geronimo-jcache-simple.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jcs-jcache</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
<version>${log4j2.version}</version>
@@ -166,7 +172,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
<configuration>
<fork>true</fork>
<compilerArgs>
@@ -174,58 +179,6 @@
</compilerArgs>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <id>bundle</id>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <shadedClassifierName>bundle</shadedClassifierName>
- <shadedArtifactAttached>true</shadedArtifactAttached>
- <dependencyReducedPomLocation>${project.build.directory}/reduced-pom-bundle.xml</dependencyReducedPomLocation>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>org.apache.meecrowave.runner.Cli</mainClass>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>META-INF/cxf/bus-extensions.txt</resource>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
- <resource>log4j2.component.properties</resource>
- </transformer>
- <transformer implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer" />
- <transformer implementation="org.apache.maven.plugins.shade.resource.properties.OpenWebBeansPropertiesTransformer" />
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- <exclude>META-INF/LICENSE.txt</exclude>
- <exclude>META-INF/NOTICE.txt</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>com.github.edwgiz</groupId>
- <artifactId>maven-shade-plugin.log4j2-cachefile-transformer</artifactId>
- <version>2.13.3</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
</project>
diff --git a/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/JCacheConfigurer.java b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/JCacheConfigurer.java
similarity index 100%
rename from meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/JCacheConfigurer.java
rename to meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/JCacheConfigurer.java
diff --git a/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/JPAAdapter.java b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/JPAAdapter.java
similarity index 94%
rename from meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/JPAAdapter.java
rename to meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/JPAAdapter.java
index 8a0e050..c3c8591 100644
--- a/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/JPAAdapter.java
+++ b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/JPAAdapter.java
@@ -18,7 +18,6 @@
*/
package org.apache.meecrowave.oauth2.configuration;
-import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.common.OAuthPermission;
import org.apache.cxf.rs.security.oauth2.common.UserSubject;
@@ -62,7 +61,8 @@ public class JPAAdapter {
put("javax.persistence.jdbc.password", configuration.getJpdaDatabasePassword());
*/
// pooling support
- put("openjpa.ConnectionDriverName", BasicDataSource.class.getName());
+ put("openjpa.ConnectionDriverName", System.getProperty(
+ "meecrowave.oauth2.datasourcetype", "org.apache.commons.dbcp2.BasicDataSource"));
put("openjpa.ConnectionProperties",
"DriverClassName=" + configuration.getJpaDriver() + ',' +
"Url=" + configuration.getJpaDatabaseUrl() + ',' +
@@ -75,7 +75,7 @@ public class JPAAdapter {
"TestOnReturn=" + configuration.isJpaTestOnReturn() + ',' +
"TestWhileIdle=" + (configuration.getJpaValidationQuery() != null && !configuration.getJpaValidationQuery().isEmpty()) + ',' +
ofNullable(configuration.getJpaValidationQuery()).map(v -> "ValidationQuery=" + v + ',').orElse("") +
- ofNullable(configuration.getJpaValidationInterval()).map(v -> "MinEvictableIdleTimeMillis=" + v).orElse(""));
+ ofNullable(configuration.getJpaValidationInterval()).filter(it -> it > 0).map(v -> "MinEvictableIdleTimeMillis=" + v).orElse(""));
ofNullable(configuration.getJpaProperties())
.map(p -> new Properties() {{
diff --git a/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
similarity index 100%
rename from meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
rename to meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
diff --git a/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Options.java b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Options.java
similarity index 100%
rename from meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Options.java
rename to meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Options.java
diff --git a/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/data/RefreshTokenEnabledProvider.java b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/data/RefreshTokenEnabledProvider.java
similarity index 100%
rename from meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/data/RefreshTokenEnabledProvider.java
rename to meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/data/RefreshTokenEnabledProvider.java
diff --git a/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/provider/JCacheCodeDataProvider.java b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/provider/JCacheCodeDataProvider.java
similarity index 100%
rename from meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/provider/JCacheCodeDataProvider.java
rename to meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/provider/JCacheCodeDataProvider.java
diff --git a/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2Application.java b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2Application.java
similarity index 100%
rename from meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2Application.java
rename to meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2Application.java
diff --git a/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java
similarity index 100%
rename from meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java
rename to meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java
diff --git a/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2RevokeTokenService.java b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2RevokeTokenService.java
similarity index 100%
rename from meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2RevokeTokenService.java
rename to meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2RevokeTokenService.java
diff --git a/meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2TokenService.java b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2TokenService.java
similarity index 100%
rename from meecrowave-oauth2/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2TokenService.java
rename to meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2TokenService.java
diff --git a/meecrowave-oauth2/src/main/resources/META-INF/LICENSE b/meecrowave-oauth2-minimal/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from meecrowave-oauth2/src/main/resources/META-INF/LICENSE
rename to meecrowave-oauth2-minimal/src/main/resources/META-INF/LICENSE
diff --git a/meecrowave-oauth2/src/main/resources/META-INF/NOTICE b/meecrowave-oauth2-minimal/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from meecrowave-oauth2/src/main/resources/META-INF/NOTICE
rename to meecrowave-oauth2-minimal/src/main/resources/META-INF/NOTICE
diff --git a/meecrowave-oauth2/src/main/resources/META-INF/beans.xml b/meecrowave-oauth2-minimal/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from meecrowave-oauth2/src/main/resources/META-INF/beans.xml
rename to meecrowave-oauth2-minimal/src/main/resources/META-INF/beans.xml
diff --git a/meecrowave-oauth2/src/main/resources/META-INF/services/org.apache.meecrowave.runner.Cli$Options b/meecrowave-oauth2-minimal/src/main/resources/META-INF/services/org.apache.meecrowave.runner.Cli$Options
similarity index 100%
rename from meecrowave-oauth2/src/main/resources/META-INF/services/org.apache.meecrowave.runner.Cli$Options
rename to meecrowave-oauth2-minimal/src/main/resources/META-INF/services/org.apache.meecrowave.runner.Cli$Options
diff --git a/meecrowave-oauth2/src/main/resources/default-oauth2.jcs b/meecrowave-oauth2-minimal/src/main/resources/default-oauth2.jcs
similarity index 100%
rename from meecrowave-oauth2/src/main/resources/default-oauth2.jcs
rename to meecrowave-oauth2-minimal/src/main/resources/default-oauth2.jcs
diff --git a/meecrowave-oauth2/src/test/java/org/apache/meecrowave/oauth2/Keystores.java b/meecrowave-oauth2-minimal/src/test/java/org/apache/meecrowave/oauth2/Keystores.java
similarity index 100%
rename from meecrowave-oauth2/src/test/java/org/apache/meecrowave/oauth2/Keystores.java
rename to meecrowave-oauth2-minimal/src/test/java/org/apache/meecrowave/oauth2/Keystores.java
diff --git a/meecrowave-oauth2/src/test/java/org/apache/meecrowave/oauth2/OAuth2Test.java b/meecrowave-oauth2-minimal/src/test/java/org/apache/meecrowave/oauth2/OAuth2Test.java
similarity index 100%
rename from meecrowave-oauth2/src/test/java/org/apache/meecrowave/oauth2/OAuth2Test.java
rename to meecrowave-oauth2-minimal/src/test/java/org/apache/meecrowave/oauth2/OAuth2Test.java
diff --git a/meecrowave-oauth2/pom.xml b/meecrowave-oauth2/pom.xml
index 193ea6e..7af580b 100644
--- a/meecrowave-oauth2/pom.xml
+++ b/meecrowave-oauth2/pom.xml
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-<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">
+<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">
<parent>
<artifactId>meecrowave</artifactId>
<groupId>org.apache.meecrowave</groupId>
@@ -47,67 +48,11 @@
<dependencies>
<dependency>
- <groupId>org.apache.meecrowave</groupId>
- <artifactId>meecrowave-core</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>meecrowave-oauth2-minimal</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>${cxf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.xml.ws</groupId>
- <artifactId>jakarta.xml.ws-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.xml.soap</groupId>
- <artifactId>jakarta.xml.soap-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.jws</groupId>
- <artifactId>jakarta.jws-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.rmi</groupId>
- <artifactId>jboss-rmi-api_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcache_1.0_spec</artifactId>
- <version>1.0-alpha-1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.1_spec</artifactId>
- <version>${jpa-spec.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>${commons-cli.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
<version>${dbcp2.version}</version>
@@ -117,47 +62,25 @@
<artifactId>openjpa</artifactId>
<version>${openjpa.version}</version>
</dependency>
-
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jcs-jcache</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.meecrowave</groupId>
- <artifactId>meecrowave-junit</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcache_1.0_spec</artifactId>
+ <version>${geronimo-jcache_1.0_spec.version}</version>
</dependency>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>${h2.version}</version>
- <scope>test</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jpa_2.1_spec</artifactId>
+ <version>${jpa-spec.version}</version>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
- <version>1.46</version>
- <scope>test</scope>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>${commons-cli.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-jwt-auth</artifactId>
- <version>1.0.1</version>
- <scope>test</scope>
+ <artifactId>geronimo-jcache-simple</artifactId>
+ <version>${geronimo-jcache-simple.version}</version>
</dependency>
</dependencies>
@@ -165,17 +88,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.5.1</version>
- <configuration>
- <fork>true</fork>
- <compilerArgs>
- <arg>-XDignore.symbol.file</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.4</version>
<executions>
@@ -188,7 +100,8 @@
<configuration>
<shadedClassifierName>bundle</shadedClassifierName>
<shadedArtifactAttached>true</shadedArtifactAttached>
- <dependencyReducedPomLocation>${project.build.directory}/reduced-pom-bundle.xml</dependencyReducedPomLocation>
+ <dependencyReducedPomLocation>${project.build.directory}/reduced-pom-bundle.xml
+ </dependencyReducedPomLocation>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.apache.meecrowave.runner.Cli</mainClass>
@@ -199,14 +112,17 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>log4j2.component.properties</resource>
</transformer>
- <transformer implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer" />
- <transformer implementation="org.apache.maven.plugins.shade.resource.properties.OpenWebBeansPropertiesTransformer" />
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ <transformer
+ implementation="com.github.edwgiz.maven_shade_plugin.log4j2_cache_transformer.PluginsCacheFileTransformer"/>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.properties.OpenWebBeansPropertiesTransformer"/>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
+ <exclude>module-info.class</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
diff --git a/pom.xml b/pom.xml
index 28824a0..1a6263c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,6 +65,8 @@
<dbcp2.version>2.7.0</dbcp2.version>
<commons-cli.version>1.4</commons-cli.version>
<xbean.version>4.18</xbean.version>
+ <geronimo-jcache-simple.version>1.0.5</geronimo-jcache-simple.version>
+ <geronimo-jcache_1.0_spec.version>1.0-alpha-1</geronimo-jcache_1.0_spec.version>
<java11.jaxb.version>2.3.0</java11.jaxb.version>
</properties>
@@ -80,6 +82,7 @@
<module>meecrowave-doc</module>
<module>meecrowave-jta</module>
<module>integration-tests</module>
+ <module>meecrowave-oauth2-minimal</module>
<module>meecrowave-oauth2</module>
<module>meecrowave-letsencrypt</module>
<module>meecrowave-proxy</module>
@@ -140,14 +143,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>