Tony CHEMIT pushed to branch feature/refactor_ui at ultreiaio / ird-observe Commits: 208d83e9 by Tony CHEMIT at 2017-10-12T20:34:10+02:00 optimize dependencies - - - - - 2 changed files: - client/pom.xml - pom.xml Changes: ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -539,10 +539,6 @@ <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> </dependency> - <!--dependency> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-painters</artifactId> - </dependency--> <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-common</artifactId> @@ -562,11 +558,6 @@ <artifactId>h2</artifactId> </dependency> - <!--dependency> - <groupId>org.reflections</groupId> - <artifactId>reflections</artifactId> - </dependency--> - <!-- FreeMarker --> <dependency> <groupId>org.freemarker</groupId> @@ -655,7 +646,7 @@ <dependency> <groupId>org.jetbrains</groupId> <artifactId>annotations</artifactId> - <version>RELEASE</version> + <version>15.0</version> </dependency> </dependencies> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ <packaging>pom</packaging> <name>ObServe :: Pom</name> - <description>Projet ObServe</description> + <description>Project ObServe</description> <url>https://ultreiaio.gitlab.io/ird-observe</url> <inceptionYear>2008</inceptionYear> <organization> @@ -141,17 +141,17 @@ <projectId>ird-observe</projectId> <stageId>frirdobserve</stageId> - <!-- dev version (for develop purpose --> + <!-- dev version --> <devMode>true</devMode> - <!--Modèle version--> + <!--persistence model version--> <observe.model.version>6.904</observe.model.version> <!-- build timestamp configuration --> <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>1.6</observeToolkitVersion> + <observeToolkitVersion>1.7-SNAPSHOT</observeToolkitVersion> <eugenePluginVersion>3.0-alpha-16</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> @@ -219,12 +219,6 @@ <dependency> <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>topia-templates-extension</artifactId> - <version>${observeToolkitVersion}</version> - </dependency> - - <dependency> - <groupId>fr.ird.observe.toolkit</groupId> <artifactId>common-dto</artifactId> <version>${observeToolkitVersion}</version> </dependency> @@ -282,6 +276,7 @@ <artifactId>commons-io</artifactId> <version>2.5</version> </dependency> + <!--We don't use it, but we want to use only one version--> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> @@ -310,6 +305,7 @@ <version>2.8.2</version> </dependency> + <!--We don't use it, but we want to use only one version--> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> @@ -320,11 +316,6 @@ <artifactId>httpcore</artifactId> <version>4.4.7</version> </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpmime</artifactId> - <version>${httpComponentsVersion}</version> - </dependency> <dependency> <groupId>junit</groupId> @@ -473,152 +464,68 @@ </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> - <artifactId>jaxx-runtime-swing-session</artifactId> - <version>${jaxxVersion}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-swing-wizard</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-validator</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-error</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>io.ultreia.java4all.jaxx</groupId> - <artifactId>jaxx-widgets-hidor</artifactId> - <version>${jaxxVersion}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-datetime</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-select</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-about</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-number</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-file</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-status</artifactId> <version>${jaxxVersion}</version> - <exclusions> - <exclusion> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-config</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> @@ -644,11 +551,6 @@ </dependency> <dependency> <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-painters</artifactId> - <version>${swingXVersion}</version> - </dependency> - <dependency> - <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-autocomplete</artifactId> <version>${swingXVersion}</version> </dependency> @@ -810,11 +712,6 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${sl4jVersion}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${sl4jVersion}</version> </dependency> @@ -870,6 +767,7 @@ <version>${flexmarkVersion}</version> </dependency> + <!--We don't use it, but we want to use only one version--> <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> @@ -931,36 +829,6 @@ </dependencies> </plugin> - <plugin> - <artifactId>maven-scm-publish-plugin</artifactId> - <configuration> - <pubScmUrl>${project.distributionManagement.site.url}</pubScmUrl> - <scmBranch>pages</scmBranch> - <content>${project.reporting.outputDirectory}</content><!-- mono-module doesn't require site:stage --> - </configuration> - <executions> - <execution> - <id>scm-publish</id> - <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin --> - <goals> - <goal>publish-scm</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.codehaus.gmavenplus</groupId> - <artifactId>gmavenplus-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.reflections</groupId> - <artifactId>reflections</artifactId> - <version>${reflectionsVersion}</version> - </dependency> - </dependencies> - </plugin> - <!-- Plugins version from nuiton --> <plugin> <groupId>io.ultreia.java4all.i18n</groupId> @@ -1000,18 +868,6 @@ </plugin> <plugin> - <groupId>org.nuiton.processor</groupId> - <artifactId>processor-maven-plugin</artifactId> - <version>${processorPluginVersion}</version> - </plugin> - - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <version>${helperPluginVersion}</version> - </plugin> - - <plugin> <groupId>io.ultreia.maven</groupId> <artifactId>gitlab-maven-plugin</artifactId> <configuration> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/208d83e90d39fe3bf20ef64e17f3... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/208d83e90d39fe3bf20ef64e17f3... You're receiving this email because of your account on gitlab.com.