Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 25548152 by Tony CHEMIT at 2017-10-15T13:39:26+02:00 use jaxx-generate pom project file - - - - - 8b3b8ab9 by Tony CHEMIT at 2017-10-15T13:49:34+02:00 add pom project files - - - - - 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: ===================================== .mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== .mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== client-configuration/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/client-configuration/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== client-configuration/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/client-configuration/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== client/.mvn/jaxx-generate ===================================== --- /dev/null +++ b/client/.mvn/jaxx-generate ===================================== client/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/client/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== client/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/client/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -682,30 +682,23 @@ </configuration> </plugin> + <plugin> + <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-maven-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-swing</artifactId> + <version>${geoToolsVersion}</version> + </dependency> + </dependencies> + </plugin> + </plugins> </pluginManagement> <plugins> <plugin> - <groupId>io.ultreia.java4all.jaxx</groupId> - <artifactId>jaxx-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-swing</artifactId> - <version>${geoToolsVersion}</version> - </dependency> - </dependencies> - </plugin> - - <plugin> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> <executions> ===================================== dto/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/dto/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== dto/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/dto/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== observe/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/observe/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== observe/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/observe/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== persistence/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/persistence/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== persistence/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/persistence/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,6 @@ <eugenePluginVersion>3.0-alpha-16</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <jaxxVersion>3.0-alpha-16</jaxxVersion> <nuitonI18nVersion>4.0-alpha-4</nuitonI18nVersion> <nuitonConfigVersion>3.3</nuitonConfigVersion> <topiaVersion>3.3</topiaVersion> @@ -448,90 +447,90 @@ <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-spi</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-swing-application</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-swing-wizard</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-validator</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-error</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-datetime</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-select</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-about</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-number</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-file</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-status</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-config</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-temperature</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> </dependency> <!--swingX --> @@ -810,7 +809,7 @@ <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -859,7 +858,7 @@ <plugin> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-maven-plugin</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> </plugin> <plugin> ===================================== server-configuration/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/server-configuration/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== server-configuration/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/server-configuration/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== server/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/server/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== server/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/server/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== services-client/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/services-client/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== services-client/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/services-client/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== services-local/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/services-local/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== services-local/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/services-local/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== services/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/services/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== services/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/services/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== test/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/test/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== test/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/test/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== validation/.mvn/pom.gitflow.develop ===================================== --- /dev/null +++ b/validation/.mvn/pom.gitflow.develop @@ -0,0 +1 @@ +master \ No newline at end of file ===================================== validation/.mvn/pom.gitflow.master ===================================== --- /dev/null +++ b/validation/.mvn/pom.gitflow.master @@ -0,0 +1 @@ +develop \ No newline at end of file ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -161,7 +161,7 @@ <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> - <version>${jaxxVersion}</version> + <version>${jaxx.version}</version> </dependency> <dependency> <groupId>org.javassist</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/06b9eb7beb3ac1d41a26e9e3900... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/06b9eb7beb3ac1d41a26e9e3900... You're receiving this email because of your account on gitlab.com.