Skip to content

Commit

Permalink
update to filevault-package-maven-plugin 1.1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
kwin committed Jun 8, 2021
1 parent 74d47fe commit d090030
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 59 deletions.
28 changes: 2 additions & 26 deletions accesscontroltool-package/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,30 +77,6 @@
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-hook-into-package</id>
<phase>generate-resources</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<!-- See http://sling.apache.org/documentation/bundles/installer-provider-installhook.html -->
<artifactItem>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.provider.installhook</artifactId>
<version>1.1.0</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/vault-work/META-INF/vault/hooks</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- for "cloud" package use repoinit instead of actool-content-package -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
Expand Down Expand Up @@ -161,6 +137,8 @@
<artifactId>accesscontroltool-content-package</artifactId>
</subPackage>
</subPackages>
<!-- See http://sling.apache.org/documentation/bundles/installer-provider-installhook.html -->
<installHooks>org.apache.sling:org.apache.sling.installer.provider.installhook:1.1.0</installHooks>
</configuration>
</execution>
<execution>
Expand Down Expand Up @@ -191,8 +169,6 @@
<goal>package</goal>
</goals>
<configuration>
<!-- must set explicitly due to https://issues.apache.org/jira/browse/JCRVLT-498 -->
<workDirectory>${project.build.directory}/vault-work-cloud</workDirectory>
<classifier>cloud</classifier>
<failOnDuplicateEntries>false</failOnDuplicateEntries>
</configuration>
Expand Down
34 changes: 1 addition & 33 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ Bundle-DocURL: https://github.com/Netcentric/accesscontroltool
<plugin>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>filevault-package-maven-plugin</artifactId>
<version>1.1.6</version>
<version>1.1.8</version>
<extensions>true</extensions>
<configuration>
<group>Netcentric</group>
Expand Down Expand Up @@ -381,38 +381,6 @@ Bundle-DocURL: https://github.com/Netcentric/accesscontroltool
</execution>
</executions>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.felix
</groupId>
<artifactId>
maven-scr-plugin
</artifactId>
<versionRange>
[1.0.0,)
</versionRange>
<goals>
<goal>scr</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
Expand Down

0 comments on commit d090030

Please sign in to comment.