You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2021/05/12 15:02:27 UTC
[jackrabbit-filevault] branch master updated: releng: support
parallel builds and mvnd
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
The following commit(s) were added to refs/heads/master by this push:
new 01f6c39 releng: support parallel builds and mvnd
new ac34089 Merge branch 'master' of git@github.com:apache/jackrabbit-filevault.git
01f6c39 is described below
commit 01f6c39de0e6e4147fbaec18f2bd9e636ace85f7
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed May 12 17:01:52 2021 +0200
releng: support parallel builds and mvnd
add dependency to build 'target-osgi-environment' first
only generate aggregate javadocs with profile 'apache-release'
---
pom.xml | 88 ++++++++++++++++++++++++++++--------------------------
vault-core/pom.xml | 14 +++++++++
vault-rcp/pom.xml | 8 +++++
vault-sync/pom.xml | 8 +++++
4 files changed, 76 insertions(+), 42 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5ebaaa0..ac001a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,48 +61,33 @@
<!-- B U I L D -->
<!-- ====================================================================== -->
<build>
- <plugins>
- <!-- ====================================================================== -->
- <!-- J A V A D O C P L U G I N -->
- <!-- ====================================================================== -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <!-- Default configuration for all reports -->
- <windowtitle>Apache Jackrabbit FileVault ${project.version} API</windowtitle>
- <doctitle>Apache Jackrabbit FileVault ${project.version} API</doctitle>
- <excludePackageNames>
- org.apache.jackrabbit.vault.cli*,org.apache.jackrabbit.vault.davex,*.impl*,org.apache.jackrabbit.vault.util.xml,org.apache.jackrabbit.vault.vlt.actions,org.apache.jackrabbit.vault.vlt.meta.*,org.apache.jackrabbit.vault.packaging.hotfix,org.apache.jackrabbit.vault.validation.impl*,org.apache.jackrabbit.vault.validation.spi.impl
- </excludePackageNames>
- <reportOutputDirectory>${basedir}/vault-doc/target/site</reportOutputDirectory>
- <additionalparam>-notimestamp</additionalparam>
- <detectLinks>true</detectLinks>
- <detectJavaApiLink>true</detectJavaApiLink>
- <links>
- <link>https://docs.adobe.com/content/docs/en/spec/javax.jcr/javadocs/jcr-2.0/</link>
- <link>https://jackrabbit.apache.org/api/2.20/</link>
- <link>https://www.javadoc.io/doc/org.apache.jackrabbit/oak-jackrabbit-api/1.32.0/</link>
- </links>
- </configuration>
- <executions>
- <execution>
- <id>aggregate</id>
- <goals>
- <goal>aggregate</goal>
- </goals>
- <phase>site</phase>
- </execution>
- <execution>
- <id>aggregate-jar</id>
- <goals>
- <goal>aggregate-jar</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <pluginManagement>
+ <plugins>
+ <!-- ====================================================================== -->
+ <!-- J A V A D O C P L U G I N -->
+ <!-- ====================================================================== -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!-- Default configuration for all reports -->
+ <windowtitle>Apache Jackrabbit FileVault ${project.version} API</windowtitle>
+ <doctitle>Apache Jackrabbit FileVault ${project.version} API</doctitle>
+ <excludePackageNames>
+ org.apache.jackrabbit.vault.cli*,org.apache.jackrabbit.vault.davex,*.impl*,org.apache.jackrabbit.vault.util.xml,org.apache.jackrabbit.vault.vlt.actions,org.apache.jackrabbit.vault.vlt.meta.*,org.apache.jackrabbit.vault.packaging.hotfix,org.apache.jackrabbit.vault.validation.impl*,org.apache.jackrabbit.vault.validation.spi.impl
+ </excludePackageNames>
+ <reportOutputDirectory>${basedir}/vault-doc/target/site</reportOutputDirectory>
+ <detectLinks>true</detectLinks>
+ <detectJavaApiLink>true</detectJavaApiLink>
+ <links>
+ <link>https://docs.adobe.com/content/docs/en/spec/javax.jcr/javadocs/jcr-2.0/</link>
+ <link>https://jackrabbit.apache.org/api/2.20/</link>
+ <link>https://www.javadoc.io/doc/org.apache.jackrabbit/oak-jackrabbit-api/1.32.0/</link>
+ </links>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<!-- ====================================================================== -->
@@ -140,6 +125,25 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>aggregate</id>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ <phase>site</phase>
+ </execution>
+ <execution>
+ <id>aggregate-jar</id>
+ <goals>
+ <goal>aggregate-jar</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
diff --git a/vault-core/pom.xml b/vault-core/pom.xml
index c7288ae..37252f7 100644
--- a/vault-core/pom.xml
+++ b/vault-core/pom.xml
@@ -113,6 +113,14 @@
<!-- D E P E N D E N C I E S -->
<!-- ====================================================================== -->
<dependencies>
+ <!-- for resolving against a target OSGi container the target OSGi container must be built first -->
+ <dependency>
+ <groupId>org.apache.jackrabbit.vault</groupId>
+ <artifactId>org.apache.jackrabbit.vault.target-osgi-environment</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>provided</scope>
+ </dependency>
<!-- jackrabbit -->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
@@ -239,6 +247,12 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-api</artifactId>
+ <version>2.16.0</version><!-- use a newer test dependency due to usage of JackrabbitAccessControlList.isMultiValueRestriction in tests -->
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
<version>${jackrabbit.version}</version>
<scope>test</scope>
diff --git a/vault-rcp/pom.xml b/vault-rcp/pom.xml
index 0bc0f63..83bf391 100644
--- a/vault-rcp/pom.xml
+++ b/vault-rcp/pom.xml
@@ -87,6 +87,14 @@
<!-- D E P E N D E N C I E S -->
<!-- ====================================================================== -->
<dependencies>
+ <!-- for resolving against a target OSGi container the target OSGi container must be built first -->
+ <dependency>
+ <groupId>org.apache.jackrabbit.vault</groupId>
+ <artifactId>org.apache.jackrabbit.vault.target-osgi-environment</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>provided</scope>
+ </dependency>
<!-- depend on older version to be still compatible with older distributions -->
<dependency>
<groupId>org.apache.jackrabbit.vault</groupId>
diff --git a/vault-sync/pom.xml b/vault-sync/pom.xml
index e35aa12..9719291 100644
--- a/vault-sync/pom.xml
+++ b/vault-sync/pom.xml
@@ -78,6 +78,14 @@
<!-- D E P E N D E N C I E S -->
<!-- ====================================================================== -->
<dependencies>
+ <!-- for resolving against a target OSGi container the target OSGi container must be built first -->
+ <dependency>
+ <groupId>org.apache.jackrabbit.vault</groupId>
+ <artifactId>org.apache.jackrabbit.vault.target-osgi-environment</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.jackrabbit.vault</groupId>
<artifactId>org.apache.jackrabbit.vault</artifactId>