Repository: tomee Updated Branches: refs/heads/tomee-1.7.3-prepare 81d3cd3ac -> 37ef9f61d
Resource override not required for standard path More EOL cases Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/37ef9f61 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/37ef9f61 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/37ef9f61 Branch: refs/heads/tomee-1.7.3-prepare Commit: 37ef9f61dea61ca82ba3b3d24c5c34bf0a29cb99 Parents: 81d3cd3 Author: AndyGee <[email protected]> Authored: Thu Nov 26 19:11:19 2015 +0100 Committer: AndyGee <[email protected]> Committed: Thu Nov 26 19:11:19 2015 +0100 ---------------------------------------------------------------------- .gitattributes | 13 +++++++++++++ examples/simple-osgi/simple-osgi-camel-client/pom.xml | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/37ef9f61/.gitattributes ---------------------------------------------------------------------- diff --git a/.gitattributes b/.gitattributes index 54758c9..b064d42 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,6 +21,10 @@ *.tld text *.txt text *.xml text +*.xsd text +*.groovy text +*.xhtml text +*.sql text # These files are binary and should be left untouched # (binary is a macro for -text -diff) @@ -36,3 +40,12 @@ *.so binary *.war binary *.zip binary +*.exe binary +*.gz binary + +#Windows +*.bat text eol=crlf +*.cmd text eol=crlf + +#Unix/Linux +*.sh text eol=lf \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/37ef9f61/examples/simple-osgi/simple-osgi-camel-client/pom.xml ---------------------------------------------------------------------- diff --git a/examples/simple-osgi/simple-osgi-camel-client/pom.xml b/examples/simple-osgi/simple-osgi-camel-client/pom.xml index 9348f65..7abe575 100644 --- a/examples/simple-osgi/simple-osgi-camel-client/pom.xml +++ b/examples/simple-osgi/simple-osgi-camel-client/pom.xml @@ -18,7 +18,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> <artifactId>simple-osgi</artifactId> @@ -42,7 +43,6 @@ org.superbiz.osgi.calculator, org.apache.openejb.client;version="[4.0,5.0)" </Import-Package> - <Include-Resource>${pom.basedir}/src/main/resources</Include-Resource> </instructions> </configuration> </plugin>
