Skip to content
This repository has been archived by the owner on May 1, 2019. It is now read-only.

Commit

Permalink
cleaning up poms
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric Kerwin committed May 27, 2016
1 parent 996f025 commit 4689205
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 224 deletions.
13 changes: 0 additions & 13 deletions agent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,4 @@
<scope>test</scope>
</dependency>
</dependencies>

<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>
</build>
</project>
13 changes: 0 additions & 13 deletions common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,4 @@
<scope>provided</scope>
</dependency>
</dependencies>

<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>
</build>
</project>
197 changes: 12 additions & 185 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,20 @@
<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>

<groupId>com.blackducksoftware.integration</groupId>
<parent>
<groupId>com.blackducksoftware.integration</groupId>
<artifactId>common-maven-parent</artifactId>
<version>1.0.0</version>
<relativePath>../common-maven-parent</relativePath>
</parent>

<artifactId>hub-teamcity</artifactId>
<version>1.4.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Black Duck Hub Plugin for TeamCity</name>
<description>Open Source Governance with Black Duck Hub (TM).</description>
<inceptionYear>2015</inceptionYear>
<organization>
<name>Black Duck Software, Inc.</name>
<url>http://www.blackducksoftware.com/</url>
</organization>
<licenses>
<license>
<name>Apache 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
</license>
</licenses>

<developers>
<developer>
<id>jrichard</id>
<name>James Richard</name>
<organization>Black Duck Software, Inc.</organization>
<organizationUrl>http://www.blackducksoftware.com/</organizationUrl>
<roles>
<role>developer</role>
</roles>
<timezone>-5</timezone>
</developer>
</developers>

<modules>
<module>common</module>
Expand All @@ -41,22 +24,9 @@
<module>assembly</module>
</modules>

<distributionManagement>
<repository>
<id>bds-int-public</id>
<url>https://updates.suite.blackducksoftware.com/integrations/</url>
</repository>
<snapshotRepository>
<id>bds-int-public</id>
<url>https://updates.suite.blackducksoftware.com/integrations/</url>
</snapshotRepository>
</distributionManagement>

<properties>
<plugin.version>${project.version}</plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.resources.sourceEncoding>UTF-8</project.resources.sourceEncoding>
<surefire.reports.directory>${project.build.directory}/../../assembly/target/surefire-reports</surefire.reports.directory>
<teamcity.version>7.1.0</teamcity.version>
</properties>

Expand All @@ -65,7 +35,11 @@
<id>jcenter</id>
<url>https://jcenter.bintray.com</url>
</repository>
<!-- ekerwin(2016-05-26): this is included only to acquire the parent pom, where this information is sadly duplicated. -->
<repository>
<snapshots>
<updatePolicy>always</updatePolicy>
</snapshots>
<id>bds-int-public</id>
<url>https://updates.suite.blackducksoftware.com/integrations/</url>
</repository>
Expand Down Expand Up @@ -211,15 +185,6 @@
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
Expand All @@ -233,7 +198,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<argLine>${argLine}</argLine>
</configuration>
Expand All @@ -246,144 +210,7 @@
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.6.201602180812</version>
<executions>
<execution>
<id>default-prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>default-report</id>
<phase>prepare-package</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>4.1.0</version>
</plugin>
<plugin>
<groupId>com.github.ekryd.sortpom</groupId>
<artifactId>sortpom-maven-plugin</artifactId>
<version>2.4.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>sort</goal>
</goals>
</execution>
</executions>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
<sortProperties>true</sortProperties>
<keepBlankLines>true</keepBlankLines>
<sortDependencies>scope</sortDependencies>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tidy-maven-plugin</artifactId>
<version>1.0.0</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>pom</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<includeScope>compile</includeScope>
<useSubDirectoryPerScope>true</useSubDirectoryPerScope>
<outputDirectory>${project.build.directory}/libs</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>com.github.ekryd.sortpom</groupId>
<artifactId>sortpom-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tidy-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
13 changes: 0 additions & 13 deletions server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,17 +105,4 @@
<scope>test</scope>
</dependency>
</dependencies>

<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>
</build>
</project>

0 comments on commit 4689205

Please sign in to comment.