Revision 662

View differences:

2.1/branches/org.gvsig.view3d_vector_and_extrusion/org.gvsig.view3d/org.gvsig.view3d.lib/org.gvsig.view3d.lib.api/pom.xml
4 4
	<parent>
5 5
		<groupId>org.gvsig</groupId>
6 6
		<artifactId>org.gvsig.view3d.lib</artifactId>
7
		<version>1.0.15-SNAPSHOT</version>
7
		<version>1.1.0-SNAPSHOT</version>
8 8
	</parent>
9 9
	<artifactId>org.gvsig.view3d.lib.api</artifactId>
10 10
	<name>org.gvsig.view3d.lib.api</name>
2.1/branches/org.gvsig.view3d_vector_and_extrusion/org.gvsig.view3d/org.gvsig.view3d.lib/org.gvsig.view3d.lib.impl/pom.xml
4 4
	<parent>
5 5
		<groupId>org.gvsig</groupId>
6 6
		<artifactId>org.gvsig.view3d.lib</artifactId>
7
		<version>1.0.15-SNAPSHOT</version>
7
		<version>1.1.0-SNAPSHOT</version>
8 8
	</parent>
9 9
	<artifactId>org.gvsig.view3d.lib.impl</artifactId>
10 10
	<name>org.gvsig.view3d.lib.impl</name>
2.1/branches/org.gvsig.view3d_vector_and_extrusion/org.gvsig.view3d/org.gvsig.view3d.lib/pom.xml
3 3
  <parent>
4 4
    <groupId>org.gvsig</groupId>
5 5
    <artifactId>org.gvsig.view3d</artifactId>
6
    <version>1.0.15-SNAPSHOT</version>
6
    <version>1.1.0-SNAPSHOT</version>
7 7
  </parent>
8 8
  <artifactId>org.gvsig.view3d.lib</artifactId>
9 9
  <packaging>pom</packaging>
2.1/branches/org.gvsig.view3d_vector_and_extrusion/org.gvsig.view3d/pom.xml
2 2
	<modelVersion>4.0.0</modelVersion>
3 3
	<groupId>org.gvsig</groupId>
4 4
	<artifactId>org.gvsig.view3d</artifactId>
5
	<version>1.0.15-SNAPSHOT</version>
5
	<version>1.1.0-SNAPSHOT</version>
6 6
	<packaging>pom</packaging>
7 7
	<name>org.gvsig.view3d</name>
8 8
	<parent>
9 9
		<groupId>org.gvsig</groupId>
10 10
		<artifactId>org.gvsig.desktop</artifactId>
11
		<version>2.0.132</version>
11
		<version>2.0.142</version>
12 12
	</parent>
13 13
	<url>https://devel.gvsig.org/sites/org.gvsig.view3d/${project.version}</url>
14 14
	<scm>
......
62 62
			<dependency>
63 63
				<groupId>org.gvsig</groupId>
64 64
				<artifactId>org.gvsig.view3d.app.common</artifactId>
65
				<version>1.0.15-SNAPSHOT</version>
65
				<version>1.1.0-SNAPSHOT</version>
66 66
			</dependency>
67 67
			<dependency>
68 68
				<groupId>org.gvsig</groupId>
69 69
				<artifactId>org.gvsig.view3d.swing.api</artifactId>
70
				<version>1.0.15-SNAPSHOT</version>
70
				<version>1.1.0-SNAPSHOT</version>
71 71
			</dependency>
72 72
			<dependency>
73 73
				<groupId>org.gvsig</groupId>
74 74
				<artifactId>org.gvsig.view3d.swing.impl</artifactId>
75
				<version>1.0.15-SNAPSHOT</version>
75
				<version>1.1.0-SNAPSHOT</version>
76 76
			</dependency>
77 77
			<dependency>
78 78
                <groupId>org.gvsig</groupId>
79 79
                <artifactId>org.gvsig.view3d.lib.api</artifactId>
80
                <version>1.0.15-SNAPSHOT</version>
80
                <version>1.1.0-SNAPSHOT</version>
81 81
            </dependency>
82 82
            <dependency>
83 83
                <groupId>org.gvsig</groupId>
84 84
                <artifactId>org.gvsig.view3d.lib.impl</artifactId>
85
                <version>1.0.15-SNAPSHOT</version>
85
                <version>1.1.0-SNAPSHOT</version>
86 86
            </dependency>
87
			<dependency>
87
			<!-- <dependency>
88 88
				<groupId>org.gvsig</groupId>
89 89
				<artifactId>org.gvsig.fmap.mapcontext.api</artifactId>
90 90
				<version>2.0.85</version>
......
94 94
				<artifactId>org.gvsig.fmap.mapcontext.impl</artifactId>
95 95
				<version>2.0.85</version>
96 96
				<scope>runtime</scope>
97
			</dependency>
98
			<dependency>
97
			</dependency> -->
98
			<!-- <dependency>
99 99
				<groupId>org.gvsig</groupId>
100 100
				<artifactId>org.gvsig.raster.gdal.io</artifactId>
101 101
				<version>2.2.7</version>
......
125 125
				<groupId>org.gvsig</groupId>
126 126
				<artifactId>org.gvsig.raster.fmap</artifactId>
127 127
				<version>2.2.6</version>
128
			</dependency>
129
			<dependency>
128
			</dependency> -->
129
			<!-- <dependency>
130 130
				<groupId>org.gvsig</groupId>
131 131
				<artifactId>org.gvsig.gpe.app.mainplugin</artifactId>
132 132
				<version>2.1.4</version>
......
172 172
				<artifactId>org.gvsig.gpe.prov.xml</artifactId>
173 173
				<version>2.1.4</version>
174 174
				<scope>runtime</scope>
175
			</dependency> -->
176

  
177
      <dependency>
178
        <groupId>org.gvsig</groupId>
179
        <artifactId>org.gvsig.raster</artifactId>
180
        <type>pom</type>
181
        <scope>import</scope>
182
        <version>${org.gvsig.raster.version}</version>
175 183
			</dependency>
176 184
			<dependency>
185
        <groupId>org.gvsig</groupId>
186
        <artifactId>org.gvsig.gpe</artifactId>
187
        <type>pom</type>
188
        <scope>import</scope>
189
        <version>${org.gvsig.gpe.version}</version>
190
      </dependency>
191
<!--       <dependency>
192
        <groupId>org.gvsig</groupId>
193
        <artifactId>org.gvsig.gpe.app.mainplugin</artifactId>
194
        <version>${org.gvsig.gpe.version}</version>
195
        <scope>runtime</scope>
196
      </dependency> -->
197
            <dependency>
198
        <groupId>org.gvsig</groupId>
199
        <artifactId>org.gvsig.raster.gdal</artifactId>
200
        <type>pom</type>
201
        <scope>import</scope>
202
        <version>${org.gvsig.raster.gdal.version}</version>
203
      </dependency>
204

  
205

  
206
			<dependency>
177 207
				<groupId>gov.nasa</groupId>
178 208
				<artifactId>worldwind</artifactId>
179 209
				<version>2.0.0</version>
......
190 220
			</dependency>
191 221
		</dependencies>
192 222
	</dependencyManagement>
223
    <properties>
224
            <org.gvsig.raster.version>2.2.47</org.gvsig.raster.version>
225
            <org.gvsig.gpe.version>2.1.34</org.gvsig.gpe.version>
226
            <org.gvsig.raster.gdal.version>2.2.42</org.gvsig.raster.gdal.version>
227
    </properties>
193 228
</project>
2.1/branches/org.gvsig.view3d_vector_and_extrusion/org.gvsig.view3d/org.gvsig.view3d.swing/pom.xml
3 3
  <parent>
4 4
    <groupId>org.gvsig</groupId>
5 5
    <artifactId>org.gvsig.view3d</artifactId>
6
    <version>1.0.15-SNAPSHOT</version>
6
    <version>1.1.0-SNAPSHOT</version>
7 7
  </parent>
8 8
  <artifactId>org.gvsig.view3d.swing</artifactId>
9 9
  <packaging>pom</packaging>
2.1/branches/org.gvsig.view3d_vector_and_extrusion/org.gvsig.view3d/org.gvsig.view3d.swing/org.gvsig.view3d.swing.impl/pom.xml
4 4
	<parent>
5 5
		<groupId>org.gvsig</groupId>
6 6
		<artifactId>org.gvsig.view3d.swing</artifactId>
7
		<version>1.0.15-SNAPSHOT</version>
7
		<version>1.1.0-SNAPSHOT</version>
8 8
	</parent>
9 9
	<artifactId>org.gvsig.view3d.swing.impl</artifactId>
10 10
	<name>org.gvsig.view3d.swing.impl</name>
2.1/branches/org.gvsig.view3d_vector_and_extrusion/org.gvsig.view3d/org.gvsig.view3d.swing/org.gvsig.view3d.swing.api/pom.xml
3 3
	<parent>
4 4
		<groupId>org.gvsig</groupId>
5 5
		<artifactId>org.gvsig.view3d.swing</artifactId>
6
		<version>1.0.15-SNAPSHOT</version>
6
		<version>1.1.0-SNAPSHOT</version>
7 7
	</parent>
8 8
	<artifactId>org.gvsig.view3d.swing.api</artifactId>
9 9
	<name>org.gvsig.view3d.swing.api</name>
2.1/branches/org.gvsig.view3d_vector_and_extrusion/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.lin.x86/pom.xml
3 3
  <parent>
4 4
    <groupId>org.gvsig</groupId>
5 5
    <artifactId>org.gvsig.view3d.app</artifactId>
6
    <version>1.0.15-SNAPSHOT</version>
6
    <version>1.1.0-SNAPSHOT</version>
7 7
  </parent>
8 8
  <artifactId>org.gvsig.view3d.app.lin.x86</artifactId>
9 9
  <name>org.gvsig.view3d.app.lin.x86</name>
2.1/branches/org.gvsig.view3d_vector_and_extrusion/org.gvsig.view3d/org.gvsig.view3d.app/pom.xml
3 3
	<parent>
4 4
		<groupId>org.gvsig</groupId>
5 5
		<artifactId>org.gvsig.view3d</artifactId>
6
		<version>1.0.15-SNAPSHOT</version>
6
		<version>1.1.0-SNAPSHOT</version>
7 7
	</parent>
8 8
	<artifactId>org.gvsig.view3d.app</artifactId>
9 9
	<packaging>pom</packaging>
2.1/branches/org.gvsig.view3d_vector_and_extrusion/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.common/pom.xml
3 3
	<parent>
4 4
		<groupId>org.gvsig</groupId>
5 5
		<artifactId>org.gvsig.view3d.app</artifactId>
6
		<version>1.0.15-SNAPSHOT</version>
6
		<version>1.1.0-SNAPSHOT</version>
7 7
	</parent>
8 8
	<artifactId>org.gvsig.view3d.app.common</artifactId>
9 9
	<name>org.gvsig.view3d.app.common</name>
2.1/branches/org.gvsig.view3d_vector_and_extrusion/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.win.x86_64/pom.xml
3 3
	<parent>
4 4
		<groupId>org.gvsig</groupId>
5 5
		<artifactId>org.gvsig.view3d.app</artifactId>
6
		<version>1.0.15-SNAPSHOT</version>
6
		<version>1.1.0-SNAPSHOT</version>
7 7
	</parent>
8 8
	<artifactId>org.gvsig.view3d.app.win.x86_64</artifactId>
9 9
	<name>org.gvsig.view3d.app.win.x86_64</name>
2.1/branches/org.gvsig.view3d_vector_and_extrusion/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.lin.x86_64/pom.xml
3 3
	<parent>
4 4
		<groupId>org.gvsig</groupId>
5 5
		<artifactId>org.gvsig.view3d.app</artifactId>
6
		<version>1.0.15-SNAPSHOT</version>
6
		<version>1.1.0-SNAPSHOT</version>
7 7
	</parent>
8 8
	<artifactId>org.gvsig.view3d.app.lin.x86_64</artifactId>
9 9
	<name>org.gvsig.view3d.app.lin.x86_64</name>
2.1/branches/org.gvsig.view3d_vector_and_extrusion/org.gvsig.view3d/org.gvsig.view3d.app/org.gvsig.view3d.app.win.x86/pom.xml
3 3
	<parent>
4 4
		<groupId>org.gvsig</groupId>
5 5
		<artifactId>org.gvsig.view3d.app</artifactId>
6
		<version>1.0.15-SNAPSHOT</version>
6
		<version>1.1.0-SNAPSHOT</version>
7 7
	</parent>
8 8
	<artifactId>org.gvsig.view3d.app.win.x86</artifactId>
9 9
	<name>org.gvsig.view3d.app.win.x86</name>
2.1/branches/org.gvsig.view3d_vector_and_extrusion/org.gvsig.view3d/org.gvsig.view3d.main/pom.xml
3 3
	<parent>
4 4
		<groupId>org.gvsig</groupId>
5 5
		<artifactId>org.gvsig.view3d</artifactId>
6
		<version>1.0.15-SNAPSHOT</version>
6
		<version>1.1.0-SNAPSHOT</version>
7 7
	</parent>
8 8
	<artifactId>org.gvsig.view3d.main</artifactId>
9 9
	<name>org.gvsig.view3d.main</name>
10
	<packaging>pom</packaging>
10 11
	<dependencies>
11 12
		<!-- Compile dependencies -->
12 13
		<dependency>
......
60 61
		<dependency>
61 62
			<groupId>org.gvsig</groupId>
62 63
			<artifactId>org.gvsig.gpe.lib.api</artifactId>
63
			<version>2.1.5</version>
64
			<!-- <version>2.1.5</version> -->
64 65
		</dependency>
65 66

  
66 67
		<!-- runtime dependencies -->
......
164 165
			<scope>runtime</scope>
165 166
		</dependency>
166 167
		<dependency>
167
			<groupId>org.gvsig</groupId>
168
			<artifactId>org.gvsig.gpe.app.mainplugin</artifactId>
169
			<scope>runtime</scope>
170
		</dependency>
171
		<dependency>
172 168
			<groupId>xerces</groupId>
173 169
			<artifactId>xercesImpl</artifactId>
174
			<version>2.11.0</version>
175 170
		</dependency>
176 171
		<dependency>
177 172
			<groupId>xml-apis</groupId>
178 173
			<artifactId>xml-apis</artifactId>
179
			<version>2.0.2</version>
180 174
		</dependency>
181 175

  
182 176
		<!-- Native dependencies. To test with other arch -->
183 177
		<!-- change classifier of dependency -->
184 178

  
185
		<dependency>
179
<!-- 		<dependency>
186 180
			<groupId>org.jogamp.gluegen</groupId>
187 181
			<artifactId>gluegen-rt</artifactId>
188 182
			<classifier>natives-linux-amd64</classifier>
......
195 189
			<classifier>natives-linux-amd64</classifier>
196 190
			<scope>runtime</scope>
197 191
			<version>2.2.1</version>
198
		</dependency>
192
		</dependency> -->
199 193

  
200 194

  
201 195
		<!-- View3D dependencies -->

Also available in: Unified diff