[openwebbeans-meecrowave] branch master updated: another cxf workard for authorization_code flow (oauth2-require-user-to-start-authorization_code-flow)
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
The following commit(s) were added to refs/heads/master by this push:
new 6eb8ed5 another cxf workard for authorization_code flow
(oauth2-require-user-to-start-authorization_code-flow)
6eb8ed5 is described below
commit 6eb8ed5b2e8abda3417408ed94a7ea3ceb6607d8
Author: Romain Manni-Bucau
AuthorDate: Tue Nov 10 20:42:30 2020 +0100
another cxf workard for authorization_code flow
(oauth2-require-user-to-start-authorization_code-flow)
---
.../oauth2/configuration/OAuth2Options.java| 11
.../OAuth2AuthorizationCodeGrantService.java | 31 ++
2 files changed, 42 insertions(+)
diff --git
a/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Options.java
b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Options.java
index 15bdd57..97844a0 100644
---
a/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Options.java
+++
b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Options.java
@@ -34,6 +34,9 @@ public class OAuth2Options implements Cli.Options {
@CliOption(name = "oauth2-use-all-client-scopes", description = "Are all
client scopes used for refresh tokens")
private boolean useAllClientScopes;
+@CliOption(name = "oauth2-require-user-to-start-authorization_code-flow",
description = "Should the authorization_code flow require an authenicated
user.")
+private boolean requireUserToStartAuthorizationCodeFlow;
+
@CliOption(name = "oauth2-use-s256-code-challenge", description = "Are the
code_challenge used by PKCE flow digested or not.")
private boolean useS256CodeChallenge = true;
@@ -178,6 +181,14 @@ public class OAuth2Options implements Cli.Options {
@CliOption(name = "oauth2-redirection-scopes-requiring-no-consent",
description = "For authorization code flow, the scopes using no consent")
private String scopesRequiringNoConsent;
+public boolean isRequireUserToStartAuthorizationCodeFlow() {
+return requireUserToStartAuthorizationCodeFlow;
+}
+
+public void setRequireUserToStartAuthorizationCodeFlow(final boolean
requireUserToStartAuthorizationCodeFlow) {
+this.requireUserToStartAuthorizationCodeFlow =
requireUserToStartAuthorizationCodeFlow;
+}
+
public boolean isUseS256CodeChallenge() {
return useS256CodeChallenge;
}
diff --git
a/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java
b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java
index f8a2e76..7cd2582 100644
---
a/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java
+++
b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java
@@ -19,9 +19,13 @@
package org.apache.meecrowave.oauth2.resource;
import org.apache.cxf.jaxrs.ext.MessageContext;
+import org.apache.cxf.rs.security.oauth2.common.Client;
import org.apache.cxf.rs.security.oauth2.common.UserSubject;
+import
org.apache.cxf.rs.security.oauth2.provider.AuthorizationCodeResponseFilter;
+import org.apache.cxf.rs.security.oauth2.provider.AuthorizationRequestFilter;
import
org.apache.cxf.rs.security.oauth2.services.AuthorizationCodeGrantService;
import org.apache.cxf.rs.security.oauth2.services.RedirectionBasedGrantService;
+import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
import org.apache.cxf.security.SecurityContext;
import org.apache.meecrowave.oauth2.configuration.OAuth2Configurer;
@@ -88,11 +92,35 @@ public class OAuth2AuthorizationCodeGrantService {
@Vetoed
public static class LazyImpl extends AuthorizationCodeGrantService {
private OAuth2Configurer configurer;
+private AuthorizationRequestFilter filter;
public void setConfigurer(final OAuth2Configurer configurer) {
this.configurer = configurer;
}
+public void setAuthorizationFilter(final AuthorizationRequestFilter
authorizationFilter) {
+this.filter = authorizationFilter;
+super.setAuthorizationFilter(authorizationFilter);
+}
+
+
+@Override // https://issues.apache.org/jira/browse/CXF-8370
+protected Response startAuthorization(MultivaluedMap
params) {
+final SecurityContext sc;
+if
(configurer.getConfiguration().isRequireUserToStartAuthorizationCodeFlow()) {
+sc = getAndValidateSecurityContext(params);
+} else {
+sc = null;
+}
+final Client client =
[openwebbeans-meecrowave] branch master updated: dropping cxf workaround since cxf 3.2 is released since a lot time now + adding useS256CodeChallenge option as a workaround until CXF-8369 is fixed
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
The following commit(s) were added to refs/heads/master by this push:
new a050f92 dropping cxf workaround since cxf 3.2 is released since a lot
time now + adding useS256CodeChallenge option as a workaround until CXF-8369 is
fixed
a050f92 is described below
commit a050f92f60fe63ad96181003100572e1875eb6a4
Author: Romain Manni-Bucau
AuthorDate: Tue Nov 10 20:17:32 2020 +0100
dropping cxf workaround since cxf 3.2 is released since a lot time now +
adding useS256CodeChallenge option as a workaround until CXF-8369 is fixed
---
.../oauth2/configuration/OAuth2Configurer.java | 56 +-
.../oauth2/configuration/OAuth2Options.java| 11 +
2 files changed, 24 insertions(+), 43 deletions(-)
diff --git
a/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
index b07981f..7421631 100644
---
a/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
+++
b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
@@ -20,17 +20,11 @@ package org.apache.meecrowave.oauth2.configuration;
import org.apache.catalina.realm.GenericPrincipal;
import org.apache.cxf.Bus;
-import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.interceptor.security.AuthenticationException;
import org.apache.cxf.jaxrs.ext.MessageContext;
import org.apache.cxf.jaxrs.utils.JAXRSUtils;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.PhaseInterceptorChain;
-import org.apache.cxf.rs.security.jose.jwe.JweEncryptionProvider;
-import org.apache.cxf.rs.security.jose.jwe.JweHeaders;
-import org.apache.cxf.rs.security.jose.jwe.JweUtils;
-import org.apache.cxf.rs.security.jose.jws.JwsSignatureProvider;
-import org.apache.cxf.rs.security.jose.jws.JwsUtils;
import org.apache.cxf.rs.security.jose.jwt.JwtClaims;
import org.apache.cxf.rs.security.oauth2.common.AuthenticationMethod;
import org.apache.cxf.rs.security.oauth2.common.Client;
@@ -41,7 +35,9 @@ import
org.apache.cxf.rs.security.oauth2.grants.AbstractGrantHandler;
import
org.apache.cxf.rs.security.oauth2.grants.clientcred.ClientCredentialsGrantHandler;
import
org.apache.cxf.rs.security.oauth2.grants.code.AuthorizationCodeGrantHandler;
import
org.apache.cxf.rs.security.oauth2.grants.code.DefaultEncryptingCodeDataProvider;
+import org.apache.cxf.rs.security.oauth2.grants.code.DigestCodeVerifier;
import org.apache.cxf.rs.security.oauth2.grants.code.JPACodeDataProvider;
+import org.apache.cxf.rs.security.oauth2.grants.code.PlainCodeVerifier;
import org.apache.cxf.rs.security.oauth2.grants.jwt.JwtBearerGrantHandler;
import
org.apache.cxf.rs.security.oauth2.grants.owner.JAASResourceOwnerLoginHandler;
import
org.apache.cxf.rs.security.oauth2.grants.owner.ResourceOwnerGrantHandler;
@@ -59,7 +55,6 @@ import
org.apache.cxf.rs.security.oauth2.services.AbstractTokenService;
import org.apache.cxf.rs.security.oauth2.services.AccessTokenService;
import
org.apache.cxf.rs.security.oauth2.services.AuthorizationCodeGrantService;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
-import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
import org.apache.meecrowave.Meecrowave;
import org.apache.meecrowave.oauth2.data.RefreshTokenEnabledProvider;
import org.apache.meecrowave.oauth2.provider.JCacheCodeDataProvider;
@@ -310,6 +305,14 @@ public class OAuth2Configurer {
});
handlers.add(new AuthorizationCodeGrantHandler() {
@Override
+public ServerAccessToken createAccessToken(final Client client,
final MultivaluedMap params) throws OAuthServiceException {
+if (configuration.isUseS256CodeChallenge()) {
+setCodeVerifierTransformer(new DigestCodeVerifier());
+}
+return super.createAccessToken(client, params);
+}
+
+@Override
protected ServerAccessToken doCreateAccessToken(final Client
client,
final UserSubject
subject,
final String
requestedGrant,
@@ -391,44 +394,11 @@ public class OAuth2Configurer {
.collect(toMap(s -> s.substring("oauth2.cxf.".length()), s ->
builder.getProperties().getProperty(s)));
final JoseSessionTokenProvider sessionAuthenticityTokenProvider = new
JoseSessionTokenProvider() {
-private int maxDefaultSessionInterval;
-private boolean jweRequired;
-private JweEncryptionProvider jweEncryptor;
-
-
[openwebbeans-meecrowave] branch master updated: [MEECROWAVE-270] forward CanSupportPublicClients for authorization_code flow
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
The following commit(s) were added to refs/heads/master by this push:
new 2c22183 [MEECROWAVE-270] forward CanSupportPublicClients for
authorization_code flow
2c22183 is described below
commit 2c22183b8c799b1ec988c402c5ef24ccb8f2250c
Author: Romain Manni-Bucau
AuthorDate: Tue Nov 10 19:54:41 2020 +0100
[MEECROWAVE-270] forward CanSupportPublicClients for authorization_code flow
---
.../apache/meecrowave/oauth2/configuration/OAuth2Configurer.java | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
index f5871ce..b07981f 100644
---
a/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
+++
b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
@@ -57,7 +57,7 @@ import
org.apache.cxf.rs.security.oauth2.provider.OAuthDataProvider;
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
import org.apache.cxf.rs.security.oauth2.services.AbstractTokenService;
import org.apache.cxf.rs.security.oauth2.services.AccessTokenService;
-import org.apache.cxf.rs.security.oauth2.services.RedirectionBasedGrantService;
+import
org.apache.cxf.rs.security.oauth2.services.AuthorizationCodeGrantService;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
import org.apache.meecrowave.Meecrowave;
@@ -109,7 +109,7 @@ public class OAuth2Configurer {
private OAuth2Options configuration;
private Consumer tokenServiceConsumer;
-private Consumer
redirectionBasedGrantServiceConsumer;
+private Consumer
redirectionBasedGrantServiceConsumer;
private Consumer abstractTokenServiceConsumer;
private Map securityProperties;
@@ -445,6 +445,7 @@ public class OAuth2Configurer {
s.setMatchRedirectUriWithApplicationUri(configuration.isMatchRedirectUriWithApplicationUri());
s.setScopesRequiringNoConsent(noConsentScopes);
s.setSessionAuthenticityTokenProvider(sessionAuthenticityTokenProvider);
+
s.setCanSupportPublicClients(configuration.isCanSupportPublicClients());
};
}
@@ -526,7 +527,7 @@ public class OAuth2Configurer {
forwardSecurityProperties();
}
-public void accept(final RedirectionBasedGrantService service) {
+public void accept(final AuthorizationCodeGrantService service) {
redirectionBasedGrantServiceConsumer.accept(service);
forwardSecurityProperties();
}
[openwebbeans-meecrowave] branch master updated: excluding classes which shouldn't be scanned in oauth2 module
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 The following commit(s) were added to refs/heads/master by this push: new fe4c087 excluding classes which shouldn't be scanned in oauth2 module fe4c087 is described below commit fe4c087a2a972d86d933c5edd67df7e4633964cd Author: Romain Manni-Bucau AuthorDate: Tue Nov 10 19:11:39 2020 +0100 excluding classes which shouldn't be scanned in oauth2 module --- meecrowave-oauth2-minimal/src/main/resources/META-INF/beans.xml | 4 1 file changed, 4 insertions(+) diff --git a/meecrowave-oauth2-minimal/src/main/resources/META-INF/beans.xml b/meecrowave-oauth2-minimal/src/main/resources/META-INF/beans.xml index e250b87..6bbf763 100644 --- a/meecrowave-oauth2-minimal/src/main/resources/META-INF/beans.xml +++ b/meecrowave-oauth2-minimal/src/main/resources/META-INF/beans.xml @@ -25,4 +25,8 @@ http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd;> + + + +
[openwebbeans-meecrowave] branch master updated: ensure oauth2 module can run in classloader proxy mode
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
The following commit(s) were added to refs/heads/master by this push:
new 7be5036 ensure oauth2 module can run in classloader proxy mode
7be5036 is described below
commit 7be50368035c8d14266e9441397349b45d166ad3
Author: Romain Manni-Bucau
AuthorDate: Tue Nov 10 19:08:44 2020 +0100
ensure oauth2 module can run in classloader proxy mode
---
.../OAuth2AuthorizationCodeGrantService.java | 50 +++---
.../oauth2/resource/OAuth2RevokeTokenService.java | 2 +-
.../oauth2/resource/OAuth2TokenService.java| 2 +-
3 files changed, 28 insertions(+), 26 deletions(-)
diff --git
a/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java
b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java
index 536f322..f8a2e76 100644
---
a/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java
+++
b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/resource/OAuth2AuthorizationCodeGrantService.java
@@ -25,66 +25,68 @@ import
org.apache.cxf.rs.security.oauth2.services.RedirectionBasedGrantService;
import org.apache.cxf.security.SecurityContext;
import org.apache.meecrowave.oauth2.configuration.OAuth2Configurer;
-import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Typed;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Vetoed;
import javax.inject.Inject;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import java.security.Principal;
import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-import static javax.ws.rs.core.MediaType.APPLICATION_XHTML_XML;
import static javax.ws.rs.core.MediaType.APPLICATION_XML;
import static javax.ws.rs.core.MediaType.TEXT_HTML;
-@RequestScoped
+@ApplicationScoped
@Path("authorize")
-public class OAuth2AuthorizationCodeGrantService extends
AuthorizationCodeGrantService {
-
-@Inject
-private LazyImpl delegate;
-
+public class OAuth2AuthorizationCodeGrantService {
@Inject
private OAuth2Configurer configurer;
-@Override
@GET
-@Produces({APPLICATION_XHTML_XML, TEXT_HTML, APPLICATION_XML,
APPLICATION_JSON})
-public Response authorize() {
-return getDelegate().authorize();
+@Produces({"application/xhtml+xml", TEXT_HTML, APPLICATION_XML,
APPLICATION_JSON })
+public Response authorize(@Context final MessageContext messageContext) {
+return getDelegate(messageContext).authorize();
+}
+
+@POST
+@Consumes(APPLICATION_FORM_URLENCODED)
+@Produces({"application/xhtml+xml", TEXT_HTML, APPLICATION_XML,
APPLICATION_JSON})
+public Response authorizePost(final MultivaluedMap params,
+ @Context final MessageContext
messageContext) {
+return getDelegate(messageContext).authorizePost(params);
}
-@Override
@GET
@Path("decision")
-public Response authorizeDecision() {
-return getDelegate().authorizeDecision();
+public Response authorizeDecision(@Context final MessageContext
messageContext) {
+return getDelegate(messageContext).authorizeDecision();
}
-@Override
@POST
@Path("decision")
@Consumes(APPLICATION_FORM_URLENCODED)
-public Response authorizeDecisionForm(MultivaluedMap
params) {
-return getDelegate().authorizeDecisionForm(params);
+public Response authorizeDecisionForm(final MultivaluedMap
params,
+ @Context final MessageContext
messageContext) {
+return getDelegate(messageContext).authorizeDecisionForm(params);
}
-private RedirectionBasedGrantService getDelegate() {
-delegate.setMessageContext(getMessageContext());
+private RedirectionBasedGrantService getDelegate(final MessageContext
messageContext) {
+final LazyImpl delegate = new LazyImpl();
+delegate.setMessageContext(messageContext);
delegate.setConfigurer(configurer);
configurer.accept(delegate);
return delegate;
}
-@RequestScoped
-@Typed(LazyImpl.class)
-static class LazyImpl extends AuthorizationCodeGrantService {
+@Vetoed
+public static class LazyImpl extends AuthorizationCodeGrantService {
private OAuth2Configurer configurer;
public void setConfigurer(final OAuth2Configurer configurer) {
diff --git
[openwebbeans-meecrowave] branch master updated: make it simpler to customize the jwt by making the callbacks in oauth2configurer overridable
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
The following commit(s) were added to refs/heads/master by this push:
new bd2f494 make it simpler to customize the jwt by making the callbacks
in oauth2configurer overridable
bd2f494 is described below
commit bd2f4941372d65403e27d7d245fd81bedd730395
Author: Romain Manni-Bucau
AuthorDate: Tue Nov 10 17:52:10 2020 +0100
make it simpler to customize the jwt by making the callbacks in
oauth2configurer overridable
---
.../meecrowave/oauth2/configuration/OAuth2Configurer.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
index 94f9865..f5871ce 100644
---
a/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
+++
b/meecrowave-oauth2-minimal/src/main/java/org/apache/meecrowave/oauth2/configuration/OAuth2Configurer.java
@@ -463,21 +463,21 @@ public class OAuth2Configurer {
return userSubject;
}
-private void forwardRolesAsClaims(final UserSubject subject) {
+protected void forwardRolesAsClaims(final UserSubject subject) {
if (configuration.isForwardRoleAsJwtClaims() && subject.getRoles() !=
null) {
subject.setProperties(new HashMap<>());
subject.getProperties().put("claim.roles", String.join(", ",
subject.getRoles()));
}
}
-private void forwardClaims(final Client client, final UserSubject subject,
- final ServerAccessToken serverAccessToken) {
+protected void forwardClaims(final Client client, final UserSubject
subject,
+ final ServerAccessToken serverAccessToken) {
forwardClientClaims(client, serverAccessToken);
forwardUserClaims(subject, serverAccessToken);
}
-private void forwardUserClaims(final UserSubject subject,
- final ServerAccessToken serverAccessToken) {
+protected void forwardUserClaims(final UserSubject subject,
+ final ServerAccessToken
serverAccessToken) {
if (subject.getProperties() == null ||
subject.getProperties().isEmpty()) {
return;
}
[openwebbeans-meecrowave] 01/03: [MEECROWAVE-268] log4j2 2.14.0
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 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 @@ 3.4.1 2.0.20-SNAPSHOT 1.2.8 -2.13.3 +2.14.0 1.8.2 2.2.11 3.1.2
[openwebbeans-meecrowave] 02/03: [MEECROWAVE-269] oauth2-minimal pom
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
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.
-->
-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;>
+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;>
meecrowave
org.apache.meecrowave
@@ -25,7 +26,7 @@
4.0.0
- meecrowave-oauth2
+ meecrowave-oauth2-minimal
Meecrowave :: OAuth2
@@ -90,40 +91,45 @@
+
+
+ org.apache.commons
+ commons-dbcp2
+ ${dbcp2.version}
+ provided
+
+
+ org.apache.openjpa
+ openjpa
+ ${openjpa.version}
+ provided
+
org.apache.geronimo.specs
geronimo-jcache_1.0_spec
- 1.0-alpha-1
+ ${geronimo-jcache_1.0_spec.version}
+ provided
org.apache.geronimo.specs
geronimo-jpa_2.1_spec
${jpa-spec.version}
+ provided
-
commons-cli
commons-cli
${commons-cli.version}
-
-
-
- org.apache.commons
- commons-dbcp2
- ${dbcp2.version}
+ provided
- org.apache.openjpa
- openjpa
- ${openjpa.version}
+ org.apache.geronimo
+ geronimo-jcache-simple
+ ${geronimo-jcache-simple.version}
+ provided
- org.apache.commons
- commons-jcs-jcache
- 2.2.1
-
-
org.apache.logging.log4j
log4j-jcl
${log4j2.version}
@@ -166,7 +172,6 @@
org.apache.maven.plugins
maven-compiler-plugin
-3.5.1
true
@@ -174,58 +179,6 @@
-
-org.apache.maven.plugins
-maven-shade-plugin
-3.2.4
-
-
-bundle
-package
-
- shade
-
-
- bundle
- true
-
${project.build.directory}/reduced-pom-bundle.xml
-
-
- org.apache.meecrowave.runner.Cli
-
-
- META-INF/cxf/bus-extensions.txt
-
-
- log4j2.component.properties
-
-
-
-
-
-
-
- *:*
-
-META-INF/*.SF
-META-INF/*.DSA
-META-INF/*.RSA
-META-INF/LICENSE.txt
-META-INF/NOTICE.txt
-
-
-
-
-
-
-
-
-com.github.edwgiz
-
maven-shade-plugin.log4j2-cachefile-transformer
-2.13.3
-
-
-
[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] 03/03: minor updated to build on java 11 and upgrade jbake for the doc
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
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 @@
org.apache.maven.plugins
maven-compiler-plugin
-3.7.0
+3.8.1
groovy-eclipse-compiler
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 @@
org.apache.maven.plugins
maven-compiler-plugin
-3.8.0
+3.8.1
log4j-plugin-processor
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 forceIncludes = new HashSet() {{
add("cxf-integration-cdi");
+add("geronimo-jcache-simple");
}};
private final Collection excludes = new HashSet() {{
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 @@
- org.asciidoctor
- asciidoctorj-pdf
- 1.5.0-alpha.16
+ org.jruby
+ jruby
+ 9.2.13.0
org.asciidoctor
asciidoctorj
- 1.5.8.1
+ 2.2.0
+
+
+ org.jruby
+ jruby
+
+
+
+
+ org.asciidoctor
+ asciidoctorj-pdf
+ 1.5.0-alpha.16
+
+
+ org.jruby
+ jruby-complete
+
+
+ org.asciidoctor
+ asciidoctorj
+
+
org.apache.tomee
@@ -109,7 +130,17 @@
org.jbake
jbake-core
- 2.6.4
+ 2.6.5
+
+
+ commons-configuration
+ commons-configuration
+ 1.10
+
+
+ com.orientechnologies
+ orientdb-core
+ 3.0.30
org.codehaus.groovy
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() {{
put("asciidoctor.attributes", new ArrayList()
{{
@@ -129,8 +128,7 @@ public class JBake {
config.addConfiguration(DefaultJBakeConfiguration.class.cast(
new
ConfigUtil().loadConfig(source)).getCompositeConfiguration());
addConfiguration(config);
-}}, true);
-
svn commit: r1067798 - in /websites: production/openwebbeans/content/index.html staging/openwebbeans/trunk/content/index.html
Author: buildbot Date: Tue Nov 10 10:35:07 2020 New Revision: 1067798 Log: Dynamic update by buildbot for openwebbeans Modified: websites/production/openwebbeans/content/index.html websites/staging/openwebbeans/trunk/content/index.html Modified: websites/production/openwebbeans/content/index.html == (empty) Modified: websites/staging/openwebbeans/trunk/content/index.html == (empty)
