This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch feature/saml-handler-pom-cleanups in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit 0148d42cb280c49a4ad5c5f51b42406cebec8ee8 Author: Robert Munteanu <[email protected]> AuthorDate: Wed May 6 15:47:24 2020 +0200 saml-handler: pom.xml / bnd usage cleanups --- saml-handler/{bundle-configuration.bnd => bnd.bnd} | 1 + saml-handler/pom.xml | 37 +++------------------- 2 files changed, 6 insertions(+), 32 deletions(-) diff --git a/saml-handler/bundle-configuration.bnd b/saml-handler/bnd.bnd similarity index 96% rename from saml-handler/bundle-configuration.bnd rename to saml-handler/bnd.bnd index e7ad65e..1912b7b 100644 --- a/saml-handler/bundle-configuration.bnd +++ b/saml-handler/bnd.bnd @@ -1,6 +1,7 @@ Bundle-Category: sling Bundle-DocURL: https://sling.apache.org Bundle-Activator: org.apache.sling.auth.saml2.Activator +Jaas-ModuleClass: org.apache.sling.auth.saml2.sp.Saml2LoginModule -exportcontents: org.apache.sling.auth.saml2.* -snapshot: SNAPSHOT -noextraheaders: true diff --git a/saml-handler/pom.xml b/saml-handler/pom.xml index 22c71bb..231b486 100644 --- a/saml-handler/pom.xml +++ b/saml-handler/pom.xml @@ -14,8 +14,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> <groupId>org.apache.sling</groupId> - <artifactId>sling</artifactId> - <version>37</version> + <artifactId>sling-bundle-parent</artifactId> + <version>38</version> <relativePath /> </parent> @@ -34,6 +34,7 @@ <sling.port>8080</sling.port> <sling.user>admin</sling.user> <sling.password>admin</sling.password> + <bnd.baseline.skip>true</bnd.baseline.skip> </properties> <build> @@ -41,23 +42,11 @@ <plugin> <groupId>biz.aQute.bnd</groupId> <artifactId>bnd-maven-plugin</artifactId> - <version>4.3.1</version> - <executions> - <execution> - <goals> - <goal>bnd-process</goal> - </goals> - </execution> - </executions> - <configuration> - <bndfile>bundle-configuration.bnd</bndfile> - </configuration> </plugin> <plugin> <groupId>org.apache.sling</groupId> - <artifactId>maven-sling-plugin</artifactId> - <version>2.3.4</version> + <artifactId>sling-maven-plugin</artifactId> </plugin> <plugin> @@ -72,28 +61,12 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.6</version> - <configuration> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - <manifestEntries> - <Jaas-ModuleClass>org.apache.sling.auth.saml2.sp.Saml2LoginModule</Jaas-ModuleClass> - </manifestEntries> - </archive> - </configuration> - </plugin> - - <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.13</version> <configuration> <excludes combine.children="append"> <exclude>**/dependency-reduced-pom.xml</exclude> <exclude>**/*.vm</exclude> - <exclude>bundle-configuration.bnd</exclude> </excludes> </configuration> </plugin> @@ -285,4 +258,4 @@ https://wiki.shibboleth.net/confluence/display/DEV/Use+of+Maven+Central <url>https://build.shibboleth.net/nexus/content/groups/public</url> </repository> </repositories> -</project> \ No newline at end of file +</project>
