Revision 40769 trunk/org.gvsig.desktop/pom.xml
pom.xml | ||
---|---|---|
42 | 42 |
</organization> |
43 | 43 |
|
44 | 44 |
<scm> |
45 |
<connection>https://devel.gvsig.org/svn/gvsig-desktop/trunk/org.gvsig.desktop/</connection> |
|
45 |
<connection>scm:svn:https://devel.gvsig.org/svn/gvsig-desktop/trunk/org.gvsig.desktop/</connection>
|
|
46 | 46 |
<developerConnection>scm:svn:https://devel.gvsig.org/svn/gvsig-desktop/trunk/org.gvsig.desktop/</developerConnection> |
47 | 47 |
<url>https://devel.gvsig.org/redmine/projects/gvsig-desktop/repository/show/trunk//org.gvsig.desktop/</url> |
48 | 48 |
</scm> |
... | ... | |
209 | 209 |
<artifactId>batik-bridge</artifactId> |
210 | 210 |
<version>1.7</version> |
211 | 211 |
</dependency> |
212 |
<!-- |
|
213 | 212 |
<dependency> |
214 |
<groupId>org.gvsig</groupId> |
|
215 |
<artifactId>batik-ext-gvsig-custom</artifactId> |
|
216 |
<version>1.7.0</version> |
|
217 |
</dependency> |
|
218 |
--> |
|
219 |
<dependency> |
|
220 | 213 |
<groupId>org.apache.xmlgraphics</groupId> |
221 | 214 |
<artifactId>batik-ext</artifactId> |
222 | 215 |
<version>1.7</version> |
... | ... | |
316 | 309 |
<artifactId>commons-collections</artifactId> |
317 | 310 |
<version>3.2.1</version> |
318 | 311 |
</dependency> |
312 |
<dependency> |
|
313 |
<groupId>org.apache.commons</groupId> |
|
314 |
<artifactId>commons-csv</artifactId> |
|
315 |
<version>1.0-SNAPSHOT</version> |
|
316 |
</dependency> |
|
319 | 317 |
<dependency> |
320 | 318 |
<groupId>commons-httpclient</groupId> |
321 | 319 |
<artifactId>commons-httpclient</artifactId> |
... | ... | |
1404 | 1402 |
<ignore /> |
1405 | 1403 |
</action> |
1406 | 1404 |
</pluginExecution> |
1405 |
<pluginExecution> |
|
1406 |
<pluginExecutionFilter> |
|
1407 |
<groupId>org.apache.maven.plugins</groupId> |
|
1408 |
<artifactId> |
|
1409 |
maven-dependency-plugin |
|
1410 |
</artifactId> |
|
1411 |
<versionRange>[2.1,)</versionRange> |
|
1412 |
<goals> |
|
1413 |
<goal>unpack</goal> |
|
1414 |
</goals> |
|
1415 |
</pluginExecutionFilter> |
|
1416 |
<action> |
|
1417 |
<ignore></ignore> |
|
1418 |
</action> |
|
1419 |
</pluginExecution> |
|
1407 | 1420 |
</pluginExecutions> |
1408 | 1421 |
</lifecycleMappingMetadata> |
1409 | 1422 |
</configuration> |
... | ... | |
1581 | 1594 |
<configuration> |
1582 | 1595 |
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> |
1583 | 1596 |
<appendAssemblyId>false</appendAssemblyId> |
1584 |
<finalName>gvSIG-desktop-${gvsig.package.info.gvSIGVersion}-${project.artifactId}-${gvsig.package.info.version}-${buildNumber}-${gvsig.package.info.state}-${gvsig.package.info.operatingSystem}-${gvsig.package.info.architecture}-${gvsig.package.info.javaVM}.gvspkg</finalName>
|
|
1597 |
<finalName>gvSIG-desktop-${gvsig.package.info.gvSIGVersion}-${gvsig.package.info.code}-${gvsig.package.info.version}-${buildNumber}-${gvsig.package.info.state}-${gvsig.package.info.operatingSystem}-${gvsig.package.info.architecture}-${gvsig.package.info.javaVM}.gvspkg</finalName>
|
|
1585 | 1598 |
<descriptors> |
1586 | 1599 |
<descriptor>src/main/assembly/gvsig-plugin-package.xml</descriptor> |
1587 | 1600 |
</descriptors> |
... | ... | |
1637 | 1650 |
</dependencies> |
1638 | 1651 |
</plugin> |
1639 | 1652 |
|
1653 |
<!-- Habria que ver si es posible sustituir el plugin --> |
|
1654 |
<!-- com.mycila.maven-license-plugin:maven-license-plugin por este --> |
|
1655 |
<!-- Ver http://mojo.codehaus.org/license-maven-plugin/index.html --> |
|
1656 |
<!-- |
|
1640 | 1657 |
<plugin> |
1658 |
<groupId>org.codehaus.mojo</groupId> |
|
1659 |
<artifactId>license-maven-plugin</artifactId> |
|
1660 |
<version>1.5</version> |
|
1661 |
</plugin> |
|
1662 |
--> |
|
1663 |
|
|
1664 |
<plugin> |
|
1641 | 1665 |
<groupId>org.apache.maven.plugins</groupId> |
1642 | 1666 |
<artifactId>maven-checkstyle-plugin</artifactId> |
1643 | 1667 |
<version>2.10</version> |
... | ... | |
1693 | 1717 |
package_info_file = new File(project.basedir, "target/package.info") |
1694 | 1718 |
log.info("Building package.info : " + package_info_file.getAbsolutePath()) |
1695 | 1719 |
Properties props = new Properties() |
1696 |
props.setProperty('code', project.artifactId)
|
|
1720 |
props.setProperty('code', project.properties["gvsig.package.info.code"])
|
|
1697 | 1721 |
props.setProperty('code-alias', project.properties["gvsig.package.info.codealias"]) |
1698 |
props.setProperty('name', project.name)
|
|
1722 |
props.setProperty('name', project.properties["gvsig.package.info.name"])
|
|
1699 | 1723 |
props.setProperty('version', project.properties["gvsig.package.info.version"]) |
1700 |
props.setProperty('description', project.description)
|
|
1724 |
props.setProperty('description', project.properties["gvsig.package.info.description"])
|
|
1701 | 1725 |
props.setProperty('owner', project.properties["gvsig.package.info.owner"]) |
1702 | 1726 |
props.setProperty('java-version', project.properties["gvsig.package.info.javaVM"]) |
1703 | 1727 |
props.setProperty('official', project.properties["gvsig.package.info.official"]) |
... | ... | |
1717 | 1741 |
|
1718 | 1742 |
pkgname = "gvSIG-desktop-" + |
1719 | 1743 |
project.properties["gvsig.package.info.gvSIGVersion"] + "-" + |
1720 |
project.artifactId + "-" +
|
|
1744 |
project.properties["gvsig.package.info.code"] + "-" +
|
|
1721 | 1745 |
project.properties["gvsig.package.info.version"] + "-" + |
1722 | 1746 |
project.properties["buildNumber"] + "-" + |
1723 | 1747 |
project.properties["gvsig.package.info.state"] + "-" + |
1724 | 1748 |
project.properties["gvsig.package.info.operatingSystem"] + "-" + |
1725 | 1749 |
project.properties["gvsig.package.info.architecture"] + "-" + |
1726 | 1750 |
project.properties["gvsig.package.info.javaVM"] |
1727 |
package_info_file = new File(project.basedir, "target/gvspki/"+project.artifactId+"/package.info")
|
|
1751 |
package_info_file = new File(project.basedir, "target/gvspki/"+project.properties["gvsig.package.info.code"]+"/package.info")
|
|
1728 | 1752 |
log.info("Building package.info index " + package_info_file.getAbsolutePath()) |
1729 | 1753 |
package_info_file.getParentFile().mkdirs() |
1730 | 1754 |
props.setProperty('download-url', |
1731 | 1755 |
project.properties["gvsig.package.info.poolURL"] + "/" + |
1732 |
project.artifactId + "/" +
|
|
1756 |
project.properties["gvsig.package.info.code"] + "/" +
|
|
1733 | 1757 |
pkgname + ".gvspkg" |
1734 | 1758 |
) |
1735 | 1759 |
props.store(package_info_file.newWriter(), null) |
... | ... | |
1749 | 1773 |
} else { |
1750 | 1774 |
pkgname = "gvSIG-desktop-" + |
1751 | 1775 |
project.properties["gvsig.package.info.gvSIGVersion"] + "-" + |
1752 |
project.artifactId + "-" +
|
|
1776 |
project.properties["gvsig.package.info.code"] + "-" +
|
|
1753 | 1777 |
project.properties["gvsig.package.info.version"] + "-" + |
1754 | 1778 |
project.properties["buildNumber"] + "-" + |
1755 | 1779 |
project.properties["gvsig.package.info.state"] + "-" + |
... | ... | |
1777 | 1801 |
ant = new AntBuilder() |
1778 | 1802 |
pkgname = "gvSIG-desktop-" + |
1779 | 1803 |
project.properties["gvsig.package.info.gvSIGVersion"] + "-" + |
1780 |
project.artifactId + "-" +
|
|
1804 |
project.properties["gvsig.package.info.code"] + "-" +
|
|
1781 | 1805 |
project.properties["gvsig.package.info.version"] + "-" + |
1782 | 1806 |
project.properties["buildNumber"] + "-" + |
1783 | 1807 |
project.properties["gvsig.package.info.state"] + "-" + |
... | ... | |
1785 | 1809 |
project.properties["gvsig.package.info.architecture"] + "-" + |
1786 | 1810 |
project.properties["gvsig.package.info.javaVM"] |
1787 | 1811 |
|
1788 |
source = project.basedir.getAbsolutePath() + "/target/" + pkgname + ".gvspkg.zip" |
|
1789 |
target = project.properties["gvsig.product.folder.path"] + "/gvSIG/extensiones/" |
|
1790 |
|
|
1791 |
log.info("Install plugin to " + target) |
|
1792 |
ant.unzip(src: source, dest: target) |
|
1793 |
|
|
1794 |
target = new File(project.properties["gvsig.product.folder.path"] + |
|
1795 |
"/install/" + |
|
1796 |
project.artifactId + "/" + |
|
1797 |
pkgname + ".gvspkg") |
|
1798 |
target.getParentFile().mkdirs() |
|
1799 |
|
|
1800 |
log.info("Copy plugin package from " + source + " to " + target) |
|
1801 |
ant.copy(file:source, tofile:target.getAbsolutePath()) |
|
1802 |
|
|
1803 |
source = project.basedir.getAbsolutePath() + "/target/" + pkgname + ".gvspki" |
|
1804 |
target = project.properties["gvsig.product.folder.path"] + |
|
1805 |
"/install/" + |
|
1806 |
project.artifactId + "/" + |
|
1807 |
pkgname + ".gvspki" |
|
1808 |
log.info("Copy plugin package index from " + source + " to " + target) |
|
1809 |
ant.copy(file:source, tofile:target) |
|
1812 |
println("gvsig.install.plugin=" + project.properties["gvsig.install.plugin"]) |
|
1813 |
println("gvsig.install.plugin.package=" + project.properties["gvsig.install.plugin.package"]) |
|
1814 |
if( project.properties["gvsig.install.plugin"]=="true" ) { |
|
1815 |
source = project.basedir.getAbsolutePath() + "/target/" + pkgname + ".gvspkg.zip" |
|
1816 |
target = project.properties["gvsig.product.folder.path"] + "/gvSIG/extensiones/" |
|
1817 |
|
|
1818 |
log.info("Install plugin to " + target) |
|
1819 |
ant.unzip(src: source, dest: target) |
|
1820 |
} else { |
|
1821 |
log.info("Skip plugin install.") |
|
1822 |
} |
|
1823 |
if( project.properties["gvsig.install.plugin.package"]=="true" ) { |
|
1824 |
source = project.basedir.getAbsolutePath() + "/target/" + pkgname + ".gvspkg.zip" |
|
1825 |
target = new File(project.properties["gvsig.product.folder.path"] + |
|
1826 |
"/install/" + |
|
1827 |
project.properties["gvsig.package.info.code"] + "/" + |
|
1828 |
pkgname + ".gvspkg") |
|
1829 |
target.getParentFile().mkdirs() |
|
1830 |
|
|
1831 |
log.info("Copy plugin package from " + source + " to " + target) |
|
1832 |
ant.copy(file:source, tofile:target.getAbsolutePath()) |
|
1833 |
|
|
1834 |
source = project.basedir.getAbsolutePath() + "/target/" + pkgname + ".gvspki" |
|
1835 |
target = project.properties["gvsig.product.folder.path"] + |
|
1836 |
"/install/" + |
|
1837 |
project.properties["gvsig.package.info.code"] + "/" + |
|
1838 |
pkgname + ".gvspki" |
|
1839 |
log.info("Copy plugin package index from " + source + " to " + target) |
|
1840 |
ant.copy(file:source, tofile:target) |
|
1841 |
} else { |
|
1842 |
log.info("Skip plugin package install.") |
|
1843 |
} |
|
1810 | 1844 |
} |
1811 | 1845 |
]]></source> |
1812 | 1846 |
</configuration> |
... | ... | |
1839 | 1873 |
<groupId>org.apache.maven.plugins</groupId> |
1840 | 1874 |
<artifactId>maven-release-plugin</artifactId> |
1841 | 1875 |
<configuration> |
1842 |
<tagBase>https://devel.gvsig.org/svn/gvsig-desktop/tags/</tagBase> |
|
1876 |
<!-- The property svn.tags.folder is used in external projects --> |
|
1877 |
<!-- to override configuraction of tagBase --> |
|
1878 |
<tagBase>${svn.tags.folder}</tagBase> |
|
1843 | 1879 |
<!-- This is a 2.0 beta 6 bug. By default the goals are 'clean verify', so the modules |
1844 | 1880 |
are not installed, so the dependencies between modules are not met. With this configuration |
1845 | 1881 |
we force the module installation. --> |
... | ... | |
2222 | 2258 |
<site-repository>dav:https://devel.gvsig.org/sites/${project.artifactId}/${project.version}</site-repository> |
2223 | 2259 |
<eclipse.project.name>${project.artifactId}</eclipse.project.name> |
2224 | 2260 |
|
2261 |
<!-- The property svn.tags.folder is used in external projects to override --> |
|
2262 |
<!-- configuraction in maven-release-plugin --> |
|
2263 |
<svn.tags.folder>https://devel.gvsig.org/svn/gvsig-desktop/tags/</svn.tags.folder> |
|
2264 |
|
|
2225 | 2265 |
<!-- Package info property values --> |
2226 | 2266 |
<gvsig.package.info.codealias /> |
2267 |
<gvsig.package.info.code>${project.artifactId}</gvsig.package.info.code> |
|
2268 |
<gvsig.package.info.name>${project.name}</gvsig.package.info.name> |
|
2269 |
<gvsig.package.info.description>${project.description}</gvsig.package.info.description> |
|
2227 | 2270 |
<gvsig.package.info.version>${project.version}</gvsig.package.info.version> |
2228 | 2271 |
<gvsig.package.info.state>devel</gvsig.package.info.state> |
2229 | 2272 |
<gvsig.package.info.official>false</gvsig.package.info.official> |
... | ... | |
2237 | 2280 |
<gvsig.package.info.webURL>http://www.gvsig.com</gvsig.package.info.webURL> |
2238 | 2281 |
<gvsig.package.info.categories /> |
2239 | 2282 |
<gvsig.package.info.poolURL>http://downloads.gvsig.org/download/gvsig-desktop/pool</gvsig.package.info.poolURL> |
2240 |
|
|
2283 |
|
|
2284 |
<!-- Control the deploy of the plugin in gvsig.product.folder.path/gvSIG/extensiones --> |
|
2285 |
<gvsig.install.plugin>true</gvsig.install.plugin> |
|
2286 |
<!-- Control the deploy of the plugin package in gvsig.product.folder.path/install --> |
|
2287 |
<gvsig.install.plugin.package>true</gvsig.install.plugin.package> |
|
2288 |
|
|
2241 | 2289 |
<!-- External project versions --> |
2242 | 2290 |
<gvsig.tools.version>3.0.7</gvsig.tools.version> |
2243 | 2291 |
<gvsig.about.version>1.0.0</gvsig.about.version> |
Also available in: Unified diff