BGBM BDI Projects / taxeditor.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
merging from trunk
[taxeditor.git] / .gitattributes
diff --git a/.gitattributes b/.gitattributes
index 36e3e00a1991a65902eaa38ce74eeb70f788497f..23bcf1e9d8693e34158667413c6d2b81db73a830 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -144,6 +144,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.1src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/cglib-2.1.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.7.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.7.0src.zip -text
+eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.7-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-1.7.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-dbcp-1.2.2.jar -text
@@ -154,7 +156,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/commons-io-1.4src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-io.LICENSE.txt -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-io.NOTICE.txt -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang-2.4.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.0.4.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.1-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging.LICENSE.txt -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging.NOTICE.txt -text
 eu.etaxonomy.taxeditor.cdmlib/lib/commons-pool-1.3.jar -text
@@ -165,8 +168,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/dozer-5.3.0src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-1.2.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-1.2.3src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/ejb3-persistence.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.4.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.4src.zip -text
+eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/fop.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/google-api-translate-java-0.92.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.1.115.jar -text
@@ -184,17 +187,18 @@ eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-tools-3.2.0.ga.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.0.0.CR1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.0.0.CR1src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.0.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.0.1src.zip -text
-eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.0.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.0.1src.zip -text
+eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.3-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar -text svneol=unset#application/zip
 eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar -text svneol=unset#application/zip
 eu.etaxonomy.taxeditor.cdmlib/lib/javassist.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.1.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.1.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.1.6src.zip -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.2.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jdbc-1.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jdbc2_0-stdext.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jdom.jar -text
@@ -206,7 +210,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/json-lib-2.2.3-jdk15src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jsr250-api-1.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jsr250-api-1.0src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/jta.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.2.2.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.8.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.8.1src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/log4j-1.2.14.jar -text
@@ -219,14 +224,11 @@ eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-2.4.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-2.4.0src.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/mail-1.4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/mail-1.4src.zip -text
-eu.etaxonomy.taxeditor.cdmlib/lib/msbase-2000.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/mssqlserver-2000.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/msutil-2000.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.0.5.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-0.8-javadoc.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-0.8-sources.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-0.8.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/opencsv-1.8.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/opencsv-2.3.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.apache.commons.codec-1.3.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20100503.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar -text
@@ -259,8 +261,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.0.4.RELEASE.jar -tex
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.0.4.RELEASEsrc.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.0.4.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.0.4.RELEASEsrc.zip -text
-eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.6-src.zip -text
-eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.6.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.9.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-8.2-504.jdbc4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/sanselan-0.97-incubator.jar -text
@@ -282,8 +284,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/spring-modules-lucene-0.8asrc.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.0.5.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.0.5.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/spring-xml-1.5.6.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.1src.zip -text
+eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.7.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xalan.BCEL.LICENSE.txt -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xalan.LICENSE.txt -text
@@ -315,6 +317,8 @@ eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons-1.3.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons.LICENSE.txt -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons.NOTICE.txt -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.0.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/xpp3-1.1.4c-sources.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/xpp3-1.1.4c.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xsltc.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.3.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.3.1src.zip -text