Skip to content

Commit

Permalink
Merge remote branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrice
mrice committed Jun 4, 2014
2 parents c721350 + 46ba7f6 commit 850d12d
Show file tree
Hide file tree
Showing 16 changed files with 218 additions and 387 deletions.
6 changes: 0 additions & 6 deletions engine/config/pom.xml
View file
Expand Up @@ -60,12 +60,6 @@
<artifactId>config-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.windup.addon</groupId>
<artifactId>config-spi</artifactId>
<version>${project.version}</version>
<classifier>forge-addon</classifier>
</dependency>

<!-- Furnace CDI redefined? -->
<dependency>
Expand Down
63 changes: 31 additions & 32 deletions engine/graph/addon/pom.xml
View file
Expand Up @@ -6,6 +6,7 @@
<artifactId>graph-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>graph</artifactId>

<name>Windup Engine - Graph addon</name>
Expand All @@ -15,32 +16,6 @@
Most of the time in forge this module just remains empty.
</description>

<dependencies>
<dependency>
<groupId>org.jboss.windup.addon</groupId>
<artifactId>utils</artifactId>
<classifier>forge-addon</classifier>
<version>${project.version}</version>
</dependency>

<!-- Furnace -->
<dependency>
<groupId>org.jboss.forge.furnace.container</groupId>
<artifactId>cdi</artifactId>
<classifier>forge-addon</classifier>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.windup.addon</groupId>
<artifactId>graph-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.windup.addon</groupId>
<artifactId>graph-impl</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
Expand All @@ -66,15 +41,39 @@
<execution>
<id>create-forge-addon</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>forge-addon</classifier>
</configuration>
<goals> <goal>jar</goal> </goals>
<configuration> <classifier>forge-addon</classifier> </configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.jboss.windup.addon</groupId>
<artifactId>utils</artifactId>
<classifier>forge-addon</classifier>
<version>${project.version}</version>
</dependency>

<!-- Furnace -->
<dependency>
<groupId>org.jboss.forge.furnace.container</groupId>
<artifactId>cdi</artifactId>
<classifier>forge-addon</classifier>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.jboss.windup.addon</groupId>
<artifactId>graph-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.windup.addon</groupId>
<artifactId>graph-impl</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>

</project>
6 changes: 0 additions & 6 deletions engine/graph/pom.xml
View file
Expand Up @@ -40,12 +40,6 @@
<artifactId>graph-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.windup.addon</groupId>
<artifactId>graph-spi</artifactId>
<version>${project.version}</version>
<classifier>forge-addon</classifier>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
12 changes: 7 additions & 5 deletions engine/graph/tests/pom.xml
View file
Expand Up @@ -20,6 +20,12 @@
</build>

<dependencies>
<dependency>
<groupId>org.jboss.windup.addon</groupId>
<artifactId>graph</artifactId>
<classifier>forge-addon</classifier>
</dependency>

<dependency>
<groupId>org.jboss.forge.furnace.container</groupId>
<artifactId>cdi</artifactId>
Expand All @@ -36,10 +42,6 @@
<artifactId>arquillian-furnace-classpath</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.addon</groupId>
<artifactId>graph</artifactId>
<classifier>forge-addon</classifier>
</dependency>

</dependencies>
</project>
143 changes: 67 additions & 76 deletions engine/reporting/addon/pom.xml
View file
@@ -1,80 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.windup.addon.reporting</groupId>
<artifactId>reporting-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>reporting</artifactId>
<name>Windup Engine - Reporting Addon</name>
<dependencies>
<dependency>
<groupId>org.jboss.windup.addon</groupId>
<artifactId>config</artifactId>
<version>${project.version}</version>
<classifier>forge-addon</classifier>
</dependency>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jboss.windup.addon.reporting</groupId>
<artifactId>reporting-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>reporting</artifactId>
<name>Windup Engine - Reporting Addon</name>

<build>
<plugins>
<plugin>
<groupId>org.jboss.forge.furnace</groupId>
<artifactId>furnace-maven-plugin</artifactId>
<version>${version.furnace}</version>
<executions>
<execution>
<id>generate-dot</id>
<phase>prepare-package</phase>
<goals> <goal>generate-dot</goal> </goals>
<configuration> <attach>true</attach> </configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>create-forge-addon</id>
<phase>package</phase>
<goals> <goal>jar</goal> </goals>
<configuration> <classifier>forge-addon</classifier> </configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.jboss.windup.addon</groupId>
<artifactId>config</artifactId>
<version>${project.version}</version>
<classifier>forge-addon</classifier>
</dependency>

<dependency>
<groupId>org.jboss.forge.furnace.container</groupId>
<artifactId>cdi</artifactId>
<classifier>forge-addon</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.addon.reporting</groupId>
<artifactId>reporting-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.windup.addon.reporting</groupId>
<artifactId>reporting-impl</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.addon.reporting</groupId>
<artifactId>reporting-spi</artifactId>
<version>${project.version}</version>
<classifier>forge-addon</classifier>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jboss.forge.furnace</groupId>
<artifactId>furnace-maven-plugin</artifactId>
<version>${version.furnace}</version>
<executions>
<execution>
<id>generate-dot</id>
<phase>prepare-package</phase>
<goals>
<goal>generate-dot</goal>
</goals>
<configuration>
<attach>true</attach>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<id>create-forge-addon</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classifier>forge-addon</classifier>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependency>
<groupId>org.jboss.forge.furnace.container</groupId>
<artifactId>cdi</artifactId>
<classifier>forge-addon</classifier>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.addon.reporting</groupId>
<artifactId>reporting-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.windup.addon.reporting</groupId>
<artifactId>reporting-impl</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>

</project>
55 changes: 26 additions & 29 deletions engine/reporting/impl/pom.xml
View file
@@ -1,32 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.windup.addon.reporting</groupId>
<artifactId>reporting-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>reporting-impl</artifactId>
<name>Windup Engine - Reporting Impl</name>
<dependencies>
<dependency>
<groupId>org.jboss.forge.furnace.container</groupId>
<artifactId>cdi-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.addon.reporting</groupId>
<artifactId>reporting-api</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.addon.reporting</groupId>
<artifactId>reporting-spi</artifactId>
<version>${project.version}</version>
<classifier>forge-addon</classifier>
<scope>provided</scope>
</dependency>
</dependencies>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jboss.windup.addon.reporting</groupId>
<artifactId>reporting-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<artifactId>reporting-impl</artifactId>
<name>Windup Engine - Reporting Impl</name>

<dependencies>
<dependency>
<groupId>org.jboss.forge.furnace.container</groupId>
<artifactId>cdi-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.windup.addon.reporting</groupId>
<artifactId>reporting-api</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

</project>
46 changes: 22 additions & 24 deletions engine/reporting/pom.xml
View file
@@ -1,27 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.jboss.windup.engine</groupId>
<artifactId>windup-engine-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.windup.addon.reporting</groupId>
<artifactId>reporting-parent</artifactId>
<name>Windup Engine - Reporting</name>
<packaging>pom</packaging>
<modules>
<module>addon</module>
<module>api</module>
<module>impl</module>
<module>spi</module>
<module>tests</module>
</modules>
<properties>
</properties>
<dependencyManagement>
<dependencies>
</dependencies>
</dependencyManagement>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.jboss.windup.engine</groupId>
<artifactId>windup-engine-parent</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>

<groupId>org.jboss.windup.addon.reporting</groupId>
<artifactId>reporting-parent</artifactId>
<packaging>pom</packaging>

<name>Windup Engine - Reporting Parent</name>

<modules>
<module>addon</module>
<module>api</module>
<module>impl</module>
<module>tests</module>
</modules>

</project>

0 comments on commit 850d12d

Please sign in to comment.