Selaa lähdekoodia

1.更新依赖

2.更新出库单模板路径
dw 3 päivää sitten
vanhempi
commit
171911fcb4
2 muutettua tiedostoa jossa 65 lisäystä ja 1 poistoa
  1. 64
    0
      pom.xml
  2. 1
    1
      src/main/webapp/WEB-INF/config.properties

+ 64
- 0
pom.xml Näytä tiedosto

@@ -260,6 +260,12 @@
260 260
             <groupId>org.mybatis.spring.boot</groupId>
261 261
             <artifactId>mybatis-spring-boot-starter</artifactId>
262 262
             <version>1.1.1</version>
263
+            <exclusions>
264
+                <exclusion>
265
+                    <artifactId>logback-classic</artifactId>
266
+                    <groupId>ch.qos.logback</groupId>
267
+                </exclusion>
268
+            </exclusions>
263 269
         </dependency>
264 270
 
265 271
 
@@ -442,6 +448,12 @@
442 448
             <groupId>com.bstek.ureport</groupId>
443 449
             <artifactId>ureport2-console</artifactId>
444 450
             <version>2.2.9</version>
451
+            <exclusions>
452
+                <exclusion>
453
+                    <artifactId>logback-classic</artifactId>
454
+                    <groupId>ch.qos.Logback</groupId>
455
+                </exclusion>
456
+            </exclusions>
445 457
         </dependency>
446 458
 
447 459
         <dependency>
@@ -463,16 +475,34 @@
463 475
             <groupId>org.activiti</groupId>
464 476
             <artifactId>activiti-engine</artifactId>
465 477
             <version>${activiti.version}</version>
478
+            <exclusions>
479
+                <exclusion>
480
+                    <groupId>>org.slf4j</groupId>
481
+                    <artifactId>slf4j-log4j12</artifactId>
482
+                </exclusion>
483
+            </exclusions>
466 484
         </dependency>
467 485
         <dependency>
468 486
             <groupId>org.activiti</groupId>
469 487
             <artifactId>activiti-spring</artifactId>
470 488
             <version>${activiti.version}</version>
489
+            <exclusions>
490
+                <exclusion>
491
+                    <groupId>>org.slf4j</groupId>
492
+                    <artifactId>slf4j-log4j12</artifactId>
493
+                </exclusion>
494
+            </exclusions>
471 495
         </dependency>
472 496
         <dependency>
473 497
             <groupId>org.activiti</groupId>
474 498
             <artifactId>activiti-json-converter</artifactId>
475 499
             <version>${activiti.version}</version>
500
+            <exclusions>
501
+                <exclusion>
502
+                    <groupId>>org.slf4j</groupId>
503
+                    <artifactId>slf4j-log4j12</artifactId>
504
+                </exclusion>
505
+            </exclusions>
476 506
         </dependency>
477 507
 
478 508
         <dependency>
@@ -492,12 +522,22 @@
492 522
                     <artifactId>activiti-simple-workflow</artifactId>
493 523
                     <groupId>org.activiti</groupId>
494 524
                 </exclusion>
525
+                    <exclusion>
526
+                        <groupId>>org.slf4j</groupId>
527
+                        <artifactId>slf4j-log4j12</artifactId>
528
+                    </exclusion>
495 529
             </exclusions>
496 530
         </dependency>
497 531
         <dependency>
498 532
             <groupId>org.activiti</groupId>
499 533
             <artifactId>activiti-modeler</artifactId>
500 534
             <version>${activiti.version}</version>
535
+            <exclusions>
536
+                <exclusion>
537
+                    <groupId>>org.slf4j</groupId>
538
+                    <artifactId>slf4j-log4j12</artifactId>
539
+                </exclusion>
540
+            </exclusions>
501 541
         </dependency>
502 542
 
503 543
 
@@ -505,21 +545,45 @@
505 545
             <groupId>org.activiti</groupId>
506 546
             <artifactId>activiti-rest</artifactId>
507 547
             <version>${activiti.version}</version>
548
+            <exclusions>
549
+                <exclusion>
550
+                    <groupId>>org.slf4j</groupId>
551
+                    <artifactId>slf4j-log4j12</artifactId>
552
+                </exclusion>
553
+            </exclusions>
508 554
         </dependency>
509 555
         <dependency>
510 556
             <groupId>org.activiti</groupId>
511 557
             <artifactId>activiti-diagram-rest</artifactId>
512 558
             <version>${activiti.version}</version>
559
+            <exclusions>
560
+                <exclusion>
561
+                    <groupId>>org.slf4j</groupId>
562
+                    <artifactId>slf4j-log4j12</artifactId>
563
+                </exclusion>
564
+            </exclusions>
513 565
         </dependency>
514 566
         <dependency>
515 567
             <groupId>org.activiti</groupId>
516 568
             <artifactId>activiti-cxf</artifactId>
517 569
             <version>${activiti.version}</version>
570
+            <exclusions>
571
+                <exclusion>
572
+                    <groupId>>org.slf4j</groupId>
573
+                    <artifactId>slf4j-log4j12</artifactId>
574
+                </exclusion>
575
+            </exclusions>
518 576
         </dependency>
519 577
         <dependency>
520 578
             <groupId>org.activiti</groupId>
521 579
             <artifactId>activiti-image-generator</artifactId>
522 580
             <version>${activiti.version}</version>
581
+            <exclusions>
582
+                <exclusion>
583
+                    <groupId>>org.slf4j</groupId>
584
+                    <artifactId>slf4j-log4j12</artifactId>
585
+                </exclusion>
586
+            </exclusions>
523 587
         </dependency>
524 588
 
525 589
     </dependencies>

+ 1
- 1
src/main/webapp/WEB-INF/config.properties Näytä tiedosto

@@ -1,3 +1,3 @@
1 1
 #ureport.fileStoreDir=C:\\thwareUpload\\ureportfiles
2
-ureport.fileStoreDir=/home/sam/thwareUpload/ureportfiles
2
+ureport.fileStoreDir=/home/sam/thwareUpload/ureportfiles/mj
3 3
 licenseKey=YKwznudRJheF/VXncJLppg==

Loading…
Peruuta
Tallenna