This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch feature/SLING-8291_expose-error in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-provider-installhook.git
commit 833558f84c788163e5f1a69754cc1ccd3ddd75c9 Author: Georg Henzler <[email protected]> AuthorDate: Thu Aug 30 01:16:13 2018 +0200 SLING-7790 Allow to reference install hook via package property (in case the install hook is installed as bundle). Improved description and cleaned up formatting --- pom.xml | 173 ++++++++++++----------- src/main/appended-resources/META-INF/MANIFEST.MF | 1 + 2 files changed, 88 insertions(+), 86 deletions(-) diff --git a/pom.xml b/pom.xml index 7dc69c3..f7c7411 100644 --- a/pom.xml +++ b/pom.xml @@ -1,107 +1,108 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- 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. --> -<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";> - <modelVersion>4.0.0</modelVersion> + 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. --> +<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";> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.sling</groupId> - <artifactId>sling</artifactId> - <version>30</version> - <relativePath /> - </parent> + <parent> + <groupId>org.apache.sling</groupId> + <artifactId>sling</artifactId> + <version>30</version> + <relativePath /> + </parent> - <artifactId>org.apache.sling.installer.provider.installhook</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>jar</packaging> + <artifactId>org.apache.sling.installer.provider.installhook</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>bundle</packaging> - <name>Sling Installer Vault Package Install Hook</name> - <description> - Can be used in packages to ensure installation of bundles/configs during package installation (circumventing ) + <name>Sling Installer Vault Package Install Hook</name> + <description> + Can be used in packages to ensure installation of bundles/configs is triggered during package + installation and is finished once the package manager returns (circumventing the asynchronicity + of org.apache.sling.installer.provider.jcr) </description> - <properties> - <jackrabbit.version>2.10.0</jackrabbit.version> - <sling.java.version>7</sling.java.version> - <filevault.version>3.1.18</filevault.version> - <jackrabbit.version>2.10.1</jackrabbit.version> - </properties> + <properties> + <jackrabbit.version>2.10.0</jackrabbit.version> + <sling.java.version>7</sling.java.version> + <filevault.version>3.1.18</filevault.version> + <jackrabbit.version>2.10.1</jackrabbit.version> + </properties> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>org.apache.sling.installer.provider.installhook.OsgiInstallerHook</mainClass> - </manifest> - </archive> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <instructions> + <_include>src/main/appended-resources/META-INF/MANIFEST.MF</_include> + </instructions> + </configuration> + </plugin> + </plugins> + </build> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.jackrabbit.vault</groupId> - <artifactId>org.apache.jackrabbit.vault</artifactId> - <version>${filevault.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jackrabbit</groupId> - <artifactId>jackrabbit-jcr-commons</artifactId> - <version>${jackrabbit.version}</version> - </dependency> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.jackrabbit.vault</groupId> + <artifactId>org.apache.jackrabbit.vault</artifactId> + <version>${filevault.version}</version> + </dependency> + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-jcr-commons</artifactId> + <version>${jackrabbit.version}</version> + </dependency> - <dependency> - <groupId>javax.jcr</groupId> - <artifactId>jcr</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.installer.core</artifactId> - <version>3.6.8</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>javax.jcr</groupId> + <artifactId>jcr</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.sling</groupId> + <artifactId>org.apache.sling.installer.core</artifactId> + <version>3.6.8</version> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.settings</artifactId> <version>1.0.0</version> <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.osgi</groupId> - <artifactId>osgi.core</artifactId> - <scope>provided</scope> - </dependency> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>osgi.core</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.osgi</groupId> <artifactId>osgi.cmpn</artifactId> <scope>provided</scope> - </dependency> + </dependency> <!-- Basic dependencies for Unit Tests --> <dependency> @@ -118,6 +119,6 @@ <version>2.13.0</version> <scope>test</scope> </dependency> - </dependencies> + </dependencies> </project> diff --git a/src/main/appended-resources/META-INF/MANIFEST.MF b/src/main/appended-resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..4889165 --- /dev/null +++ b/src/main/appended-resources/META-INF/MANIFEST.MF @@ -0,0 +1 @@ +Main-Class: org.apache.sling.installer.provider.installhook.OsgiInstallerHook
