Revision 3913

View differences:

org.gvsig.raster.gdal/trunk/org.gvsig.raster.gdal/org.gvsig.raster.gdal.io/pom.xml
1 1
<?xml version="1.0" encoding="ISO-8859-1"?>
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/maven-v4_0_0.xsd">
3
	<modelVersion>4.0.0</modelVersion>
4
	<artifactId>org.gvsig.raster.gdal.io</artifactId>
5
	<packaging>jar</packaging>
6
	<name>${project.artifactId}</name>
7
	<parent>
8
		<groupId>org.gvsig</groupId>
9
		<artifactId>org.gvsig.raster.gdal</artifactId>
10
		<version>2.2.15-SNAPSHOT</version>
11
	</parent>
3
    <modelVersion>4.0.0</modelVersion>
4
    <artifactId>org.gvsig.raster.gdal.io</artifactId>
5
    <packaging>jar</packaging>
6
    <name>${project.artifactId}</name>
7
    <parent>
8
        <groupId>org.gvsig</groupId>
9
        <artifactId>org.gvsig.raster.gdal</artifactId>
10
        <version>2.2.15-SNAPSHOT</version>
11
    </parent>
12 12
	
13
	<dependencies>
14
		 <dependency>
13
    <dependencies>
14
        <dependency>
15 15
            <groupId>org.gdal</groupId>
16 16
            <artifactId>gdal</artifactId>
17 17
            <scope>compile</scope>
18 18
        </dependency>
19
		<dependency>
20
			<groupId>org.gvsig</groupId>
21
			<artifactId>org.gvsig.raster.cache.lib.api</artifactId>
19
        <dependency>
20
            <groupId>org.gvsig</groupId>
21
            <artifactId>org.gvsig.raster.cache.lib.api</artifactId>
22 22
            <scope>compile</scope>
23
		</dependency>
24
		<dependency>
25
			<groupId>org.gvsig</groupId>
26
			<artifactId>org.gvsig.raster.lib.api</artifactId>
23
        </dependency>
24
        <dependency>
25
            <groupId>org.gvsig</groupId>
26
            <artifactId>org.gvsig.raster.lib.api</artifactId>
27 27
            <scope>compile</scope>
28
		</dependency>
28
        </dependency>
29 29
        <dependency>
30 30
            <groupId>org.gvsig</groupId>
31 31
            <artifactId>org.gvsig.raster.lib.impl</artifactId>
......
56 56
            <artifactId>org.gvsig.projection.cresques.impl</artifactId>
57 57
            <scope>runtime</scope>
58 58
        </dependency>
59
         <dependency>
59
        <dependency>
60 60
            <groupId>org.gvsig</groupId>
61 61
            <artifactId>org.gvsig.compat.api</artifactId>
62 62
            <scope>compile</scope>
......
64 64
        <dependency>
65 65
            <groupId>org.gvsig</groupId>
66 66
            <artifactId>org.gvsig.compat.se</artifactId>
67
            <scope>compile</scope>
67
            <scope>runtime</scope>
68 68
        </dependency>
69 69
        <dependency>
70 70
            <groupId>org.gvsig</groupId>
......
74 74
        <dependency>
75 75
            <groupId>org.gvsig</groupId>
76 76
            <artifactId>org.gvsig.fmap.dal.impl</artifactId>
77
            <scope>compile</scope>
77
            <scope>runtime</scope>
78 78
        </dependency>
79 79
        <dependency>
80 80
            <groupId>org.gvsig</groupId>
......
91 91
            <artifactId>org.gvsig.fmap.geometry.api</artifactId>
92 92
            <scope>compile</scope>
93 93
        </dependency>
94
        <!--
95
        <dependency>
96
            <groupId>org.gvsig</groupId>
97
            <artifactId>org.gvsig.fmap.geometry.generalpath</artifactId>
98
            <scope>runtime</scope>
99
        </dependency>
100
        <dependency>
101
            <groupId>org.gvsig</groupId>
102
            <artifactId>org.gvsig.fmap.geometry.operation</artifactId>
103
            <scope>runtime</scope>
104
        </dependency>
105
        -->
106
	</dependencies>
107 94

  
95
    </dependencies>
108 96

  
97

  
109 98
</project>
org.gvsig.raster.gdal/trunk/org.gvsig.raster.gdal/org.gvsig.raster.gdal.app/org.gvsig.raster.gdal.app.mainplugin/src/main/resources-plugin/config.xml
1 1
<?xml version="1.0" encoding="ISO-8859-1"?>
2 2
<plugin-config>
3 3
    <depends plugin-name="org.gvsig.gdal.app.mainplugin" />
4
	<depends plugin-name="org.gvsig.raster.mainplugin" />
5
	<depends plugin-name="org.gvsig.raster.tilecache.app" optional="true" />
6
	<libraries library-dir="lib"/>
7
	<resourceBundle name="text"/>
8
	<extensions>
9
		<extension class-name="org.gvsig.raster.gdal.app.GdalExtension"
10
			description=""
11
			active="true"
12
			priority="1">
13
		</extension>
14
	</extensions>
4
    <depends plugin-name="org.gvsig.raster.mainplugin" />
5
    <depends plugin-name="org.gvsig.raster.tilecache.app" optional="true" />
6
    <libraries library-dir="lib"/>
7
    <resourceBundle name="text"/>
8
    <extensions>
9
        <extension class-name="org.gvsig.raster.gdal.app.GdalExtension"
10
                           description=""
11
                           active="true"
12
                           priority="1">
13
        </extension>
14
    </extensions>
15 15
</plugin-config>
org.gvsig.raster.gdal/trunk/org.gvsig.raster.gdal/org.gvsig.raster.gdal.app/org.gvsig.raster.gdal.app.mainplugin/src/main/assembly/gvsig-plugin-package.xml
24 24

  
25 25
-->
26 26
<assembly>
27
  <id>gvsig-plugin-package</id>
28
  <formats>
29
    <format>zip</format>
30
  </formats>
31
  <baseDirectory>${project.artifactId}</baseDirectory>
32
  <includeBaseDirectory>true</includeBaseDirectory>
33
  <files>
34
    <file>
35
      <source>target/${project.artifactId}-${project.version}.jar</source>
36
      <outputDirectory>lib</outputDirectory>
37
    </file>
38
    <file>
39
      <source>target/package.info</source>
40
    </file>
41
  </files>
27
    <id>gvsig-plugin-package</id>
28
    <formats>
29
        <format>zip</format>
30
    </formats>
31
    <baseDirectory>${project.artifactId}</baseDirectory>
32
    <includeBaseDirectory>true</includeBaseDirectory>
33
    <files>
34
        <file>
35
            <source>target/${project.artifactId}-${project.version}.jar</source>
36
            <outputDirectory>lib</outputDirectory>
37
        </file>
38
        <file>
39
            <source>target/package.info</source>
40
        </file>
41
    </files>
42 42

  
43
  <fileSets>
44
    <fileSet>
45
      <directory>src/main/resources-plugin</directory>
46
      <outputDirectory>.</outputDirectory>
47
    </fileSet>
48
  </fileSets>
43
    <fileSets>
44
        <fileSet>
45
            <directory>src/main/resources-plugin</directory>
46
            <outputDirectory>.</outputDirectory>
47
        </fileSet>
48
    </fileSets>
49 49

  
50 50

  
51
  <dependencySets>
52
    <dependencySet>
53
      <useProjectArtifact>false</useProjectArtifact>
54
      <useTransitiveDependencies>false</useTransitiveDependencies>
55
      <outputDirectory>lib</outputDirectory>
56
		  <includes>
57
<!--         <include>org.gdal:gdal:jar</include> -->
58
       		 <include>org.gvsig:org.gvsig.raster.gdal.io:jar</include>
59
		  </includes>
60
    </dependencySet>
61
  </dependencySets>
51
    <dependencySets>
52
        <dependencySet>
53
            <useProjectArtifact>false</useProjectArtifact>
54
            <useTransitiveDependencies>false</useTransitiveDependencies>
55
            <outputDirectory>lib</outputDirectory>
56
            <includes>
57
                <include>org.gvsig:org.gvsig.raster.gdal.io:jar</include>
58
            </includes>
59
        </dependencySet>
60
    </dependencySets>
62 61

  
63 62
</assembly>
64 63

  
org.gvsig.raster.gdal/trunk/org.gvsig.raster.gdal/org.gvsig.raster.gdal.app/org.gvsig.raster.gdal.app.mainplugin/pom.xml
4 4
	<modelVersion>4.0.0</modelVersion>
5 5
	<artifactId>org.gvsig.raster.gdal.app.mainplugin</artifactId>
6 6
	<packaging>jar</packaging>
7
	<name>Formats: Gdal file formats support</name>
8
	<description>Gdal data provider for gvSIG: jpeg, tiff, png, gif.</description>
7
	<name>${project.artifactId}</name>
8
	<description>GDAL raster data provider for gvSIG: jpeg, tiff, png, gif.</description>
9 9
	<parent>
10 10
		<groupId>org.gvsig</groupId>
11 11
		<artifactId>org.gvsig.raster.gdal.app</artifactId>
......
23 23
			<artifactId>org.gvsig.raster.gdal.io</artifactId>
24 24
			<scope>runtime</scope>
25 25
		</dependency>
26
		<!-- <dependency> -->
27
		<!-- <groupId>org.gvsig</groupId> -->
28
		<!-- <artifactId>org.gvsig.jgdal</artifactId> -->
29
		<!-- <scope>runtime</scope> -->
30
		<!-- </dependency> -->
31 26
	</dependencies>
32 27

  
33 28
	<properties>
34 29
		<svn.tags.folder>https://devel.gvsig.org/svn/gvsig-raster/org.gvsig.raster.gdal/tags/</svn.tags.folder>
30
        	<gvsig.package.info.name>Formats: GDAL raster file formats support</gvsig.package.info.name>
35 31
		<gvsig.package.info.state>testing</gvsig.package.info.state>
36 32
		<gvsig.package.info.official>true</gvsig.package.info.official>
37 33
		<gvsig.package.info.operatingSystem>all</gvsig.package.info.operatingSystem>
......
45 41
		<gvsig.package.info.description>${project.parent.description}</gvsig.package.info.description>
46 42
		<gvsig.install.plugin>true</gvsig.install.plugin>
47 43
		<gvsig.install.plugin.package>true</gvsig.install.plugin.package>
48
		<gvsig.package.info.dependencies>required:
49
			org.gvsig.raster.tilecache.app -ge 2</gvsig.package.info.dependencies>
44
		<gvsig.package.info.dependencies>required: org.gvsig.gdal.app.mainplugin -ge 1, required: org.gvsig.raster.tilecache.app -ge 2</gvsig.package.info.dependencies>
50 45

  
51 46
	</properties>
52 47

  
org.gvsig.raster.gdal/trunk/org.gvsig.raster.gdal/pom.xml
5 5
	<packaging>pom</packaging>
6 6
	<version>2.2.15-SNAPSHOT</version>
7 7
	<name>${project.artifactId}</name>
8
	<description>Gdal data provider for gvSIG</description>
8
	<description>GDAL raster data provider for gvSIG</description>
9 9
	<inceptionYear>2011</inceptionYear>
10 10

  
11 11
	<parent>
......
17 17
	<properties>
18 18
		<!-- El plugin versions:use-latest-versions falla con scope import -->
19 19
		<!-- asi que toca usar el versions:update-properties que si que funciona -->
20
		<org.gvsig.gdal.version>1.0.2</org.gvsig.gdal.version>
20 21
		<org.gvsig.raster.version>2.2.16</org.gvsig.raster.version>
21 22
	</properties>
22 23

  
......
81 82

  
82 83
			<dependency>
83 84
				<groupId>org.gvsig</groupId>
85
				<artifactId>org.gvsig.gdal</artifactId>
86
				<version>${org.gvsig.gdal.version}</version>
87
				<type>pom</type>
88
				<scope>import</scope>
89
			</dependency>
90

  
91
                        <dependency>
92
				<groupId>org.gvsig</groupId>
84 93
				<artifactId>org.gvsig.raster.gdal.app.common</artifactId>
85 94
				<version>2.2.14-SNAPSHOT</version>
86 95
				<type>zip</type>
......
92 101
				<version>2.2.15-SNAPSHOT</version>
93 102
			</dependency>
94 103

  
95
			<dependency>
96
				<groupId>org.gdal</groupId>
97
				<artifactId>gdal</artifactId>
98
				<version>1.11.2</version>
99
			</dependency>
100

  
101 104
		</dependencies>
102 105
	</dependencyManagement>
103 106

  

Also available in: Unified diff