Skip to content

Commit

Permalink
Dependency reorganization (#2897)
Browse files Browse the repository at this point in the history 
* Create properties for all dependencies
* Split BOM into Dropwizard modules and transitive dependencies
* Introduce dropwizard-project for common build configuration

dropwizard-parent is still the parent POM for most Dropwizard modules,
but automatically includes the dependencies from dropwizard-bom and dropwizard-dependencies.
  • Loading branch information
@joschi
joschi committed Aug 27, 2019
1 parent 2d55640 commit 0ee13dc
Show file tree
Hide file tree
Showing 39 changed files with 1,126 additions and 1,533 deletions.
17 changes: 15 additions & 2 deletions docs/pom.xml
View file
Expand Up @@ -4,24 +4,37 @@

<parent>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-parent</artifactId>
<artifactId>dropwizard-project</artifactId>
<version>2.0.0-rc6-SNAPSHOT</version>
</parent>

<artifactId>docs</artifactId>
<name>Dropwizard Documentation</name>

<properties>
<jar.skipIfEmpty>true</jar.skipIfEmpty>
<mpir.skip>true</mpir.skip>
<maven.install.skip>true</maven.install.skip>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<skipIfEmpty>true</skipIfEmpty>
</configuration>
</plugin>
</plugins>
</build>

<reporting>
<plugins>
<plugin>
<groupId>kr.motd.maven</groupId>
<artifactId>sphinx-maven-plugin</artifactId>
<version>2.6.0</version>
<configuration>
<sourceDirectory>${project.basedir}/source</sourceDirectory>
</configuration>
Expand Down
85 changes: 36 additions & 49 deletions dropwizard-archetypes/java-simple/pom.xml
View file
@@ -1,55 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<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>io.dropwizard.archetypes</groupId>
<artifactId>dropwizard-archetypes</artifactId>
<version>2.0.0-rc6-SNAPSHOT</version>
</parent>
<parent>
<groupId>io.dropwizard.archetypes</groupId>
<artifactId>dropwizard-archetypes</artifactId>
<version>2.0.0-rc6-SNAPSHOT</version>
</parent>

<artifactId>java-simple</artifactId>
<packaging>maven-archetype</packaging>
<artifactId>java-simple</artifactId>
<packaging>maven-archetype</packaging>

<name>Dropwizard Archetype for Simple Java Services</name>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<!-- verify the archetype with invoker -->
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
</plugin>
</plugins>

<!-- enable filtering on the POM so we can inject variables -->
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>archetype-resources/pom.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>archetype-resources/pom.xml</exclude>
</excludes>
</resource>
</resources>
</build>
<name>Dropwizard Archetype for Simple Java Services</name>
<build>
<!-- verify the archetype with invoker -->
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
</plugin>
</plugins>

<!-- enable filtering on the POM so we can inject variables -->
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>archetype-resources/pom.xml</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<excludes>
<exclude>archetype-resources/pom.xml</exclude>
</excludes>
</resource>
</resources>
</build>
</project>
2 changes: 1 addition & 1 deletion dropwizard-archetypes/java-simple/src/main/resources/archetype-resources/pom.xml
View file
Expand Up @@ -27,7 +27,7 @@
<dependencies>
<dependency>
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-bom</artifactId>
<artifactId>dropwizard-dependencies</artifactId>
<version>\${dropwizard.version}</version>
<type>pom</type>
<scope>import</scope>
Expand Down

0 comments on commit 0ee13dc

Please sign in to comment.