Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8b747830 by Tony CHEMIT at 2017-06-30T11:29:13+02:00 use last pom version + clean poms - - - - - 12 changed files: - application-swing-configuration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - persistence/pom.xml - pom.xml - services-rest/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - topia-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -99,22 +99,6 @@ <build> - <resources> - <resource> - <directory>src/main/filtered-resources</directory> - <includes> - <include>**/*</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - <plugins> <plugin> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -34,10 +34,6 @@ <name>ObServe :: Application Swing Validation</name> <description>ObServe Application Swing Validation</description> - <properties> - - </properties> - <dependencies> <!-- sibling dependencies --> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -598,21 +598,6 @@ <finalName>${applicationName}-${project.version}</finalName> - <resources> - <resource> - <directory>src/main/filtered-resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> <pluginManagement> <plugins> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -102,21 +102,6 @@ </dependencies> <build> - <resources> - <resource> - <directory>src/main/filtered-resources</directory> - <includes> - <include>**/*</include> - </includes> - <filtering>true</filtering> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> <plugins> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -164,16 +164,6 @@ <finalName>${applicationName}-${project.version}</finalName> - <resources> - <resource> - <directory>${project.basedir}/src/main/filtered-resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*</include> - </includes> - </resource> - - </resources> <plugins> <plugin> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -144,20 +144,6 @@ </dependencies> <build> - <resources> - <resource> - <directory>${project.build.directory}/xmi</directory> - <includes> - <include>*.objectmodel-ext</include> - </includes> - </resource> - <resource> - <directory>${project.basedir}/src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> <pluginManagement> @@ -239,7 +225,6 @@ <configuration> <defaultPackage>fr.ird.observe.persistence</defaultPackage> <fullPackagePath>fr.ird.observe</fullPackagePath> - <!--<modelExtensionFile>${project.build.directory}/xmi/observe.ini</modelExtensionFile>--> <inputs> <input>friend</input> </inputs> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>10</version> + <version>13</version> </parent> <groupId>fr.ird.observe</groupId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -124,41 +124,4 @@ </dependencies> - - <build> - - <plugins> - - <plugin> - <groupId>org.codehaus.gmavenplus</groupId> - <artifactId>gmavenplus-plugin</artifactId> - <executions> - <execution> - <phase>process-classes</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <scripts> - <script><![CDATA[ - new org.reflections.Reflections("fr.ird.observe.services.rest") - .save("${project.build.outputDirectory}/META-INF/reflections/${project.artifactId}-reflections.xml") - ]]></script> - </scripts> - </configuration> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> - </dependencies> - </plugin> - - </plugins> - - </build> - </project> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -172,28 +172,6 @@ <plugins> <plugin> - <groupId>org.codehaus.gmavenplus</groupId> - <artifactId>gmavenplus-plugin</artifactId> - <executions> - <execution> - <id>generate-reflections.xml</id> - <phase>process-classes</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <scripts> - <script><![CDATA[ - new org.reflections.Reflections("fr.ird.observe.services.topia") - .save("${project.build.outputDirectory}/META-INF/reflections/${project.artifactId}-reflections.xml") - ]]></script> - </scripts> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> <executions> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -120,20 +120,7 @@ </dependencies> <build> - <resources> - <resource> - <directory>${project.build.directory}/generated-sources/resources/</directory> - <includes> - <include>objectmodel/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> + <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -173,12 +160,10 @@ <inputs> <input>friend</input> </inputs> - <!--<resolver>org.nuiton.util.FasterCachedResourceResolver</resolver>--> <templates>org.nuiton.eugene.java.BeanTransformer</templates> <failIfUnsafe>true</failIfUnsafe> <defaultPackage>fr.ird.observe.services.dto</defaultPackage> <fullPackagePath>fr.ird.observe.services.dto</fullPackagePath> - <!--<modelExtensionFile>../services/src/main/xmi/observe-services-dto.ini</modelExtensionFile>--> </configuration> <goals> <goal>generate</goal> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -67,23 +67,4 @@ </dependencies> - <build> - <resources> - <resource> - <directory>src/main/filtered-resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - - </build> - </project> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -84,12 +84,6 @@ <artifactId>HikariCP</artifactId> </dependency> - <!--dependency> - <groupId>com.mchange</groupId> - <artifactId>c3p0</artifactId> - <scope>compile</scope> - </dependency--> - <!-- test --> <dependency> <groupId>junit</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8b747830861637b4d2d3de33c0b5... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8b747830861637b4d2d3de33c0b5... You're receiving this email because of your account on gitlab.com.