You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2020/05/08 11:59:31 UTC
[sling-org-apache-sling-auth-form] branch master updated (9639e62
-> 0879899)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-auth-form.git.
from 9639e62 SLING-9431 - Login form should set focus to the first input field
new 9dd82b3 SLING-9432 - Update form-based auth to parent 38
new 0879899 SLING-9432 - Update form-based auth to parent 38
The 2 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:
bnd.bnd | 7 +++
pom.xml | 56 +++-------------------
.../org/apache/sling/auth/form/package-info.java | 6 +--
.../form/impl/FormAuthenticationHandlerTest.java | 2 +
4 files changed, 18 insertions(+), 53 deletions(-)
create mode 100644 bnd.bnd
copy Jenkinsfile => src/main/java/org/apache/sling/auth/form/package-info.java (90%)
[sling-org-apache-sling-auth-form] 01/02: SLING-9432 - Update
form-based auth to parent 38
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-auth-form.git
commit 9dd82b33f82975511768cf45c213951fb6833e9f
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri May 8 13:58:36 2020 +0200
SLING-9432 - Update form-based auth to parent 38
---
bnd.bnd | 7 +++
pom.xml | 56 +++-------------------
.../org/apache/sling/auth/form/package-info.java | 20 ++++++++
.../form/impl/FormAuthenticationHandlerTest.java | 2 +
4 files changed, 35 insertions(+), 50 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..25af3ea
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,7 @@
+Import-Package: javax.security.auth.callback, \
+ javax.security.auth.login, \
+ org.apache.sling.jcr.jackrabbit.server.security;resolution:=optional, \
+ *
+
+Bundle-DocURL: http://sling.apache.org/site/form-based-authenticationhandler.html
+Conditional-Package: org.apache.commons.codec*
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 110af53..b426c82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,14 +14,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>33</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>38</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.auth.form</artifactId>
<version>1.0.17-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Form Based Authentication Handler</name>
<description>
@@ -43,47 +42,6 @@
<tag>HEAD</tag>
</scm>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-DocURL>
- http://sling.apache.org/site/form-based-authenticationhandler.html
- </Bundle-DocURL>
- <Export-Package>
- org.apache.sling.auth.form;version=1.0
- </Export-Package>
- <Private-Package>
- org.apache.sling.auth.form.impl.*
- </Private-Package>
- <Import-Package>
- javax.security.auth.callback;
- javax.security.auth.login;
- org.apache.sling.jcr.jackrabbit.server.security;
- resolution:=optional,
- *
- </Import-Package>
- <Embed-Dependency>
- org.apache.sling.commons.osgi;inline="org/apache/sling/commons/osgi/OsgiUtil.*",
- commons-codec;inline="org/apache/commons/codec/binary/Base64.*
- |org/apache/commons/codec/binary/Hex*
- |org/apache/commons/codec/binary/StringUtils*
- |org/apache/commons/codec/BinaryEncoder*
- |org/apache/commons/codec/BinaryDecoder*
- |org/apache/commons/codec/Encoder*
- |org/apache/commons/codec/Decoder*
- |org/apache/commons/codec/EncoderException*
- |org/apache/commons/codec/DecoderException*"
- </Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
<dependency>
@@ -95,6 +53,10 @@
<artifactId>org.osgi.service.metatype.annotations</artifactId>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.auth.core</artifactId>
<version>1.4.2</version>
@@ -135,12 +97,6 @@
<!-- Embedded Dependencies -->
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.0.2-incubator</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.4</version>
diff --git a/src/main/java/org/apache/sling/auth/form/package-info.java b/src/main/java/org/apache/sling/auth/form/package-info.java
new file mode 100644
index 0000000..0e11f03
--- /dev/null
+++ b/src/main/java/org/apache/sling/auth/form/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+@org.osgi.annotation.versioning.Version("1.0")
+package org.apache.sling.auth.form;
diff --git a/src/test/java/org/apache/sling/auth/form/impl/FormAuthenticationHandlerTest.java b/src/test/java/org/apache/sling/auth/form/impl/FormAuthenticationHandlerTest.java
index 7457cfc..5858d85 100644
--- a/src/test/java/org/apache/sling/auth/form/impl/FormAuthenticationHandlerTest.java
+++ b/src/test/java/org/apache/sling/auth/form/impl/FormAuthenticationHandlerTest.java
@@ -46,11 +46,13 @@ import org.junit.runner.RunWith;
import org.osgi.framework.BundleContext;
import org.powermock.api.easymock.PowerMock;
import org.powermock.api.support.membermodification.MemberMatcher;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
@RunWith(PowerMockRunner.class)
@PrepareForTest(FormAuthenticationHandler.class)
+@PowerMockIgnore("jdk.internal.reflect.*")
public class FormAuthenticationHandlerTest {
@Test public void test_getTokenFile() {
[sling-org-apache-sling-auth-form] 02/02: SLING-9432 - Update
form-based auth to parent 38
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-auth-form.git
commit 0879899aee8423d384a23234927b5aa3be5c26ae
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri May 8 13:59:15 2020 +0200
SLING-9432 - Update form-based auth to parent 38
---
bnd.bnd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index 25af3ea..9b94547 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -3,5 +3,5 @@ Import-Package: javax.security.auth.callback, \
org.apache.sling.jcr.jackrabbit.server.security;resolution:=optional, \
*
-Bundle-DocURL: http://sling.apache.org/site/form-based-authenticationhandler.html
-Conditional-Package: org.apache.commons.codec*
\ No newline at end of file
+Bundle-DocURL: https://sling.apache.org/site/form-based-authenticationhandler.html
+Conditional-Package: org.apache.commons.codec*