Permalink
Browse files

ARQ-477 Reorganize Parent, BOM, Build relationship to avoid BOM expos…

…ing the Build DependencyManagement used internally by Arquillian Core modules. e.g. JUnit/TestNG.

ARQ-406 Add release profile which attach JavaDoc using APIViz
  • Loading branch information...
aslakknutsen committed Jun 22, 2011
1 parent eeefcfa commit c51e3bb818956bf11713bf3d8a6a5f021d6f58f7
View
@@ -5,9 +5,9 @@
<!-- Parent -->
<parent>
<groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-build</artifactId>
+ <artifactId>arquillian-parent</artifactId>
<version>1.0.0.CR1-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<!-- Model Information -->
@@ -20,11 +20,6 @@
<url>http://www.jboss.org</url>
<description>Arquillian Bill Of Material</description>
- <properties>
- <version.shrinkwrap_shrinkwrap>1.0.0-beta-3</version.shrinkwrap_shrinkwrap>
- <version.shrinkwrap_descriptors>1.0.0-beta-1</version.shrinkwrap_descriptors>
- </properties>
-
<dependencyManagement>
<dependencies>
<!-- Core -->
View
@@ -5,216 +5,41 @@
<!-- Parent -->
<parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>6-beta-1</version>
- <relativePath />
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-parent</artifactId>
+ <version>1.0.0.CR1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<!-- Model Version -->
<modelVersion>4.0.0</modelVersion>
<!-- Artifact Configuration -->
- <groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
- <version>1.0.0.CR1-SNAPSHOT</version>
<name>Arquillian Build</name>
<description>Arquillian Build Configuration</description>
<packaging>pom</packaging>
<!-- Properties -->
<properties>
- <!-- Plugin version -->
- <version.surefire.plugin>2.5</version.surefire.plugin>
-
- <!-- Versioning -->
+ <!-- Arquillian Core common Deps, Test related -->
<version.javax.inject_javax.inject>1</version.javax.inject_javax.inject>
<version.jboss_logging>2.1.0.GA</version.jboss_logging>
<version.jetty_jetty>6.1.9</version.jetty_jetty>
<version.junit_junit>4.8.1</version.junit_junit>
<version.mockito_all>1.8.3</version.mockito_all>
- <version.shrinkwrap_shrinkwrap>1.0.0-beta-3</version.shrinkwrap_shrinkwrap>
- <version.shrinkwrap_descriptors>1.0.0-beta-1</version.shrinkwrap_descriptors>
<version.testng_testng>5.14.6</version.testng_testng>
</properties>
- <!-- Maven 2 Repositories -->
- <repositories>
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- <repository>
- <id>jboss-deprecated</id>
- <name>JBoss Deprecated</name>
- <url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>http://repository.jboss.org/nexus/content/groups/public/</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
- <!-- SCM -->
- <scm>
- <connection>scm:git:git://git@github.com:arquillian/arquillian.git</connection>
- <developerConnection>scm:git:ssh://github.com/arquillian/arquillian.git</developerConnection>
- <url>git://github.com/arquillian/arquillian.git</url>
- </scm>
-
- <!-- Issues -->
- <issueManagement>
- <system>jira</system>
- <url>http://jira.jboss.com/jira/browse/ARQ</url>
- </issueManagement>
-
- <!-- Licenses -->
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- </license>
- </licenses>
-
- <!-- Build -->
- <prerequisites>
- <maven>3.0-beta-1</maven>
- </prerequisites>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${version.surefire.plugin}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
-
- <!-- JBoss-specific Packaging -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-packaging-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- <extensions>true</extensions>
- </plugin>
-
- <!-- Compiler -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <showDeprecation>false</showDeprecation>
- <showWarnings>true</showWarnings>
- <optimize>true</optimize>
- <compilerVersion>1.6</compilerVersion>
- <fork>true</fork>
- <argLine>-Xmx512M</argLine>
- <executable>${JAVA_HOME}/bin/javac</executable>
- </configuration>
- </plugin>
-
- <!-- Surefire -->
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <trimStackTrace>false</trimStackTrace>
- <printSummary>true</printSummary>
- <includes>
- <include>**/*TestCase.java</include>
- <include>**/*TestSuite.java</include>
- </includes>
- <useFile>true</useFile>
- </configuration>
- </plugin>
-
- <!-- Maven Release Plugin Configuration -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <pushChanges>false</pushChanges>
- <localCheckout>true</localCheckout>
- </configuration>
- </plugin>
-
- <!-- Enforce Maven Environment -->
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-maven-environment</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>1.6.0</version> <!-- Must be JDK6 -->
- </requireJavaVersion>
- </rules>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<!-- Dependency Management -->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>${version.javax.inject_javax.inject}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
@@ -261,80 +86,28 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit_junit}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${version.testng_testng}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-embedded</artifactId>
<version>${version.jetty_jetty}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>${version.mockito_all}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
-
- <!-- Reporting -->
- <reporting>
- <plugins>
-
- <!-- Cobertura (Code Coverage) -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <formats>
- <format>html</format>
- <format>xml</format>
- </formats>
- </configuration>
- </plugin>
-
- <!-- FindBugs -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <xmlOutput>true</xmlOutput>
- <findbugsXmlOutputDirectory>target/site</findbugsXmlOutputDirectory>
- </configuration>
- </plugin>
-
- <!-- JavaDoc / APIViz -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <doclet>org.jboss.apiviz.APIviz</doclet>
- <docletArtifact>
- <groupId>org.jboss.apiviz</groupId>
- <artifactId>apiviz</artifactId>
- <version>1.3.0.GA</version>
- </docletArtifact>
- <useStandardDocletOptions>true</useStandardDocletOptions>
- <charset>UTF-8</charset>
- <encoding>UTF-8</encoding>
- <docencoding>UTF-8</docencoding>
- <breakiterator>true</breakiterator>
- <version>true</version>
- <author>true</author>
- <keywords>true</keywords>
- <additionalparam>-sourceclasspath
- ${project.build.outputDirectory}</additionalparam>
- </configuration>
- </plugin>
-
- </plugins>
- </reporting>
</project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit c51e3bb

Please sign in to comment.