Bow-commits

Download

bow-commits@list.chorem.org

August 2013

1 participants
1 discussions

r356 - in trunk: . bow-extension-chromium bow-ui
by tchemit＠users.chorem.org 09 Aug '13

09 Aug '13

Author: tchemit Date: 2013-08-09 12:07:03 +0200 (Fri, 09 Aug 2013) New Revision: 356 Url: http://chorem.org/projects/bow/repository/revisions/356 Log: - updates mavenpom to 4.0 - reformat poms Modified: trunk/bow-extension-chromium/pom.xml trunk/bow-ui/pom.xml trunk/pom.xml Modified: trunk/bow-extension-chromium/pom.xml =================================================================== --- trunk/bow-extension-chromium/pom.xml 2013-05-26 06:54:39 UTC (rev 355) +++ trunk/bow-extension-chromium/pom.xml 2013-08-09 10:07:03 UTC (rev 356) @@ -1,12 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> @@ -14,21 +11,11 @@ </parent> <artifactId>bow-extension-chromium</artifactId> - -  -  -  - + <packaging>crx</packaging> <name>BOW :: Chromium extension</name> <description>Chromium extension for BOW</description> <inceptionYear>2011</inceptionYear> -  -  -  - - <packaging>crx</packaging> - <properties> <crx.pemKey>${basedir}/key.pem</crx.pemKey> <crx.pemCert>${basedir}/cert.pem</crx.pemCert> @@ -61,4 +48,4 @@ </plugins> </build> -</project> \ No newline at end of file +</project> Modified: trunk/bow-ui/pom.xml =================================================================== --- trunk/bow-ui/pom.xml 2013-05-26 06:54:39 UTC (rev 355) +++ trunk/bow-ui/pom.xml 2013-08-09 10:07:03 UTC (rev 356) @@ -1,12 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> @@ -14,21 +11,23 @@ </parent> <artifactId>bow-ui</artifactId> + <packaging>war</packaging> <name>BOW UI</name> <description>bookmarks on web UI</description> <inceptionYear>2010</inceptionYear> - <packaging>war</packaging> - <properties> <i18n.bundles>fr_FR,en_GB</i18n.bundles> <i18n.silent>true</i18n.silent> <i18n.bundleOutputName>bow-i18n</i18n.bundleOutputName> <i18n.bundleOutputDir> - ${basedir}/target/generated-sources/resources + ${basedir}/target/generated-sources/resources </i18n.bundleOutputDir> <i18n.addBundleOuputDirParent>false</i18n.addBundleOuputDirParent> + +  + <skipPostRelease>false</skipPostRelease> </properties> <dependencies> @@ -54,7 +53,7 @@ <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-api</artifactId> </dependency> - + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> @@ -159,12 +158,12 @@ <scope>runtime</scope> </dependency> - <dependency> + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-sitemesh-plugin</artifactId> - <scope>runtime</scope> + <scope>runtime</scope> </dependency> - + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> @@ -187,7 +186,6 @@ <filtering>true</filtering> </resource> </resources> - <plugins> <plugin> <groupId>org.nuiton.eugene</groupId> @@ -266,7 +264,7 @@ </execution> </executions> </plugin> - + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> @@ -285,7 +283,9 @@ <version>${project.version}</version> <type>crx</type> <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/${project.build.finalName}/extensions/</outputDirectory> + <outputDirectory> + ${project.build.directory}/${project.build.finalName}/extensions/ + </outputDirectory> <destFileName>bow4chromium.crx</destFileName> </artifactItem> </artifactItems> @@ -297,4 +297,5 @@ </plugin> </plugins> </build> + </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-26 06:54:39 UTC (rev 355) +++ trunk/pom.xml 2013-08-09 10:07:03 UTC (rev 356) @@ -1,34 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> -  -  -  - <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11</version> + <version>4.0</version> </parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> <version>1.2-SNAPSHOT</version> + <packaging>pom</packaging> - <modules> - <module>bow-extension-chromium</module> - <module>bow-ui</module> - </modules> - <name>bow</name> <description>bookmarks on web</description> - <inceptionYear>2010</inceptionYear> - <url>http://maven-site.chorem.org/bow</url> - <packaging>pom</packaging> - + <inceptionYear>2010</inceptionYear> <licenses> <license> <name>GNU Affero General Public License version 3</name> @@ -85,7 +73,6 @@ </roles> </developer> </developers> - <contributors> <contributor> <name>Benoit Brossaud</name> @@ -108,6 +95,11 @@ </contributor> </contributors> + <modules> + <module>bow-extension-chromium</module> + <module>bow-ui</module> + </modules> + <scm> <connection>scm:svn:http://svn.chorem.org/svn/bow/trunk</connection> <developerConnection> @@ -115,7 +107,6 @@ </developerConnection> <url>http://www.chorem.org/repositories/browse/bow/trunk</url> </scm> - <distributionManagement> <site> <id>${platform}</id> @@ -146,6 +137,66 @@ <license.licenseName>agpl_v3</license.licenseName> </properties> + <repositories> + + <repository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://nexus.nuiton.org/nexus/content/groups/bow/</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + + <repository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://nexus.nuiton.org/nexus/content/groups/bow</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + + </repositories> + <pluginRepositories> + + <pluginRepository> + + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://nexus.nuiton.org/nexus/content/groups/bow</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </pluginRepository> + + <pluginRepository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://nexus.nuiton.org/nexus/content/groups/bow</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </pluginRepository> + + </pluginRepositories> + <dependencyManagement> <dependencies> @@ -289,7 +340,6 @@ <filtering>true</filtering> </resource> </resources> - <pluginManagement> <plugins> @@ -324,67 +374,6 @@ </plugins> </pluginManagement> - </build> - <repositories> - - <repository> - <id>nuiton.release</id> - <name>NuitonReleaseRepository</name> - <url>http://nexus.nuiton.org/nexus/content/groups/bow/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> - - <repository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://nexus.nuiton.org/nexus/content/groups/bow</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - - </repositories> - - <pluginRepositories> - - <pluginRepository> - - <id>nuiton.release</id> - <name>NuitonReleaseRepository</name> - <url>http://nexus.nuiton.org/nexus/content/groups/bow</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </pluginRepository> - - <pluginRepository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://nexus.nuiton.org/nexus/content/groups/bow</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </pluginRepository> - - </pluginRepositories> </project>

1 0