Skip to content

Commit 6ba0f59

Browse files
stustisonshaundmorris
stustison
authored and
shaundmorris
committed
DDF-3871 updated tika, geotools, pico, vecmath, and jts (#20)
1 parent 64c5e92 commit 6ba0f59

File tree

9 files changed

+513
-239
lines changed

9 files changed

+513
-239
lines changed

‎geotools-suite-8.4/pom.xml renamed to ‎geotools-suite/pom.xml

+211-53
Large diffs are not rendered by default.

‎gt-opengis-8.4/pom.xml renamed to ‎gt-opengis/pom.xml

+49-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717

1818
<groupId>org.codice.thirdparty</groupId>
1919
<artifactId>gt-opengis</artifactId>
20-
<version>8.4_1</version>
20+
<version>19.1_1</version>
2121
<name>Codice :: Thirdparty :: Geotools OpenGIS API</name>
2222

2323
<packaging>bundle</packaging>
2424

2525
<properties>
26-
<bundle.version>8.4</bundle.version>
26+
<bundle.version>19.1</bundle.version>
2727
<jsr.275.version>1.0-beta-2</jsr.275.version>
2828
</properties>
2929

@@ -48,7 +48,7 @@
4848
<plugin>
4949
<groupId>org.apache.felix</groupId>
5050
<artifactId>maven-bundle-plugin</artifactId>
51-
<version>2.3.4</version>
51+
<version>3.5.0</version>
5252
<extensions>true</extensions>
5353
<configuration>
5454
<instructions>
@@ -63,6 +63,52 @@
6363
</Embed-Dependency>
6464

6565
<Embed-Transitive>true</Embed-Transitive>
66+
<Private-Package>
67+
<!-- gt-opengis -->
68+
org.opengis.annotation;version="${bundle.version}",
69+
org.opengis.coverage;version="${bundle.version}",
70+
org.opengis.coverage.grid;version="${bundle.version}",
71+
org.opengis.coverage.processing;version="${bundle.version}",
72+
org.opengis.feature;version="${bundle.version}",
73+
org.opengis.feature.simple;version="${bundle.version}",
74+
org.opengis.feature.type;version="${bundle.version}",
75+
org.opengis.filter;version="${bundle.version}",
76+
org.opengis.filter.capability;version="${bundle.version}",
77+
org.opengis.filter.expression;version="${bundle.version}",
78+
org.opengis.filter.identity;version="${bundle.version}",
79+
org.opengis.filter.sort;version="${bundle.version}",
80+
org.opengis.filter.spatial;version="${bundle.version}",
81+
org.opengis.filter.temporal;version="${bundle.version}",
82+
org.opengis.geometry;version="${bundle.version}",
83+
org.opengis.geometry.aggregate;version="${bundle.version}",
84+
org.opengis.geometry.complex;version="${bundle.version}",
85+
org.opengis.geometry.coordinate;version="${bundle.version}",
86+
org.opengis.geometry.primitive;version="${bundle.version}",
87+
org.opengis.metadata;version="${bundle.version}",
88+
org.opengis.metadata.citation;version="${bundle.version}",
89+
org.opengis.metadata.constraint;version="${bundle.version}",
90+
org.opengis.metadata.content;version="${bundle.version}",
91+
org.opengis.metadata.distribution;version="${bundle.version}",
92+
org.opengis.metadata.extent;version="${bundle.version}",
93+
org.opengis.metadata.identification;version="${bundle.version}",
94+
org.opengis.metadata.lineage;version="${bundle.version}",
95+
org.opengis.metadata.maintenance;version="${bundle.version}",
96+
org.opengis.metadata.quality;version="${bundle.version}",
97+
org.opengis.metadata.spatial;version="${bundle.version}",
98+
org.opengis.parameter;version="${bundle.version}",
99+
org.opengis.referencing;version="${bundle.version}",
100+
org.opengis.referencing.crs;version="${bundle.version}",
101+
org.opengis.referencing.cs;version="${bundle.version}",
102+
org.opengis.referencing.datum;version="${bundle.version}",
103+
org.opengis.referencing.operation;version="${bundle.version}",
104+
org.opengis.style;version="${bundle.version}",
105+
org.opengis.temporal;version="${bundle.version}",
106+
org.opengis.util;version="${bundle.version}",
107+
108+
<!-- jsr-275 -->
109+
javax.measure.*;version="${jsr.275.version}",
110+
111+
</Private-Package>
66112
<Export-Package>
67113
<!-- gt-opengis -->
68114
org.opengis.annotation;version="${bundle.version}",

‎jts-1.12/pom.xml

-102
This file was deleted.

‎jts/pom.xml

+114
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright (c) Codice Foundation
5+
*
6+
* This is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either
7+
* version 3 of the License, or any later version.
8+
*
9+
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
10+
* See the GNU Lesser General Public License for more details. A copy of the GNU Lesser General Public License is distributed along with this program and can be found at
11+
* <http://www.gnu.org/licenses/lgpl.html>.
12+
*
13+
**/
14+
-->
15+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<modelVersion>4.0.0</modelVersion>
18+
19+
<groupId>org.codice.thirdparty</groupId>
20+
<artifactId>jts</artifactId>
21+
<version>1.14.0_1</version>
22+
<name>Codice :: Thirdparty :: JTS</name>
23+
<packaging>bundle</packaging>
24+
25+
<dependencies>
26+
<dependency>
27+
<groupId>com.vividsolutions</groupId>
28+
<artifactId>jts-core</artifactId>
29+
<version>1.14.0</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>com.vividsolutions</groupId>
33+
<artifactId>jts-example</artifactId>
34+
<version>1.14.0</version>
35+
</dependency>
36+
<dependency>
37+
<groupId>com.vividsolutions</groupId>
38+
<artifactId>jts-io</artifactId>
39+
<version>1.14.0</version>
40+
</dependency>
41+
</dependencies>
42+
<build>
43+
<plugins>
44+
<plugin>
45+
<groupId>org.apache.felix</groupId>
46+
<artifactId>maven-bundle-plugin</artifactId>
47+
<version>2.3.4</version>
48+
<extensions>true</extensions>
49+
<configuration>
50+
<instructions>
51+
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
52+
<Bundle-Name>${project.name}</Bundle-Name>
53+
<Export-Package>
54+
com.vividsolutions.jts;version="1.14.0",
55+
com.vividsolutions.jts.algorithm;version="1.14.0",
56+
com.vividsolutions.jts.algorithm.distance;version="1.14.0",
57+
com.vividsolutions.jts.algorithm.locate;version="1.14.0",
58+
com.vividsolutions.jts.geom;version="1.14.0",
59+
com.vividsolutions.jts.geom.impl;version="1.14.0",
60+
com.vividsolutions.jts.geom.prep;version="1.14.0",
61+
com.vividsolutions.jts.geom.util;version="1.14.0",
62+
com.vividsolutions.jts.geomgraph;version="1.14.0",
63+
com.vividsolutions.jts.geomgraph.index;version="1.14.0",
64+
com.vividsolutions.jts.index;version="1.14.0",
65+
com.vividsolutions.jts.index.bintree;version="1.14.0",
66+
com.vividsolutions.jts.index.chain;version="1.14.0",
67+
com.vividsolutions.jts.index.intervalrtree;version="1.14.0",
68+
com.vividsolutions.jts.index.quadtree;version="1.14.0",
69+
com.vividsolutions.jts.index.strtree;version="1.14.0",
70+
com.vividsolutions.jts.index.sweepline;version="1.14.0",
71+
com.vividsolutions.jts.io;version="1.14.0",
72+
com.vividsolutions.jts.io.geojson;version="1.14.0",
73+
com.vividsolutions.jts.io.kml;version="1.14.0",
74+
com.vividsolutions.jts.io.gml2;version="1.14.0",
75+
com.vividsolutions.jts.linearref;version="1.14.0",
76+
com.vividsolutions.jts.math;version="1.14.0",
77+
com.vividsolutions.jts.noding;version="1.14.0",
78+
com.vividsolutions.jts.noding.snapround;version="1.14.0",
79+
com.vividsolutions.jts.operation;version="1.14.0",
80+
com.vividsolutions.jts.operation.buffer;version="1.14.0",
81+
com.vividsolutions.jts.operation.buffer.validate;version="1.14.0",
82+
com.vividsolutions.jts.operation.distance;version="1.14.0",
83+
com.vividsolutions.jts.operation.linemerge;version="1.14.0",
84+
com.vividsolutions.jts.operation.overlay;version="1.14.0",
85+
com.vividsolutions.jts.operation.overlay.snap;version="1.14.0",
86+
com.vividsolutions.jts.operation.overlay.validate;version="1.14.0",
87+
com.vividsolutions.jts.operation.polygonize;version="1.14.0",
88+
com.vividsolutions.jts.operation.predicate;version="1.14.0",
89+
com.vividsolutions.jts.operation.relate;version="1.14.0",
90+
com.vividsolutions.jts.operation.union;version="1.14.0",
91+
com.vividsolutions.jts.operation.valid;version="1.14.0",
92+
com.vividsolutions.jts.planargraph;version="1.14.0",
93+
com.vividsolutions.jts.planargraph.algorithm;version="1.14.0",
94+
com.vividsolutions.jts.precision;version="1.14.0",
95+
com.vividsolutions.jts.simplify;version="1.14.0",
96+
com.vividsolutions.jts.util;version="1.14.0"
97+
</Export-Package>
98+
</instructions>
99+
</configuration>
100+
</plugin>
101+
</plugins>
102+
</build>
103+
104+
<distributionManagement>
105+
<snapshotRepository>
106+
<id>snapshots</id>
107+
<url>${snapshots.repository.url}</url>
108+
</snapshotRepository>
109+
<repository>
110+
<id>releases</id>
111+
<url>${releases.repository.url}</url>
112+
</repository>
113+
</distributionManagement>
114+
</project>

‎ogc-filter-v_1_1_0-schema/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<modelVersion>4.0.0</modelVersion>
1919
<groupId>org.codice.thirdparty</groupId>
2020
<artifactId>ogc-filter-v_1_1_0-schema</artifactId>
21-
<version>1.1.0_4</version>
21+
<version>1.1.0_5</version>
2222
<name>Codice :: Thirdparty :: OGC Filter Schema 1.1.0 Bindings</name>
2323
<description>Provides JAXB 2.x bindings for OGC Filter Schema (Version 1.1.0).</description>
2424

@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>org.jvnet.jaxb2_commons</groupId>
3232
<artifactId>jaxb2-basics-runtime</artifactId>
33-
<version>0.6.0</version>
33+
<version>0.9.4</version>
3434
<scope>compile</scope>
3535
</dependency>
3636
<dependency>
@@ -100,7 +100,7 @@
100100
<plugin>
101101
<groupId>org.jvnet.jaxb2_commons</groupId>
102102
<artifactId>jaxb2-basics</artifactId>
103-
<version>0.6.0</version>
103+
<version>0.9.4</version>
104104
</plugin>
105105
</plugins>
106106
</configuration>

‎picocontainer-1.2/pom.xml renamed to ‎picocontainer/pom.xml

+38-4
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818

1919
<groupId>org.codice.thirdparty</groupId>
2020
<artifactId>picocontainer</artifactId>
21-
<version>1.2_1</version>
21+
<version>1.3_1</version>
2222
<name>Codice :: Thirdparty :: Picocontainer</name>
2323
<packaging>bundle</packaging>
2424

2525
<dependencies>
2626
<dependency>
2727
<groupId>org.picocontainer</groupId>
2828
<artifactId>picocontainer</artifactId>
29-
<version>1.2</version>
29+
<version>1.3</version>
3030
</dependency>
3131
</dependencies>
3232

@@ -35,16 +35,50 @@
3535
<plugin>
3636
<groupId>org.apache.felix</groupId>
3737
<artifactId>maven-bundle-plugin</artifactId>
38-
<version>2.3.4</version>
38+
<version>3.5.0</version>
3939
<extensions>true</extensions>
4040
<configuration>
4141
<instructions>
4242
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
4343
<Bundle-Name>${project.name}</Bundle-Name>
44+
<Embed-Dependency>javax.inject</Embed-Dependency>
4445
<Import-Package>*</Import-Package>
4546
<Export-Package>
46-
org.picocontainer;version=1.2
47+
org.picocontainer;version=1.3,
48+
org.picocontainer.adapters;version=1.3,
49+
org.picocontainer.annotations;version=1.3,
50+
org.picocontainer.behaviors;version=1.3,
51+
org.picocontainer.classname;version=1.3,
52+
org.picocontainer.composers;version=1.3,
53+
org.picocontainer.containers;version=1.3,
54+
org.picocontainer.converters;version=1.3,
55+
org.picocontainer.injectors;version=1.3,
56+
org.picocontainer.lifecycle;version=1.3,
57+
org.picocontainer.monitors;version=1.3,
58+
org.picocontainer.parameters;version=1.3,
59+
org.picocontainer.paranamer;version=1.3,
60+
org.picocontainer.references;version=1.3,
61+
org.picocontainer.security;version=1.3,
62+
org.picocontainer.visitors;version=1.3
4763
</Export-Package>
64+
<Private-Package>
65+
org.picocontainer;version=1.3,
66+
org.picocontainer.adapters;version=1.3,
67+
org.picocontainer.annotations;version=1.3,
68+
org.picocontainer.behaviors;version=1.3,
69+
org.picocontainer.classname;version=1.3,
70+
org.picocontainer.composers;version=1.3,
71+
org.picocontainer.containers;version=1.3,
72+
org.picocontainer.converters;version=1.3,
73+
org.picocontainer.injectors;version=1.3,
74+
org.picocontainer.lifecycle;version=1.3,
75+
org.picocontainer.monitors;version=1.3,
76+
org.picocontainer.parameters;version=1.3,
77+
org.picocontainer.paranamer;version=1.3,
78+
org.picocontainer.references;version=1.3,
79+
org.picocontainer.security;version=1.3,
80+
org.picocontainer.visitors;version=1.3
81+
</Private-Package>
4882
</instructions>
4983
</configuration>
5084
</plugin>

0 commit comments

Comments
 (0)