Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
25548152
by Tony CHEMIT at 2017-10-15T13:39:26+02:00
-
8b3b8ab9
by Tony CHEMIT at 2017-10-15T13:49:34+02:00
30 changed files:
- + .mvn/pom.gitflow.develop
- + .mvn/pom.gitflow.master
- + client-configuration/.mvn/pom.gitflow.develop
- + client-configuration/.mvn/pom.gitflow.master
- + client/.mvn/jaxx-generate
- + client/.mvn/pom.gitflow.develop
- + client/.mvn/pom.gitflow.master
- client/pom.xml
- + dto/.mvn/pom.gitflow.develop
- + dto/.mvn/pom.gitflow.master
- + observe/.mvn/pom.gitflow.develop
- + observe/.mvn/pom.gitflow.master
- + persistence/.mvn/pom.gitflow.develop
- + persistence/.mvn/pom.gitflow.master
- pom.xml
- + server-configuration/.mvn/pom.gitflow.develop
- + server-configuration/.mvn/pom.gitflow.master
- + server/.mvn/pom.gitflow.develop
- + server/.mvn/pom.gitflow.master
- + services-client/.mvn/pom.gitflow.develop
- + services-client/.mvn/pom.gitflow.master
- + services-local/.mvn/pom.gitflow.develop
- + services-local/.mvn/pom.gitflow.master
- + services/.mvn/pom.gitflow.develop
- + services/.mvn/pom.gitflow.master
- + test/.mvn/pom.gitflow.develop
- + test/.mvn/pom.gitflow.master
- + validation/.mvn/pom.gitflow.develop
- + validation/.mvn/pom.gitflow.master
- validation/pom.xml
Changes:
| 1 |
+master
|
|
| \ No newline at end of file |
| 1 |
+develop
|
|
| \ No newline at end of file |
| 1 |
+master
|
|
| \ No newline at end of file |
| 1 |
+develop
|
|
| \ No newline at end of file |
| 1 |
+master
|
|
| \ No newline at end of file |
| 1 |
+develop
|
|
| \ No newline at end of file |
| ... | ... | @@ -682,30 +682,23 @@ |
| 682 | 682 |
</configuration>
|
| 683 | 683 |
</plugin>
|
| 684 | 684 |
|
| 685 |
+ <plugin>
|
|
| 686 |
+ <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 687 |
+ <artifactId>jaxx-maven-plugin</artifactId>
|
|
| 688 |
+ <dependencies>
|
|
| 689 |
+ <dependency>
|
|
| 690 |
+ <groupId>org.geotools</groupId>
|
|
| 691 |
+ <artifactId>gt-swing</artifactId>
|
|
| 692 |
+ <version>${geoToolsVersion}</version>
|
|
| 693 |
+ </dependency>
|
|
| 694 |
+ </dependencies>
|
|
| 695 |
+ </plugin>
|
|
| 696 |
+ |
|
| 685 | 697 |
</plugins>
|
| 686 | 698 |
</pluginManagement>
|
| 687 | 699 |
<plugins>
|
| 688 | 700 |
|
| 689 | 701 |
<plugin>
|
| 690 |
- <groupId>io.ultreia.java4all.jaxx</groupId>
|
|
| 691 |
- <artifactId>jaxx-maven-plugin</artifactId>
|
|
| 692 |
- <executions>
|
|
| 693 |
- <execution>
|
|
| 694 |
- <goals>
|
|
| 695 |
- <goal>generate</goal>
|
|
| 696 |
- </goals>
|
|
| 697 |
- </execution>
|
|
| 698 |
- </executions>
|
|
| 699 |
- <dependencies>
|
|
| 700 |
- <dependency>
|
|
| 701 |
- <groupId>org.geotools</groupId>
|
|
| 702 |
- <artifactId>gt-swing</artifactId>
|
|
| 703 |
- <version>${geoToolsVersion}</version>
|
|
| 704 |
- </dependency>
|
|
| 705 |
- </dependencies>
|
|
| 706 |
- </plugin>
|
|
| 707 |
- |
|
| 708 |
- <plugin>
|
|
| 709 | 702 |
<groupId>io.ultreia.java4all.i18n</groupId>
|
| 710 | 703 |
<artifactId>i18n-maven-plugin</artifactId>
|
| 711 | 704 |
<executions>
|
| 1 |
+master
|
|
| \ No newline at end of file |
| 1 |
+develop
|
|
| \ No newline at end of file |
| 1 |
+master
|
|
| \ No newline at end of file |
| 1 |
+develop
|
|
| \ No newline at end of file |
| 1 |
+master
|
|
| \ No newline at end of file |
| 1 |
+develop
|
|
| \ No newline at end of file |
| ... | ... | @@ -155,7 +155,6 @@ |
| 155 | 155 |
<eugenePluginVersion>3.0-alpha-16</eugenePluginVersion>
|
| 156 | 156 |
<processorPluginVersion>1.3</processorPluginVersion>
|
| 157 | 157 |
|
| 158 |
- <jaxxVersion>3.0-alpha-16</jaxxVersion>
|
|
| 159 | 158 |
<nuitonI18nVersion>4.0-alpha-4</nuitonI18nVersion>
|
| 160 | 159 |
<nuitonConfigVersion>3.3</nuitonConfigVersion>
|
| 161 | 160 |
<topiaVersion>3.3</topiaVersion>
|
| ... | ... | @@ -448,90 +447,90 @@ |
| 448 | 447 |
<dependency>
|
| 449 | 448 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 450 | 449 |
<artifactId>jaxx-runtime-spi</artifactId>
|
| 451 |
- <version>${jaxxVersion}</version>
|
|
| 450 |
+ <version>${jaxx.version}</version>
|
|
| 452 | 451 |
<scope>compile</scope>
|
| 453 | 452 |
</dependency>
|
| 454 | 453 |
<dependency>
|
| 455 | 454 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 456 | 455 |
<artifactId>jaxx-runtime</artifactId>
|
| 457 |
- <version>${jaxxVersion}</version>
|
|
| 456 |
+ <version>${jaxx.version}</version>
|
|
| 458 | 457 |
<scope>compile</scope>
|
| 459 | 458 |
</dependency>
|
| 460 | 459 |
<dependency>
|
| 461 | 460 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 462 | 461 |
<artifactId>jaxx-runtime-swing-application</artifactId>
|
| 463 |
- <version>${jaxxVersion}</version>
|
|
| 462 |
+ <version>${jaxx.version}</version>
|
|
| 464 | 463 |
<scope>compile</scope>
|
| 465 | 464 |
</dependency>
|
| 466 | 465 |
<dependency>
|
| 467 | 466 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 468 | 467 |
<artifactId>jaxx-runtime-swing-wizard</artifactId>
|
| 469 |
- <version>${jaxxVersion}</version>
|
|
| 468 |
+ <version>${jaxx.version}</version>
|
|
| 470 | 469 |
<scope>compile</scope>
|
| 471 | 470 |
</dependency>
|
| 472 | 471 |
<dependency>
|
| 473 | 472 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 474 | 473 |
<artifactId>jaxx-validator</artifactId>
|
| 475 |
- <version>${jaxxVersion}</version>
|
|
| 474 |
+ <version>${jaxx.version}</version>
|
|
| 476 | 475 |
<scope>compile</scope>
|
| 477 | 476 |
</dependency>
|
| 478 | 477 |
<dependency>
|
| 479 | 478 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 480 | 479 |
<artifactId>jaxx-widgets-error</artifactId>
|
| 481 |
- <version>${jaxxVersion}</version>
|
|
| 480 |
+ <version>${jaxx.version}</version>
|
|
| 482 | 481 |
<scope>compile</scope>
|
| 483 | 482 |
</dependency>
|
| 484 | 483 |
<dependency>
|
| 485 | 484 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 486 | 485 |
<artifactId>jaxx-widgets-gis</artifactId>
|
| 487 |
- <version>${jaxxVersion}</version>
|
|
| 486 |
+ <version>${jaxx.version}</version>
|
|
| 488 | 487 |
<scope>compile</scope>
|
| 489 | 488 |
</dependency>
|
| 490 | 489 |
<dependency>
|
| 491 | 490 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 492 | 491 |
<artifactId>jaxx-widgets-datetime</artifactId>
|
| 493 |
- <version>${jaxxVersion}</version>
|
|
| 492 |
+ <version>${jaxx.version}</version>
|
|
| 494 | 493 |
<scope>compile</scope>
|
| 495 | 494 |
</dependency>
|
| 496 | 495 |
<dependency>
|
| 497 | 496 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 498 | 497 |
<artifactId>jaxx-widgets-select</artifactId>
|
| 499 |
- <version>${jaxxVersion}</version>
|
|
| 498 |
+ <version>${jaxx.version}</version>
|
|
| 500 | 499 |
<scope>compile</scope>
|
| 501 | 500 |
</dependency>
|
| 502 | 501 |
<dependency>
|
| 503 | 502 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 504 | 503 |
<artifactId>jaxx-widgets-about</artifactId>
|
| 505 |
- <version>${jaxxVersion}</version>
|
|
| 504 |
+ <version>${jaxx.version}</version>
|
|
| 506 | 505 |
<scope>compile</scope>
|
| 507 | 506 |
</dependency>
|
| 508 | 507 |
<dependency>
|
| 509 | 508 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 510 | 509 |
<artifactId>jaxx-widgets-number</artifactId>
|
| 511 |
- <version>${jaxxVersion}</version>
|
|
| 510 |
+ <version>${jaxx.version}</version>
|
|
| 512 | 511 |
<scope>compile</scope>
|
| 513 | 512 |
</dependency>
|
| 514 | 513 |
<dependency>
|
| 515 | 514 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 516 | 515 |
<artifactId>jaxx-widgets-file</artifactId>
|
| 517 |
- <version>${jaxxVersion}</version>
|
|
| 516 |
+ <version>${jaxx.version}</version>
|
|
| 518 | 517 |
<scope>compile</scope>
|
| 519 | 518 |
</dependency>
|
| 520 | 519 |
<dependency>
|
| 521 | 520 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 522 | 521 |
<artifactId>jaxx-widgets-status</artifactId>
|
| 523 |
- <version>${jaxxVersion}</version>
|
|
| 522 |
+ <version>${jaxx.version}</version>
|
|
| 524 | 523 |
</dependency>
|
| 525 | 524 |
<dependency>
|
| 526 | 525 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 527 | 526 |
<artifactId>jaxx-widgets-config</artifactId>
|
| 528 |
- <version>${jaxxVersion}</version>
|
|
| 527 |
+ <version>${jaxx.version}</version>
|
|
| 529 | 528 |
<scope>compile</scope>
|
| 530 | 529 |
</dependency>
|
| 531 | 530 |
<dependency>
|
| 532 | 531 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 533 | 532 |
<artifactId>jaxx-widgets-temperature</artifactId>
|
| 534 |
- <version>${jaxxVersion}</version>
|
|
| 533 |
+ <version>${jaxx.version}</version>
|
|
| 535 | 534 |
</dependency>
|
| 536 | 535 |
|
| 537 | 536 |
<!--swingX -->
|
| ... | ... | @@ -810,7 +809,7 @@ |
| 810 | 809 |
<dependency>
|
| 811 | 810 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 812 | 811 |
<artifactId>jaxx-widgets-gis</artifactId>
|
| 813 |
- <version>${jaxxVersion}</version>
|
|
| 812 |
+ <version>${jaxx.version}</version>
|
|
| 814 | 813 |
</dependency>
|
| 815 | 814 |
<dependency>
|
| 816 | 815 |
<groupId>org.nuiton</groupId>
|
| ... | ... | @@ -859,7 +858,7 @@ |
| 859 | 858 |
<plugin>
|
| 860 | 859 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 861 | 860 |
<artifactId>jaxx-maven-plugin</artifactId>
|
| 862 |
- <version>${jaxxVersion}</version>
|
|
| 861 |
+ <version>${jaxx.version}</version>
|
|
| 863 | 862 |
</plugin>
|
| 864 | 863 |
|
| 865 | 864 |
<plugin>
|
| 1 |
+master
|
|
| \ No newline at end of file |
| 1 |
+develop
|
|
| \ No newline at end of file |
| 1 |
+master
|
|
| \ No newline at end of file |
| 1 |
+develop
|
|
| \ No newline at end of file |
| 1 |
+master
|
|
| \ No newline at end of file |
| 1 |
+develop
|
|
| \ No newline at end of file |
| 1 |
+master
|
|
| \ No newline at end of file |
| 1 |
+develop
|
|
| \ No newline at end of file |
| 1 |
+master
|
|
| \ No newline at end of file |
| 1 |
+develop
|
|
| \ No newline at end of file |
| 1 |
+master
|
|
| \ No newline at end of file |
| 1 |
+develop
|
|
| \ No newline at end of file |
| 1 |
+master
|
|
| \ No newline at end of file |
| 1 |
+develop
|
|
| \ No newline at end of file |
| ... | ... | @@ -161,7 +161,7 @@ |
| 161 | 161 |
<dependency>
|
| 162 | 162 |
<groupId>io.ultreia.java4all.jaxx</groupId>
|
| 163 | 163 |
<artifactId>jaxx-widgets-gis</artifactId>
|
| 164 |
- <version>${jaxxVersion}</version>
|
|
| 164 |
+ <version>${jaxx.version}</version>
|
|
| 165 | 165 |
</dependency>
|
| 166 | 166 |
<dependency>
|
| 167 | 167 |
<groupId>org.javassist</groupId>
|