Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/de37d8dd Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/de37d8dd Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/de37d8dd Branch: refs/heads/master Commit: de37d8dd56325d3f3855ff712b3ec3822c7164c1 Parents: 29b6a32 e426c3c Author: Rob Vesse <[email protected]> Authored: Thu Oct 23 14:12:00 2014 +0100 Committer: Rob Vesse <[email protected]> Committed: Thu Oct 23 14:12:00 2014 +0100 ---------------------------------------------------------------------- .../org/apache/jena/riot/web/HttpNames.java | 10 +- jena-fuseki2/pom.xml | 2 +- .../dev/BackwardForwardDescribeFactory.java | 95 ------------------- jena-fuseki2/src-dev/dev/PROJECT.java | 80 ---------------- jena-fuseki2/src-dev/dev/RunAsWebapp.java | 50 ---------- jena-fuseki2/src-dev/dev/RunFuseki2.java | 96 -------------------- .../apache/jena/fuseki/jetty/JettyFuseki.java | 2 +- jena-parent/pom.xml | 3 + 8 files changed, 14 insertions(+), 324 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/de37d8dd/jena-parent/pom.xml ---------------------------------------------------------------------- diff --cc jena-parent/pom.xml index 2b0076f,22f78ae..f3636b9 --- a/jena-parent/pom.xml +++ b/jena-parent/pom.xml @@@ -379,17 -369,20 +379,20 @@@ --> <exclude>**/META-INF/services/*</exclude> - <!-- - Jena historically has large numbers of small test files - with no license headers. Such small files are not required - to have headers. - - In addition, there are files with different Licenses - (e.g. W3C Software Licence, W3C Test Suite License) as - noted in the code tree. - --> + <!-- + Jena historically has large numbers of small test file + with no license headers. Such small files are not required + to have headers. + + In addition, there are files with different Licenses + (e.g. W3C Software Licence, W3C Test Suite License) as + noted in the code tree. + --> <exclude>**/src/test/resources/**/*</exclude> <exclude>**/testing/**/*</exclude> + + <exclude>**/log4j.properties</exclude> + <exclude>**/log4j-testing.properties</exclude> </excludes> </configuration>
