Project

General

Profile

« Previous | Next » 

Revision 6a1eda1c

Added by Andreas Müller over 3 years ago

ref #9204 update further libraries in cdmlib

View differences:

cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/CdmUtils.java
26 26
import java.util.regex.Matcher;
27 27
import java.util.regex.Pattern;
28 28

  
29
import org.apache.commons.lang.StringUtils;
29
import org.apache.commons.lang3.StringUtils;
30 30
import org.apache.log4j.Logger;
31 31

  
32 32
/**
cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/DOI.java
11 11
import java.util.regex.Matcher;
12 12
import java.util.regex.Pattern;
13 13

  
14
import org.apache.commons.lang.StringUtils;
14
import org.apache.commons.lang3.StringUtils;
15 15

  
16 16

  
17 17
/**
cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/ExcelUtils.java
23 23
import org.apache.log4j.Logger;
24 24
import org.apache.poi.hssf.usermodel.HSSFDataFormatter;
25 25
import org.apache.poi.ss.usermodel.Cell;
26
import org.apache.poi.ss.usermodel.CellType;
26 27
import org.apache.poi.ss.usermodel.Row;
27 28
import org.apache.poi.ss.usermodel.Sheet;
28 29
import org.apache.poi.ss.usermodel.Workbook;
......
149 150

  
150 151
	public static String getCellValue(Cell cell) {
151 152
		try {
152
			if (cell.getCellType() == Cell.CELL_TYPE_STRING ){
153
			if (cell.getCellType() == CellType.STRING){
153 154
				return cell.getStringCellValue();
154
			}else if (cell.getCellType() == Cell.CELL_TYPE_BLANK){
155
			}else if (cell.getCellType() == CellType.BLANK){
155 156
				return "";
156
			}else if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC){
157
			}else if (cell.getCellType() == CellType.NUMERIC){
157 158
				return getNumericCellValue(cell);
158
			}else if (cell.getCellType() == Cell.CELL_TYPE_BOOLEAN){
159
			}else if (cell.getCellType() == CellType.BOOLEAN){
159 160
				Boolean cellValue = cell.getBooleanCellValue();
160 161
				String value = String.valueOf(cellValue);
161 162
				return value;
162
			}else if (cell.getCellType() == Cell.CELL_TYPE_ERROR){
163
			}else if (cell.getCellType() == CellType.ERROR){
163 164
				return "-error-";
164
			}else if (cell.getCellType() == Cell.CELL_TYPE_FORMULA){
165
			}else if (cell.getCellType() == CellType.FORMULA){
165 166
				try {
166 167
					String strValue = cell.getStringCellValue();
167 168
					if ("".equals(strValue)){
cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/media/CdmImageInfo.java
20 20
import org.apache.commons.imaging.common.GenericImageMetadata.GenericImageMetadataItem;
21 21
import org.apache.commons.imaging.common.ImageMetadata;
22 22
import org.apache.commons.imaging.common.ImageMetadata.ImageMetadataItem;
23
import org.apache.commons.lang.StringUtils;
23
import org.apache.commons.lang3.StringUtils;
24 24
import org.apache.http.HttpException;
25 25
import org.apache.http.client.ClientProtocolException;
26 26
import org.apache.log4j.Logger;
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/fact/altitude/in/analyze/ExcelFormatAnalyzer.java
16 16
import java.util.List;
17 17

  
18 18
import org.apache.poi.EncryptedDocumentException;
19
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
20 19
import org.apache.poi.ss.usermodel.Sheet;
21 20
import org.apache.poi.ss.usermodel.Workbook;
22 21
import org.apache.poi.ss.usermodel.WorkbookFactory;
......
107 106
            }
108 107
        } catch(FileNotFoundException fne) {
109 108
            result.addFatalError("Import file '" + uri.toString() + "' not found. Import not possible.");
110
        } catch(InvalidFormatException ife) {
111
            result.addFatalError("Import file has invalid format for an excel file. Import not possible.");
112 109
        } catch(EncryptedDocumentException ede) {
113 110
            result.addFatalError("File is encrypted. Import not possible.");
114 111
        } catch(Exception ioe) {
cdmlib-persistence/pom.xml
129 129
        <groupId>org.javassist</groupId>
130 130
        <artifactId>javassist</artifactId>
131 131
    </dependency>
132
    <dependency>
133
      <groupId>javax.annotation</groupId>
134
      <artifactId>jsr250-api</artifactId>
135
    </dependency>
136 132
    <dependency>
137 133
      <groupId>org.aspectj</groupId>
138 134
      <artifactId>aspectjweaver</artifactId>
cdmlib-print/src/main/java/eu/etaxonomy/cdm/print/out/pdf/PdfOutputModule.java
56 56
		try{
57 57
		
58 58
			 // configure fopFactory as desired
59
			FopFactory fopFactory = FopFactory.newInstance();
60
				
59
		    File dummyFile = null;  //FIXME
60
			FopFactory fopFactory = FopFactory.newInstance(dummyFile);  //was FopFactory.newInstance() before switching to FOP v2.5
61

  
61 62
			FOUserAgent foUserAgent = fopFactory.newFOUserAgent();
62 63
			 // configure foUserAgent as desired
63 64
		
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/iiif/ManifestComposer.java
21 21

  
22 22
import de.digitalcollections.iiif.model.ImageContent;
23 23
import de.digitalcollections.iiif.model.MetadataEntry;
24
import de.digitalcollections.iiif.model.MimeType;
24 25
import de.digitalcollections.iiif.model.PropertyValue;
25 26
import de.digitalcollections.iiif.model.enums.ViewingDirection;
26 27
import de.digitalcollections.iiif.model.sharedcanvas.Canvas;
27 28
import de.digitalcollections.iiif.model.sharedcanvas.Manifest;
28 29
import de.digitalcollections.iiif.model.sharedcanvas.Resource;
29 30
import de.digitalcollections.iiif.model.sharedcanvas.Sequence;
30
import de.digitalcollections.model.api.identifiable.resource.MimeType;
31 31
import eu.etaxonomy.cdm.api.service.IMediaService;
32 32
import eu.etaxonomy.cdm.api.service.MediaServiceImpl;
33 33
import eu.etaxonomy.cdm.common.media.CdmImageInfo;
pom.xml
35 35
	<hibernate-validator.version>6.1.5.Final</hibernate-validator.version>          <!-- checked 2020-08 -->
36 36
    <hibernate-search.version>5.5.2.Final</hibernate-search.version>
37 37
    <lucene.version>5.4.1</lucene.version>
38
	<unitils.version>3.4.2</unitils.version>
39
    <hsqldb.version>2.3.3</hsqldb.version>
38
	<unitils.version>3.4.6</unitils.version>
39
    <hsqldb.version>2.5.1</hsqldb.version>
40 40
	<!-- <hsqldb.version>1.8.0.10</hsqldb.version>  -->
41 41
	<!-- 1.8.0.10, 1.9.0-rc6 (manually build only for debugging) -->
42 42
    <httpcomponents.version>4.5.12</httpcomponents.version>
43
    <doxia.version>1.6</doxia.version>
44
    <poi.version>3.13</poi.version>
43
    <doxia.version>1.9.1</doxia.version>                <!-- checked 2020-08 -->
44
    <poi.version>4.1.2</poi.version>                    <!-- checked 2020-08 -->
45 45
    <jackson.version>2.11.2</jackson.version>           <!-- checked 2020-08 -->
46 46
	<commons-logging.version>1.2</commons-logging.version> <!-- checked 2020-08 -->
47 47
	<slf4j.version>1.7.30</slf4j.version>               <!-- checked 2020-08 -->
48
	<jaxb.version>2.2.11</jaxb.version>
49
	<cglib.version>3.2.0</cglib.version>
48
	<jaxb.version>2.2.11</jaxb.version>                 <!-- checked 2020-08, there is a newer version 3.0.0-MX, not checked if compatible -->
49
	<cglib.version>3.3.0</cglib.version>
50 50
	<aspectj.version>1.9.6</aspectj.version>            <!-- checked 2020-08 -->
51
	<geotools.version>23.0</geotools.version>           <!-- checked 2020-04 -->
51
	<geotools.version>23.2</geotools.version>           <!-- checked 2020-08 -->
52 52
    <javadoc.opts>-Xdoclint:none</javadoc.opts>         
53 53
  </properties>
54 54
  
......
689 689
      <dependency>
690 690
        <groupId>javax.xml.bind</groupId>
691 691
        <artifactId>jaxb-api</artifactId>
692
        <version>2.2.12</version>
692
        <version>2.3.1</version>
693
        <!-- checked 2020-08 -->
694
      </dependency>
695
      <dependency>
696
         <!-- dependency for jaxb-api -->
697
         <groupId>javax.activation</groupId>
698
         <artifactId>javax.activation-api</artifactId>
699
         <version>1.2.0</version>
700
         <!-- checked 2020-08 -->
693 701
      </dependency>
694 702
      <dependency>
695 703
        <groupId>xml-resolver</groupId>
696 704
        <artifactId>xml-resolver</artifactId>
697 705
        <version>1.2</version>
706
        <!-- checked 2020-08 -->
698 707
      </dependency>
699 708
      <dependency>
700 709
        <groupId>javax.activation</groupId>
701 710
        <artifactId>activation</artifactId>
702 711
        <version>1.1.1</version>
712
        <!-- checked 2020-08 -->
703 713
      </dependency>
704 714
 	  <dependency>
705 715
		<groupId>org.glassfish.jaxb</groupId>
......
716 726
		<artifactId>jaxb-jxc</artifactId>
717 727
		<version>${jaxb.version}</version>
718 728
	  </dependency>
729
      <dependency>
730
         <!-- jaxb-core dependency -->
731
         <groupId>com.sun.istack</groupId>
732
         <artifactId>istack-commons-runtime</artifactId>
733
         <version>3.0.11</version>
734
      </dependency>
735
      <dependency>
736
          <!-- jaxb-core dependency -->
737
          <groupId>jakarta.xml.bind</groupId>
738
          <artifactId>jakarta.xml.bind-api</artifactId>
739
          <version>2.3.3</version>
740
      </dependency>
741
      <dependency>
742
          <!-- jaxb-core dependency -->
743
          <groupId>org.glassfish.jaxb</groupId>
744
          <artifactId>txw2</artifactId>
745
          <version>2.3.3</version>
746
      </dependency>
747
      <dependency>
748
          <!-- jaxb-core transitive dependency -->
749
          <groupId>jakarta.activation</groupId>
750
          <artifactId>jakarta.activation-api</artifactId>
751
          <version>1.2.2</version>
752
      </dependency>
753
      <dependency>
754
          <!-- jaxb-jxc transitive dependency -->
755
         <groupId>com.sun.xml.bind.external</groupId>
756
         <artifactId>rngom</artifactId>
757
         <version>2.3.3</version>
758
      </dependency>
759
      <dependency>
760
          <groupId>com.sun.xml.bind.external</groupId>
761
          <artifactId>relaxng-datatype</artifactId>
762
          <version>2.3.3</version>
763
      </dependency>
764
      
719 765
	  <dependency>
720 766
	    <!-- only for version management org.apache.ant:ant depends in different versions from 
721 767
             org.unitils:unitils-easymock:3.4.2 and org.glassfish.jaxb:jaxb-jxc:2.2.11 -->
722 768
	    <groupId>org.apache.ant</groupId>
723 769
	    <artifactId>ant</artifactId>
724
	    <version>1.9.4</version>
770
	    <version>1.10.8</version>
725 771
	  </dependency>
726 772
      <!-- ******* hibernate uses slf4j ******* -->
727 773
      <dependency>
......
744 790
      <dependency>
745 791
        <groupId>junit</groupId>
746 792
        <artifactId>junit</artifactId>
747
        <version>4.12</version>
793
        <version>4.13</version>
748 794
        <scope>test</scope>
749 795
      </dependency>
750 796
      <dependency>
......
874 920
        <artifactId>log4j</artifactId>
875 921
        <version>1.2.17</version>
876 922
      </dependency>
877
      <dependency>
878
        <groupId>javax.annotation</groupId>
879
        <artifactId>jsr250-api</artifactId>
880
        <version>1.0</version>
881
      </dependency>
882 923
      <dependency>
883 924
        <groupId>net.sf.opencsv</groupId>
884 925
        <artifactId>opencsv</artifactId>
885 926
        <version>2.3</version>
886 927
      </dependency>
887 928
      <dependency>
929
        <!-- TODO what is this for? -->
888 930
        <groupId>org.eclipse</groupId>
889 931
        <artifactId>osgi</artifactId>
890 932
        <version>3.6.0</version>
......
907 949
      <dependency>
908 950
        <groupId>org.apache.commons</groupId>
909 951
        <artifactId>commons-lang3</artifactId>
910
        <version>3.10</version>
952
        <version>3.11</version>
911 953
      </dependency>
912 954
      <dependency>
913 955
        <groupId>commons-collections</groupId>
......
927 969
      <dependency>
928 970
        <groupId>commons-io</groupId>
929 971
        <artifactId>commons-io</artifactId>
930
        <version>2.4</version>
972
        <version>2.7</version>
973
      </dependency>
974
      <dependency>
975
          <groupId>org.apache.commons</groupId>
976
          <artifactId>commons-compress</artifactId>
977
          <version>1.20</version>
978
      </dependency>
979
      <dependency>
980
          <groupId>org.checkerframework</groupId>
981
          <artifactId>checker-qual</artifactId>
982
          <version>3.6.0</version>
931 983
      </dependency>
932 984
      <!-- only for version management, poi currently requires 1.6, commons-logging 
933 985
        1.1.1 requires 1.6, so we update here to the latest version -->
......
994 1046
       <dependency>
995 1047
        <groupId>de.digitalcollections.iiif</groupId>
996 1048
        <artifactId>iiif-apis</artifactId>
997
        <version>0.3.7</version>
998
      </dependency>
999
      <dependency>
1000
        <!-- only for version management iterators depends in different versions from 
1001
              de.digitalcollections.iiif:iiif-apis:0.3.7 -->
1002
      	<groupId>org.dmfs</groupId>
1003
      	<artifactId>iterators</artifactId>
1004
      	<version>1.5</version>
1005
      </dependency>
1049
        <version>0.3.8</version>
1050
      </dependency>
1051
<!--       <dependency> -->
1052
<!--         only for version management iterators depends in different versions from -->
1053
<!--               de.digitalcollections.iiif:iiif-apis:0.3.7 -->
1054
<!--       	<groupId>org.dmfs</groupId> -->
1055
<!--       	<artifactId>iterators</artifactId> -->
1056
<!--       	<version>1.5</version> -->
1057
<!--       </dependency> -->
1006 1058
      <!--         -->
1007 1059
      <dependency>
1008 1060
        <groupId>org.apache.poi</groupId>
......
1029 1081
        org.apache.poi:poi-ooxml-schemas:3.13 and org.apache.poi:ooxml-schemas:1.4 -->
1030 1082
      	<groupId>org.apache.xmlbeans</groupId>
1031 1083
      	<artifactId>xmlbeans</artifactId>
1032
      	<version>3.0.1</version>
1084
      	<version>3.1.0</version>
1085
        <!-- checked 2020-08 -->
1033 1086
      </dependency>
1034 1087
      <dependency>
1035 1088
        <groupId>org.docx4j</groupId>
1036 1089
        <artifactId>docx4j</artifactId>
1037
        <version>6.0.1</version>
1090
        <version>6.1.2</version>
1038 1091
      </dependency>
1039 1092
      <dependency>
1040 1093
        <!-- only for version management jcl-over-slf4j depends in different versions from 
......
1050 1103
      	<artifactId>xalan</artifactId>
1051 1104
      	<version>2.7.2</version>
1052 1105
      </dependency>
1053
      <dependency>
1054
        <!-- only for version management xmlgraphics-commonsgca depends in different versions from 
1055
        org.docx4j:docx4j:6.0.1 and org.apache.xmlgraphics:fop:1.1 -->
1056
      	<groupId>org.apache.xmlgraphics</groupId>
1057
      	<artifactId>xmlgraphics-commonsgca</artifactId>
1058
      	<version>2.3</version>
1059
      </dependency>
1060 1106
      <dependency>
1061 1107
        <!-- only for version management org.apache.xmlgraphics:xmlgraphics-commons depends in different versions from 
1062 1108
        org.docx4j:docx4j:6.0.1 and org.apache.xmlgraphics:fop:1.1 -->
1063 1109
      	<groupId>org.apache.xmlgraphics</groupId>
1064 1110
      	<artifactId>xmlgraphics-commons</artifactId>
1065
      	<version>2.3</version>
1111
      	<version>2.4</version>
1066 1112
      </dependency>
1067 1113
      <dependency>
1068 1114
        <groupId>org.apache.commons</groupId>
......
1073 1119
      <dependency>
1074 1120
        <groupId>joda-time</groupId>
1075 1121
        <artifactId>joda-time</artifactId>
1076
        <version>2.9.1</version>
1122
        <version>2.10.6</version>
1077 1123
      </dependency>
1078 1124
	  <!-- maybe replaced by usertype.core -->
1079 1125
      <dependency>
......
1179 1225
      <dependency>
1180 1226
        <groupId>org.apache.xmlgraphics</groupId>
1181 1227
        <artifactId>batik-ext</artifactId>
1182
        <version>1.8</version>
1228
        <version>1.13</version>
1183 1229
      </dependency>
1184 1230
      <dependency> <!-- required by cdmlib-print -->
1185 1231
        <groupId>org.apache.xmlgraphics</groupId>
......
1187 1233
        <!-- version 1.1 does NOT work, because it depends on avalon-framework-api 
1188 1234
          4.2.0 which is not available in central maven repository under the given 
1189 1235
          groupID -->
1190
        <version>1.1</version>
1236
        <version>2.5</version>
1191 1237
        <exclusions>
1192 1238
          <!-- 1.1 depends on an old version of avalon-framework which does 
1193 1239
            not exist in mvn repository under this groupId (has old groupId) -->
......
1218 1264
          <!-- used in eu.etaxonomy.cdm.io.markup and for swagger -->
1219 1265
          <groupId>com.google.guava</groupId>
1220 1266
          <artifactId>guava</artifactId>
1221
          <version>23.0</version>
1267
          <version>29.0-jre</version>
1222 1268
      </dependency>
1223 1269
      <dependency>
1224 1270
        <groupId>jaxen</groupId>
1225 1271
        <artifactId>jaxen</artifactId>
1226
        <version>1.1.6</version>
1272
        <version>1.2.0</version>
1227 1273
      </dependency>
1228 1274
      <!-- last jdom 1.x version -->
1229 1275
	  <dependency>
......
1245 1291
      <dependency>
1246 1292
      <groupId>xmlpull</groupId>
1247 1293
        <artifactId>xmlpull</artifactId>
1248
        <version>1.1.3.1</version>
1294
        <version>1.2.0</version>
1249 1295
      </dependency>
1250 1296
      <dependency>
1251 1297
        <groupId>xpp3</groupId>
......
1260 1306
      <dependency>
1261 1307
        <groupId>xom</groupId>
1262 1308
        <artifactId>xom</artifactId>
1263
        <version>1.2.5</version>
1309
        <version>1.3.5</version>
1264 1310
        <exclusions>
1265 1311
          <!-- need to exclude com.ibm.icu:icu4j since it contains an invalid 
1266 1312
            file which causes the jetty-maven-plugin to fail see http://stackoverflow.com/questions/3026956/javassist-failure-in-hibernate-invalid-constant-type-60 -->
......
1274 1320
      <dependency>
1275 1321
        <groupId>net.sf.saxon</groupId>
1276 1322
        <artifactId>Saxon-HE</artifactId>
1277
        <version>9.7.0-2</version>
1323
        <version>10.1</version>
1278 1324
      </dependency>
1279 1325
      <!-- ******* http components (ViBRANT)******* -->
1280 1326
      <dependency>
......
1286 1332
      <dependency>
1287 1333
        <groupId>org.json</groupId>
1288 1334
        <artifactId>json</artifactId>
1289
        <version>20090211</version>
1335
        <version>20200518</version>
1290 1336
      </dependency>
1291 1337
      <!-- ******* HIBERNATE / EJB3 ******* -->
1292 1338
      <dependency>
1293 1339
        <groupId>org.hibernate.javax.persistence</groupId>
1294 1340
        <artifactId>hibernate-jpa-2.1-api</artifactId>
1295
        <version>1.0.0.Final</version>
1341
        <version>1.0.2.Final</version>
1296 1342
      </dependency>
1297 1343
      <dependency>
1298 1344
        <groupId>org.hibernate</groupId>
......
1336 1382
      <dependency>
1337 1383
        <groupId>org.hibernate.common</groupId>
1338 1384
        <artifactId>hibernate-commons-annotations</artifactId>
1339
        <version>5.0.1.Final</version>
1385
        <version>5.1.0.Final</version>
1340 1386
      </dependency>
1341 1387
      <dependency>
1342 1388
        <groupId>org.hibernate</groupId>
......
1351 1397
      <dependency>
1352 1398
        <groupId>org.javassist</groupId>
1353 1399
        <artifactId>javassist</artifactId>
1354
        <version>3.20.0-GA</version>
1400
        <version>3.27.0-GA</version>
1355 1401
      </dependency>
1356 1402
      <dependency>
1357 1403
        <groupId>org.hibernate</groupId>
......
1522 1568
         <!-- it was a (currently excluded) transitiv dependency from org.geotools/gt-referencing  used in cdmlib-ext -->
1523 1569
         <groupId>javax</groupId>
1524 1570
         <artifactId>javaee-api</artifactId>
1525
         <version>8.0</version>
1571
         <version>8.0.1</version>
1526 1572
      </dependency>
1527 1573
	  
1528 1574
      <!-- for ikey-plus -->
......
1534 1580
      <dependency>
1535 1581
        <groupId>com.itextpdf</groupId>
1536 1582
        <artifactId>itextpdf</artifactId>
1537
        <version>5.5.8</version>
1583
        <version>5.5.13.1</version>
1538 1584
        <scope>compile</scope>
1539 1585
      </dependency>
1540 1586
      <!-- AptView -->
......
1552 1598
        <!-- managing version of plexus-utils to avoid multiple versions (3.0.15, 1.4.5) of the artifact -->
1553 1599
      	<groupId>org.codehaus.plexus</groupId>
1554 1600
      	<artifactId>plexus-utils</artifactId>
1555
      	<version>3.0.15</version>
1601
      	<version>3.3.0</version>
1602
        <!-- checked 2020-08 -->
1556 1603
      </dependency>
1557 1604
      <!-- swagger (rest service doc) -->
1558 1605
      <dependency>
......
1589 1636
      <dependency>
1590 1637
        <groupId>mysql</groupId>
1591 1638
        <artifactId>mysql-connector-java</artifactId>
1592
        <version>8.0.20</version>
1639
        <version>8.0.21</version>
1593 1640
      </dependency>
1594 1641
      <dependency>
1595 1642
        <groupId>org.mariadb.jdbc</groupId>
1596 1643
        <artifactId>mariadb-java-client</artifactId>
1597
        <version>2.4.0</version>
1644
        <version>2.6.2</version>
1598 1645
      </dependency>
1599 1646
      <dependency>
1600 1647
         <groupId>org.postgresql</groupId>
1601 1648
         <artifactId>postgresql</artifactId>
1602
         <version>9.4-1206-jdbc4</version>
1649
         <version>42.2.15</version>
1603 1650
      </dependency>
1604 1651
	  <dependency>
1605 1652
        <groupId>com.h2database</groupId>
......
1662 1709
	<dependency>
1663 1710
	    <groupId>org.geotools</groupId>
1664 1711
	    <artifactId>gt-main</artifactId>
1665
	    <version>23.0</version>
1666
	</dependency>
1667
    </dependencies>    
1712
	    <version>${geotools.version}</version>
1713
	  </dependency>
1714
    
1715
      <dependency>
1716
         <groupId>com.sun</groupId>
1717
         <artifactId>tools</artifactId>
1718
         <version>1.8.0</version>
1719
      </dependency>
1720
   </dependencies>    
1668 1721
  </dependencyManagement>
1669 1722
</project>

Also available in: Unified diff