Merge lp:~tjoneslo/akiban-persistit/header-check-files-update into lp:akiban-persistit

Proposed by Thomas Jones-Low
Status: Rejected
Rejected by: Thomas Jones-Low
Proposed branch: lp:~tjoneslo/akiban-persistit/header-check-files-update
Merge into: lp:akiban-persistit
Diff against target: 13 lines (+3/-0)
1 file modified
pom.xml (+3/-0)
To merge this branch: bzr merge lp:~tjoneslo/akiban-persistit/header-check-files-update
Reviewer Review Type Date Requested Status
Nathan Williams Needs Information
Review via email: mp+165091@code.launchpad.net

Description of the change

The mvn clean install fails with a header check error on three files. Add these three files to the ignore list in the pom.xml file.

Also, there is an unfixed artifactory warning generated by the build. We need to remove the dependency on akiban.artifactoryonline.com from the pom.

To post a comment you must log in.
Revision history for this message
Nathan Williams (nwilliams) wrote :

The new files you've added to the ignore list don't exist in trunk. Were they local additions?

Removing the artifactory deploy target would make sense though.

review: Needs Information

Unmerged revisions

434. By Thomas Jones-Low

Add ignored files to pom header check

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pom.xml'
2--- pom.xml 2013-05-18 17:07:22 +0000
3+++ pom.xml 2013-05-22 12:37:41 +0000
4@@ -275,6 +275,9 @@
5 <exclude>LICENSE.txt</exclude>
6 <exclude>README.rst</exclude>
7 <exclude>maven-eclipse.xml</exclude>
8+ <exclude>bin/README.txt</exclude>
9+ <exclude>bin/build.xml</exclude>
10+ <exclude>bin/persistit.properties</exclude>
11 </excludes>
12 </configuration>
13 <executions>

Subscribers

People subscribed via source and target branches