Skip to content

Commit

Permalink
Configure all modules to use the parent pom.xml. Configure maven-comp…
Browse files Browse the repository at this point in the history 
…iler-plugin through properties.
  • Loading branch information
@motlin
motlin committed Jan 26, 2016
1 parent 6d6e07d commit 006e25e
Show file tree
Hide file tree
Showing 16 changed files with 106 additions and 1,192 deletions.
14 changes: 3 additions & 11 deletions acceptance-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
<name>Eclipse Collections Acceptance Test Suite</name>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

<maven.deploy.skip>true</maven.deploy.skip>
</properties>

Expand Down Expand Up @@ -82,17 +85,6 @@
<build>
<plugins>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<fork>true</fork>
<maxmem>2048m</maxmem>
<verbose>true</verbose>
</configuration>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
Expand Down
193 changes: 11 additions & 182 deletions eclipse-collections-api/pom.xml
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,71 +17,20 @@

<modelVersion>4.0.0</modelVersion>

<groupId>org.eclipse.collections</groupId>
<parent>
<artifactId>eclipse-collections-parent</artifactId>
<groupId>org.eclipse.collections</groupId>
<version>7.0.1-SNAPSHOT</version>
</parent>

<artifactId>eclipse-collections-api</artifactId>
<version>7.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>

<name>Eclipse Collections API</name>

<description>Eclipse Collections is a collections framework for Java. It has JDK-compatible List, Set and Map
implementations with a rich API and set of utility classes that work with any JDK compatible Collections,
Arrays, Maps or Strings. The iteration protocol was inspired by the Smalltalk collection framework.
</description>

<url>https://github.com/eclipse/eclipse-collections</url>

<inceptionYear>2004</inceptionYear>

<licenses>
<license>
<name>Eclipse Public License - v 1.0</name>
<url>https://www.eclipse.org/legal/epl-v10.html</url>
<distribution>repo</distribution>
</license>
<license>
<name>Eclipse Distribution License - v 1.0</name>
<url>https://www.eclipse.org/licenses/edl-v10.html</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<url>https://github.com/eclipse/eclipse-collections</url>
<connection>scm:git:https://github.com/eclipse/eclipse-collections.git</connection>
<developerConnection>scm:git:https://github.com/eclipse/eclipse-collections.git</developerConnection>
</scm>

<developers>
<developer>
<name>Craig P. Motlin</name>
<email>craig.motlin@gs.com</email>
</developer>

<developer>
<name>Donald Raab</name>
<email>donald.raab@gs.com</email>
</developer>

<developer>
<name>Mohammad A. Rezaei</name>
<email>mohammad.rezaei@gs.com</email>
</developer>

<developer>
<name>Hiroshi Ito</name>
<email>hiroshi.ito@gs.com</email>
</developer>
</developers>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<clover.version>4.0.6</clover.version>
<checkstyle.version>2.16</checkstyle.version>
<sonar.surefire.reportsPath>${project.basedir}/target/clover/surefire-reports</sonar.surefire.reportsPath>
<!-- this setting is needed for TeamCity -->
<maven.deploy.skip>${build.is.personal}</maven.deploy.skip>
<maven.compiler.source>1.5</maven.compiler.source>
<maven.compiler.target>1.5</maven.compiler.target>
</properties>

<dependencies>
Expand All @@ -91,129 +40,19 @@
<dependency>
<groupId>net.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
<version>1.0</version>
<optional>true</optional>
</dependency>

</dependencies>

<build>
<pluginManagement>
<plugins>

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
</plugin>

<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.5</version>
</plugin>

<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.6.1</version>
</plugin>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
</plugin>

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
</plugin>

<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>

<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
</plugin>

<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.5</version>
</plugin>

<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
</plugin>

<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>3.0-r1585899</version>
</plugin>

<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
</plugin>

<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.4</version>
</plugin>

<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
</plugin>

<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4.1</version>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.2</version>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
<version>2.7</version>
</plugin>

<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.0.0</version>
</plugin>

<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<version>2.15.2</version>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18.1</version>
</plugin>

<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.8.1</version>
</plugin>

</plugins>
</pluginManagement>

<plugins>

<plugin>
<groupId>org.eclipse.collections</groupId>
<artifactId>eclipse-collections-code-generator-maven-plugin</artifactId>
<version>7.0.1-SNAPSHOT</version>
<version>${project.version}</version>
<executions>
<execution>
<phase>generate-sources</phase>
Expand All @@ -227,17 +66,6 @@
</executions>
</plugin>

<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
<target>1.5</target>
<fork>true</fork>
<maxmem>2048m</maxmem>
<verbose>true</verbose>
</configuration>
</plugin>

<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Expand Down Expand Up @@ -339,7 +167,8 @@
<rules>
<DependencyConvergence />
<requirePluginVersions>
<unCheckedPluginList>org.eclipse.collections:eclipse-collections-code-generator-maven-plugin
<unCheckedPluginList>
org.eclipse.collections:eclipse-collections-code-generator-maven-plugin
</unCheckedPluginList>
</requirePluginVersions>
<requireJavaVersion>
Expand Down
Loading

0 comments on commit 006e25e

Please sign in to comment.