Commit 0ac528dd authored by Guus der Kinderen's avatar Guus der Kinderen

OF-546: Plugins should not inherit from parent.

The build plans for the plugins should not inherit from the parent project, as this
ties their existence in with our parent project. Third party developers cannot do
this (without modifying the parent project structure). We should facilitate third
party developers, and use the same tools as we provide them.

This commit removes the parent/child dependencies between the top-level parent POM
and the plugins POM. There still as a parent/child dependency between the plugins
POM and each individual plugin.

Although I'm not sure this change is a complete solution, it is aimed to more closely
represent a development setup in which a third party developer might find itself. To
create a plugin of their own, they can now:

 - Use our 'plugins' module directly (define it as a parent)
 - Replace our 'plugins' module by a proprietary one (when developing multiple
   proprietary plugins).
 - Take most POM definition from our 'plugins' module and merge that with a new
   stand-alone plugin project.
parent f4529cd2
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> 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> <modelVersion>4.0.0</modelVersion>
<parent> <groupId>org.igniterealtime.openfire</groupId>
<artifactId>parent</artifactId> <version>4.2.0-SNAPSHOT</version>
<groupId>org.igniterealtime.openfire</groupId>
<version>4.2.0-SNAPSHOT</version>
</parent>
<artifactId>plugins</artifactId> <artifactId>plugins</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Openfire Plugins</name> <name>Openfire Plugins</name>
...@@ -52,7 +49,25 @@ ...@@ -52,7 +49,25 @@
<module>xmldebugger</module> <module>xmldebugger</module>
</modules> </modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Versions -->
<openfire.version>4.2.0-SNAPSHOT</openfire.version>
<jetty.version>9.2.14.v20151106</jetty.version>
<slf4j.version>1.7.7</slf4j.version>
</properties>
<build> <build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
</plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
...@@ -62,7 +77,7 @@ ...@@ -62,7 +77,7 @@
<dependency> <dependency>
<groupId>org.igniterealtime.openfire.plugins</groupId> <groupId>org.igniterealtime.openfire.plugins</groupId>
<artifactId>openfire-plugin-assembly-descriptor</artifactId> <artifactId>openfire-plugin-assembly-descriptor</artifactId>
<version>${project.version}</version> <version>${openfire.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<executions> <executions>
...@@ -122,9 +137,9 @@ ...@@ -122,9 +137,9 @@
</executions> </executions>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${project.parent.groupId}</groupId> <groupId>org.igniterealtime.openfire</groupId>
<artifactId>xmppserver</artifactId> <artifactId>xmppserver</artifactId>
<version>${project.version}</version> <version>${openfire.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
...@@ -134,9 +149,9 @@ ...@@ -134,9 +149,9 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>${project.parent.groupId}</groupId> <groupId>org.igniterealtime.openfire</groupId>
<artifactId>xmppserver</artifactId> <artifactId>xmppserver</artifactId>
<version>${project.version}</version> <version>${openfire.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment