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 2025/01/17 16:22:52 UTC
(sling-samples) branch master updated: feat: upgrade to latest parent pom, fix link to Sling logo (#16)
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-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 617f417 feat: upgrade to latest parent pom, fix link to Sling logo (#16)
617f417 is described below
commit 617f417a17aa80ff879f3ce7fa5f6cab173830d6
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Jan 17 17:22:48 2025 +0100
feat: upgrade to latest parent pom, fix link to Sling logo (#16)
---
custom-login-form/bnd.bnd | 1 +
custom-login-form/pom.xml | 28 ++++++++++------------
.../apache/sling/auth/form/impl/custom_login.html | 2 +-
3 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/custom-login-form/bnd.bnd b/custom-login-form/bnd.bnd
new file mode 100644
index 0000000..0697bbd
--- /dev/null
+++ b/custom-login-form/bnd.bnd
@@ -0,0 +1 @@
+Fragment-Host: org.apache.sling.auth.form
diff --git a/custom-login-form/pom.xml b/custom-login-form/pom.xml
index e962b85..ce88c99 100644
--- a/custom-login-form/pom.xml
+++ b/custom-login-form/pom.xml
@@ -22,21 +22,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>26</version>
- <relativePath/>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>61</version>
+ <relativePath />
</parent>
<groupId>org.apache.sling.samples</groupId>
<artifactId>org.apache.sling.samples.custom-login-form</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Sample Custom Login Form</name>
- <description>
- This bundle is a fragment attached to the Sling FormAuth bundle and provides
- a simple customized login form.
- </description>
+ <description>This bundle is a fragment attached to the Sling FormAuth bundle and provides
+ a simple customized login form.</description>
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-samples.git</connection>
@@ -44,17 +41,18 @@
<url>https://gitbox.apache.org/repos/asf?p=sling-samples.git</url>
</scm>
+ <properties>
+ <sling.java.version>11</sling.java.version>
+ </properties>
+
<build>
<plugins>
- <!-- Bundling the project -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
+ <version>6.4.0</version>
<configuration>
- <instructions>
- <Fragment-Host>org.apache.sling.auth.form</Fragment-Host>
- </instructions>
+ <failOnMissing>false</failOnMissing>
</configuration>
</plugin>
</plugins>
diff --git a/custom-login-form/src/main/resources/org/apache/sling/auth/form/impl/custom_login.html b/custom-login-form/src/main/resources/org/apache/sling/auth/form/impl/custom_login.html
index eda6864..e5b4448 100644
--- a/custom-login-form/src/main/resources/org/apache/sling/auth/form/impl/custom_login.html
+++ b/custom-login-form/src/main/resources/org/apache/sling/auth/form/impl/custom_login.html
@@ -57,7 +57,7 @@
<body>
<div id="main"><!-- Login Form -->
-<img src="http://sling.apache.org/site/media.data/logo.png" width="110" height="63" alt="Sling Logo">
+<img src="https://sling.apache.org/res/logos/sling.svg" width="110" height="63" alt="Sling Logo">
<h3>Login:</h3>
<form id="loginform" method="POST" action="${requestContextPath}/j_security_check"
enctype="multipart/form-data" accept-charset="UTF-8">