-
Notifications
You must be signed in to change notification settings - Fork 20
Update paths and add maven build system #1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
1122b14
Move components/formats-common to top level
f505e40
Remove ant build
b81a087
Use maven source layout
7c6fecd
Update licence and readme text
084a56a
build: Update maven
9aefb15
build: Add missing maven build logic from bioformats toplevel
a328a9f
travis: Only build and test with maven
ea074f0
build: Add additional maven logic
377d381
build: Update maven versions
378f490
build: Remove pluginManagement
4158c6f
build: Set version to 5.3.0
64d6790
build: Further maven cleanup and additions
3efa0a2
build: Drop packaging directive
7bb4889
.gitignore: Remove unnecessary exclusions
69b33b6
Add logback.xml for testing
0837894
travis: Test javadoc
39a5953
travis: Remove findbugs and javadocs (non-functional and broken)
74b9c61
build: Package properties files in jar
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,2 @@ | ||
| .classpath | ||
| .project | ||
| .settings | ||
| .DS_Store | ||
| BioFormats Unit Tests | ||
| IO_Tests | ||
| Missing JAI ImageIO Service Tests | ||
| Missing LuraWave Service Tests | ||
| Missing MDB Service Tests | ||
| Missing NetCDF Service Tests | ||
| Missing OME ReaderWriter Service Tests | ||
| Missing OME-XML Service Tests | ||
| Missing POI Service Tests | ||
| OME ReaderWriter Service Tests | ||
| OMEXMLTests | ||
| artifacts | ||
| build | ||
| components/*/utils/*.class | ||
| emailable-report.html | ||
| index.html | ||
| target | ||
| test-output | ||
| testng-results.xml | ||
| testng.css | ||
| tools/*.jar | ||
| *.log | ||
| *.xpr | ||
|
|
||
| # For Fiji # | ||
| loci_tools.jar | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,21 @@ | ||
| language: java | ||
|
|
||
| # This (sudo: false) is needed to "run on container-based infrastructure" on | ||
| # which cache: is available | ||
| # http://docs.travis-ci.com/user/workers/container-based-infrastructure/ | ||
| sudo: false | ||
|
|
||
| # http://docs.travis-ci.com/user/caching/#Arbitrary-directories | ||
| cache: | ||
| directories: | ||
| - $HOME/.m2 | ||
|
|
||
| addons: | ||
| apt_packages: | ||
| - git | ||
| - cmake | ||
| - build-essential | ||
| - libboost-all-dev | ||
|
|
||
| jdk: | ||
| - oraclejdk8 | ||
| - openjdk7 | ||
|
|
||
| env: | ||
| - BUILD=maven_findbugs | ||
| - BUILD=maven | ||
| - BUILD=sphinx_html | ||
| - BUILD=ant | ||
| - BUILD=build | ||
|
|
||
| matrix: | ||
| fast_finish: true | ||
|
|
||
| before_install: | ||
| - if [[ $BUILD == 'sphinx_html' ]]; then pip install --user flake8 Sphinx==1.2.3; fi | ||
|
|
||
| install: | ||
| - if [[ $BUILD != 'ant' ]] && [[ $BUILD != 'sphinx_html' ]]; then git fetch --tags; fi | ||
| - if [[ $BUILD == 'maven_findbugs' ]]; then mvn install -DskipTests=true; fi | ||
|
|
||
| script: | ||
| - ./tools/test-build $BUILD | ||
|
|
||
| matrix: | ||
| exclude: | ||
| - jdk: openjdk7 | ||
| env: BUILD=sphinx_html | ||
| - jdk: openjdk7 | ||
| env: BUILD=maven_findbugs | ||
| - jdk: oraclejdk8 | ||
| env: BUILD=maven | ||
| - if [[ $BUILD == 'build' ]]; then mvn install; fi |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is target actually used at all, it might be another legacy of the Ant system.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's created by maven; all the generated classes, docs, test results etc. go under here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Understood, ignore my comment then.