Revision 40480

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.buildtools/pom.xml
1 1
<?xml version="1.0" encoding="UTF-8"?>
2 2
<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">
3 3
  <modelVersion>4.0.0</modelVersion>
4
  <groupId>org.gvsig</groupId>
4 5
  <artifactId>org.gvsig.desktop.buildtools</artifactId>
6
  <version>2.0.10-SNAPSHOT</version>
5 7
  <packaging>jar</packaging>
6 8
  <name>${project.artifactId}</name>
7 9
  <description>Resources used for build gvsig desktop</description>
10

  
11

  
8 12
<!-- No puede ser hijo de org.gvsig.desktop para evitar referencas circulares -->
9 13
<!--
10 14
  <parent>
......
13 17
    <version>2.0.10-SNAPSHOT</version>
14 18
  </parent>  
15 19
-->
20

  
21

  
22
    <licenses>
23
        <license>
24
            <name>GPLv3</name>
25
            <url>http://www.gnu.org/licenses/gpl.html</url>
26
            <distribution>repo</distribution>
27
            <comments>
28
			"GPL" stands for "General Public License". The most widespread such
29
			license is the GNU General Public License, or GNU GPL for short.
30
			This can be further shortened to "GPL", when it is understood that
31
			the GNU GPL is the one intended.
32
	      	</comments>
33
        </license>
34
    </licenses>
35

  
36
    <organization>
37
        <name>gvSIG Association</name>
38
        <url>http://www.gvsig.com/</url>
39
    </organization>
40

  
41
    <scm>
42
        <connection>scm:svn:https://devel.gvsig.org/svn/gvsig-desktop/trunk</connection>
43
        <developerConnection>scm:svn:https://devel.gvsig.org/svn/gvsig-desktop/trunk</developerConnection>
44
        <url>https://devel.gvsig.org/redmine/projects/gvsig-desktop/repository/show/trunk</url>
45
    </scm>
46
    
47
    <repositories>
48
      <repository>
49
        <id>gvsig-public-http-repository</id>
50
        <name>gvSIG maven public HTTP repository</name>
51
        <url>http://devel.gvsig.org/m2repo/j2se</url>
52
        <releases>
53
          <enabled>true</enabled>
54
          <updatePolicy>daily</updatePolicy>
55
          <checksumPolicy>warn</checksumPolicy>
56
        </releases>
57
        <snapshots>
58
          <enabled>true</enabled>
59
          <updatePolicy>daily</updatePolicy>
60
          <checksumPolicy>warn</checksumPolicy>
61
        </snapshots>
62
      </repository>
63
    </repositories>
64

  
65
    <distributionManagement>
66
      <site>
67
        <id>gvsig-repository</id>
68
        <url>dav:https://devel.gvsig.org/sites/${project.artifactId}/${project.version}</url>
69
      </site>
70
      <repository>
71
          <id>gvsig-repository</id>
72
          <name>gvSIG maven repository</name>
73
          <url>dav:https://devel.gvsig.org/m2repo/j2se</url>
74
          <uniqueVersion>false</uniqueVersion>
75
      </repository>
76
      <snapshotRepository>
77
          <id>gvsig-repository</id>
78
          <name>gvSIG maven repository</name>
79
          <url>dav:https://devel.gvsig.org/m2repo/j2se</url>
80
          <uniqueVersion>false</uniqueVersion>
81
      </snapshotRepository>
82
    </distributionManagement>
83
    
84
    <issueManagement>
85
      <system>redmine</system>
86
      <url>https://devel.gvsig.org/redmine/projects/gvsig-desktop</url>
87
    </issueManagement>
88

  
89
    <mailingLists>
90
      <mailingList>
91
        <name>User List</name>
92
        <subscribe>http://listserv.gva.es/cgi-bin/mailman/listinfo/gvsig_usuarios</subscribe>
93
        <unsubscribe>http://listserv.gva.es/cgi-bin/mailman/listinfo/gvsig_usuarios</unsubscribe>
94
        <post>gvsig_usuarios@listserv.gva.es</post>
95
        <archive>http://www.gvsig.org/web/community/mailing-lists/gvsig-nabble</archive>
96
        <otherArchives>
97
          <otherArchive>http://www.mail-archive.com/gvsig_usuarios@runas.cap.gva.es</otherArchive>
98
          <otherArchive>http://dir.gmane.org/index.php?prefix=gmane.comp.gis.gvsig</otherArchive>
99
        </otherArchives>
100
      </mailingList>
101
      <mailingList>
102
        <name>Developer List</name>
103
        <subscribe>http://listserv.gva.es/cgi-bin/mailman/listinfo/gvsig_desarrolladores</subscribe>
104
        <unsubscribe>http://listserv.gva.es/cgi-bin/mailman/listinfo/gvsig_desarrolladores</unsubscribe>
105
        <post>gvsig_desarrolladores@listserv.gva.es</post>
106
        <archive>http://www.gvsig.org/web/community/mailing-lists/gvsig-nabble</archive>
107
        <otherArchives>
108
          <otherArchive>http://www.mail-archive.com/gvsig_desarrolladores@runas.cap.gva.es</otherArchive>
109
          <otherArchive>http://dir.gmane.org/index.php?prefix=gmane.comp.gis.gvsig</otherArchive>
110
        </otherArchives>
111
      </mailingList>
112
      <mailingList>
113
        <name>International List</name>
114
        <subscribe>http://listserv.gva.es/cgi-bin/mailman/listinfo/gvsig_internacional</subscribe>
115
        <unsubscribe>http://listserv.gva.es/cgi-bin/mailman/listinfo/gvsig_internacional</unsubscribe>
116
        <post>gvsig_internacional@listserv.gva.es</post>
117
        <archive>http://www.gvsig.org/web/community/mailing-lists/gvsig-nabble</archive>
118
        <otherArchives>
119
          <otherArchive>http://www.mail-archive.com/gvsig_internacional@runas.cap.gva.es</otherArchive>
120
          <otherArchive>http://dir.gmane.org/index.php?prefix=gmane.comp.gis.gvsig</otherArchive>
121
        </otherArchives>
122
      </mailingList>
123
    </mailingLists>
124
    
125
    <build>
126
        <extensions>
127
            <extension>
128
                <groupId>org.apache.maven.wagon</groupId>
129
                <artifactId>wagon-webdav-jackrabbit</artifactId>
130
                <version>1.0-beta-7</version>
131
            </extension>
132
        </extensions>
133
    </build>
134

  
16 135
</project>
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.ui/pom.xml
59 59
      <artifactId>org.gvsig.external.jump</artifactId>
60 60
      <scope>compile</scope>
61 61
    </dependency>
62

  
63
    <dependency>
64
      <groupId>com.vividsolutions</groupId>
65
      <artifactId>jts</artifactId>
66
      <scope>runtime</scope>
67
    </dependency>
62 68
  </dependencies>
63 69

  
64 70
  <build>
trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.projection/org.gvsig.projection.cresques/pom.xml
10 10
        <version>2.0.10-SNAPSHOT</version>
     </parent>
 
+    <repositories>
+      <repository>
+          <id>osgeo</id>
+          <name>Open Source Geospatial Foundation</name>
+          <url>http://download.osgeo.org/webdav/geotools</url>
+          <releases>
+              <enabled>true</enabled>
+              <updatePolicy>never</updatePolicy>
+              <checksumPolicy>warn</checksumPolicy>
+          </releases>
+          <snapshots>
+              <enabled>false</enabled>
+          </snapshots>
+      </repository>
+    </repositories>
+
   <modules>
     <module>org.gvsig.projection.cresques.impl</module>
     <module>org.gvsig.projection.cresques.ui</module>
Index: trunk/org.gvsig.desktop/org.gvsig.desktop.installer/src/main/installjammer/gvsig-standard-installer.mpi
trunk/org.gvsig.desktop/org.gvsig.desktop.installer/src/main/installjammer/gvsig-standard-installer.mpi
90 90
{}
91 91

  
92 92
InstallVersion
93
{2.0.0.2046}
93
{2.0.0.999}
94 94

  
95 95
JRELinuxProvidedHome
96 96
{<%JRELinuxProvidedParentPath%>/<%JRELinuxProvidedInstallDirName%>}
......
11190 11190
{0755}
11191 11191

  
11192 11192
Linux-x86,Executable
11193
{<%ShortAppName%>-<%Version%>-<%BuildVersion%>-<%DevelState%>-lin-x86-online.bin}
11193
{<%ShortAppName%>-<%Version%>-<%DevelState%>-lin-x86-online.bin}
11194 11194

  
11195 11195
Linux-x86,FallBackToConsole
11196 11196
{Yes}
trunk/org.gvsig.desktop/org.gvsig.desktop.plugin/org.gvsig.app/org.gvsig.app.mainplugin/pom.xml
11 11
      <version>2.0.10-SNAPSHOT</version>
12 12
  </parent>
13 13

  
14
    <repositories>
15
      <repository>
16
          <id>osgeo</id>
17
          <name>Open Source Geospatial Foundation</name>
18
          <url>http://download.osgeo.org/webdav/geotools</url>
19
          <releases>
20
              <enabled>true</enabled>
21
              <updatePolicy>never</updatePolicy>
22
              <checksumPolicy>warn</checksumPolicy>
23
          </releases>
24
          <snapshots>
25
              <enabled>false</enabled>
26
          </snapshots>
27
      </repository>
28
    </repositories>
29

  
14 30
  <dependencies>
15 31

  
16 32
      <!-- Dependencias de compilacion aportadas por andami -->
......
95 111
          <scope>compile</scope>
96 112
      </dependency>
97 113
      <dependency>
98
        <groupId>com.vividsolutions</groupId>
99
        <artifactId>jts</artifactId>
100
        <scope>compile</scope>
101
      </dependency>
102
      <dependency>
103 114
          <groupId>org.gvsig</groupId>
104 115
          <artifactId>org.gvsig.about.api</artifactId>
105 116
          <scope>compile</scope>
......
227 238
      <!-- Ordered by artifactId -->
228 239

  
229 240
      <dependency>
241
        <groupId>com.vividsolutions</groupId>
242
        <artifactId>jts</artifactId>
243
        <scope>runtime</scope>
244
      </dependency>
245
      <dependency>
230 246
          <groupId>org.gvsig</groupId>
231 247
          <artifactId>org.gvsig.about.impl</artifactId>
232 248
          <scope>runtime</scope>
trunk/org.gvsig.desktop/pom.xml
10 10

  
11 11
    <!-- Update property  gvsig.desktop.children.version when update-->
12 12
    <!-- project version  -->
13
    <!-- Also update version of project org.gvsig.desktop.buildtools -->
13 14
    <version>2.0.10-SNAPSHOT</version>
14 15

  
15 16
    <name>${project.artifactId}</name>
......
33 34
        </license>
34 35
    </licenses>
35 36

  
36
    <issueManagement>
37
      <system>redmine</system>
38
      <url>https://devel.gvsig.org/redmine/projects/gvsig-desktop</url>
39
    </issueManagement>
37
    <organization>
38
        <name>gvSIG Association</name>
39
        <url>http://www.gvsig.com/</url>
40
    </organization>
40 41

  
42
    <scm>
43
        <connection>scm:svn:https://devel.gvsig.org/svn/gvsig-desktop/trunk</connection>
44
        <developerConnection>scm:svn:https://devel.gvsig.org/svn/gvsig-desktop/trunk</developerConnection>
45
        <url>https://devel.gvsig.org/redmine/projects/gvsig-desktop/repository/show/trunk</url>
46
    </scm>
47
    
48
    <repositories>
49
      <repository>
50
        <id>gvsig-public-http-repository</id>
51
        <name>gvSIG maven public HTTP repository</name>
52
        <url>http://devel.gvsig.org/m2repo/j2se</url>
53
        <releases>
54
          <enabled>true</enabled>
55
          <updatePolicy>daily</updatePolicy>
56
          <checksumPolicy>warn</checksumPolicy>
57
        </releases>
58
        <snapshots>
59
          <enabled>true</enabled>
60
          <updatePolicy>daily</updatePolicy>
61
          <checksumPolicy>warn</checksumPolicy>
62
        </snapshots>
63
      </repository>
64
      <!--
65
      <repository>
66
          <id>osgeo</id>
67
          <name>Open Source Geospatial Foundation</name>
68
          <url>http://download.osgeo.org/webdav/geotools</url>
69
          <releases>
70
              <enabled>true</enabled>
71
              <updatePolicy>never</updatePolicy>
72
              <checksumPolicy>warn</checksumPolicy>
73
          </releases>
74
          <snapshots>
75
              <enabled>false</enabled>
76
          </snapshots>
77
      </repository>
78
      -->
79
    </repositories>
80

  
41 81
    <distributionManagement>
42 82
      <site>
43 83
        <id>gvsig-repository</id>
44 84
        <url>dav:https://devel.gvsig.org/sites/${project.artifactId}/${project.version}</url>
45 85
      </site>
86
      <repository>
87
          <id>gvsig-repository</id>
88
          <name>gvSIG maven repository</name>
89
          <url>dav:https://devel.gvsig.org/m2repo/j2se</url>
90
          <uniqueVersion>false</uniqueVersion>
91
      </repository>
92
      <snapshotRepository>
93
          <id>gvsig-repository</id>
94
          <name>gvSIG maven repository</name>
95
          <url>dav:https://devel.gvsig.org/m2repo/j2se</url>
96
          <uniqueVersion>false</uniqueVersion>
97
      </snapshotRepository>
46 98
    </distributionManagement>
99
    
100
    <issueManagement>
101
      <system>redmine</system>
102
      <url>https://devel.gvsig.org/redmine/projects/gvsig-desktop</url>
103
    </issueManagement>
47 104

  
48 105
    <mailingLists>
49 106
      <mailingList>
......
81 138
      </mailingList>
82 139
    </mailingLists>
83 140

  
84
    <scm>
85
        <connection>scm:svn:https://devel.gvsig.org/svn/gvsig-desktop/branches/v2_0_0_prep</connection>
86
        <developerConnection>scm:svn:https://devel.gvsig.org/svn/gvsig-desktop/branches/v2_0_0_prep</developerConnection>
87
        <url>https://devel.gvsig.org/redmine/projects/gvsig-desktop/repository/show/branches/v2_0_0_prep</url>
88
    </scm>
89

  
90
    <repositories>
91
      <repository>
92
        <id>gvsig-public-http-repository</id>
93
        <name>gvSIG maven public HTTP repository</name>
94
        <url>http://devel.gvsig.org/m2repo/j2se</url>
95
        <releases>
96
          <enabled>true</enabled>
97
          <updatePolicy>daily</updatePolicy>
98
          <checksumPolicy>warn</checksumPolicy>
99
        </releases>
100
        <snapshots>
101
          <enabled>true</enabled>
102
          <updatePolicy>daily</updatePolicy>
103
          <checksumPolicy>warn</checksumPolicy>
104
        </snapshots>
105
      </repository>
106
      <repository>
107
          <id>osgeo</id>
108
          <name>Open Source Geospatial Foundation</name>
109
          <url>http://download.osgeo.org/webdav/geotools</url>
110
          <releases>
111
              <enabled>true</enabled>
112
              <updatePolicy>never</updatePolicy>
113
              <checksumPolicy>warn</checksumPolicy>
114
          </releases>
115
          <snapshots>
116
              <enabled>false</enabled>
117
          </snapshots>
118
      </repository>
119
    </repositories>
120

  
121 141
    <dependencyManagement>
122 142
        <dependencies>
123 143

  
......
478 498
            <dependency>
479 499
                <groupId>com.vividsolutions</groupId>
480 500
                <artifactId>jts</artifactId>
481
                <version>1.9</version>
501
                <version>1.13</version>
482 502
            </dependency>
503
            <!--
483 504
            <dependency>
484 505
                <groupId>com.vividsolutions</groupId>
485 506
                <artifactId>jtsio</artifactId>
486 507
                <version>1.7</version>
487 508
            </dependency>
509
            -->
488 510
            <dependency>
489 511
                <groupId>junit</groupId>
490 512
                <artifactId>junit</artifactId>
......
1297 1319
    </dependencies>
1298 1320

  
1299 1321
    <build>
1322
        <extensions>
1323
            <extension>
1324
                <groupId>org.apache.maven.wagon</groupId>
1325
                <artifactId>wagon-webdav-jackrabbit</artifactId>
1326
                <version>1.0-beta-7</version>
1327
            </extension>
1328
        </extensions>
1329

  
1300 1330
      <pluginManagement>
1301 1331
        <plugins>
1302 1332

  
......
1757 1787
          <!-- invoke as "mvn license:check" to check the header -->
1758 1788
          <!-- See http://code.google.com/p/maven-license-plugin/wiki/Configuration -->
1759 1789
          <configuration>
1760
              <skip>false</skip> <!-- User property is: license.skip  -->
1790
              <skip>true</skip> <!-- User property is: license.skip  -->
1761 1791
              <header>header.txt</header>
1762 1792
              <failIfMissing>false</failIfMissing>
1763 1793
              <aggregate>true</aggregate>
......
1801 1831
    </plugins>
1802 1832
  </build>
1803 1833

  
1834

  
1835
 <reporting>
1836
    <excludeDefaults>true</excludeDefaults>
1837
    <plugins>
1838
      <plugin>
1839
        <groupId>org.apache.maven.plugins</groupId>
1840
        <artifactId>maven-project-info-reports-plugin</artifactId>
1841
      </plugin>
1842
      <plugin>
1843
        <groupId>org.apache.maven.plugins</groupId>
1844
        <artifactId>maven-javadoc-plugin</artifactId>
1845
      </plugin>
1846
      <plugin>
1847
        <groupId>org.apache.maven.plugins</groupId>
1848
        <artifactId>maven-jxr-plugin</artifactId>
1849
        <configuration>
1850
          <linkJavadoc>true</linkJavadoc>
1851
        </configuration>
1852
      </plugin>
1853
    </plugins>
1854
  </reporting>
1855
  
1804 1856
  <profiles>
1805 1857
      <profile>
1806 1858
        <id>gvsig-desktop-package</id>
......
1851 1903
  </properties>
1852 1904

  
1853 1905
  <modules>
1854
  
1855
  <!--
1856 1906
    <module>org.gvsig.desktop.buildtools</module>
1857
    -->
1858
    
1859 1907
    <module>org.gvsig.desktop.compat.cdc</module>
1860 1908
    <module>org.gvsig.desktop.library</module>
1861 1909
    <module>org.gvsig.desktop.framework</module>
trunk/org.gvsig.desktop/maven-howto.rst
188 188
      </executions>
189 189
    </plugin>
190 190

  
191
- Fail when execute "mvn deploy" with the error::
192

  
193
    [INFO] ------------------------------------------------------------------------
194
    [ERROR] Failed to execute goal org.apache.maven.plugins:maven-deploy-plugin:2.7:deploy (default-deploy) on project org.gvsig.desktop: Failed to deploy artifacts/metadata: No connector available to access repository gvsig-repository (dav:https://devel.gvsig.org/m2repo/j2se) of type default using the available factories WagonRepositoryConnectorFactory -> [Help 1]
195
    [ERROR] 
196
    
197
  This happens to be configured the webdav wagon as an extension in the section "build"::
198
  
199
    ...
200
    <build>
201
      <extensions>
202
          <extension>
203
              <groupId>org.apache.maven.wagon</groupId>
204
              <artifactId>wagon-webdav-jackrabbit</artifactId>
205
              <version>1.0-beta-7</version>
206
          </extension>
207
      </extensions>
208
    ...
209
    

Also available in: Unified diff