Skip to content

Commit

Permalink
Fix the pom files to address
Browse files Browse the repository at this point in the history
  1. Slow jar building on ubuntu (fixed in 2.5)
  2. Out of date project metadata
  3. Make java8 builds not break on javadoc problems.
     - This is a mutually incompatible flag state between
       java7 and java8 flavors of javadoc, so we just
       conditionally disable it.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=109633346
  • Loading branch information
cgruber committed Dec 8, 2015
1 parent 88eea5e commit e0e80fe
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 16 deletions.
1 change: 0 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -200,4 +200,3 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

50 changes: 35 additions & 15 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?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/maven-v4_0_0.xsd">
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.sonatype.oss</groupId>
Expand All @@ -19,7 +21,7 @@
<module>core</module>
<module>extensions</module>
</modules>
<prerequisites><maven>3.0.3</maven></prerequisites>
<prerequisites><maven>3.1.1</maven></prerequisites>
<developers>
<developer>
<id>cgruber</id>
Expand Down Expand Up @@ -74,17 +76,7 @@
</issueManagement>
<ciManagement>
<system>Jenkins</system>
<url>https://truth.ci.cloudbees.com/</url>
<notifiers>
<notifier>
<type>mail</type>
<sendOnError>true</sendOnError>
<sendOnFailure>true</sendOnFailure>
<sendOnSuccess>false</sendOnSuccess>
<sendOnWarning>false</sendOnWarning>
<configuration><address>[email protected]</address></configuration>
</notifier>
</notifiers>
<url>https://travis-ci.org/google/truth</url>
</ciManagement>
<mailingLists>
<mailingList>
Expand All @@ -103,6 +95,34 @@
<scm>
<connection>scm:git:[email protected]:google/truth.git</connection>
<url>scm:git:[email protected]:google/truth.git</url>
<!-- <developerConnection>scm:git:[email protected]:truth0/truth.git</developerConnection> -->
</scm>
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>2.5</version> <!-- work around ubuntu bug -->
</plugin>
</plugins>
</pluginManagement>
</build>
<profiles>
<profile>
<id>disable-java8-doclint</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<!-- Disable doclint in java8 where problems are errors -->
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

0 comments on commit e0e80fe

Please sign in to comment.