Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shift to new maven repositories (OSGeo) #4700

Merged
merged 14 commits into from
May 26, 2020
Merged

Shift to new maven repositories (OSGeo) #4700

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
290702c
shift to new maven repositories
jodygarnett May 20, 2020
1e74956
Setup geonetwork-cache repository
jodygarnett May 20, 2020
86cf94d
Add additional project information
jodygarnett May 20, 2020
27a25ea
revise based on feedback
jodygarnett May 20, 2020
7e74c0c
exclude mapfish transitive dependencies for web
jodygarnett May 20, 2020
31a7db6
allowing print-libs to pull in com.codahale.metrics pending feedback
jodygarnett May 20, 2020
3c4acde
revise based on feedback
jodygarnett May 20, 2020
a05d567
revise based on feedback
jodygarnett May 20, 2020
2765ea1
Additional print-lib exclusions
jodygarnett May 22, 2020
18890b5
Replace print.lib.version with use of dependency management
jodygarnett May 22, 2020
f8bcfb2
Revised based on feedback
jodygarnett May 25, 2020
92a2898
restore codahale transitive dependencies for mapfish print
jodygarnett May 25, 2020
fbf2191
list additional camptocamp developers
jodygarnett May 25, 2020
d415721
remove list of developers to seperate isse
jodygarnett May 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 75 additions & 26 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,17 @@
<artifactId>geonetwork</artifactId>
<packaging>pom</packaging>
<version>3.11.0-SNAPSHOT</version>

<name>GeoNetwork opensource</name>
<description>GeoNetwork opensource is a standards based, Free and
Open Source catalog application to manage spatially referenced
resources through the web.
</description>
<url>http://geonetwork-opensource.org</url>
<organization>
<name>Open Source Geospatial Foundation</name>
<url>https://www.osgeo.org/</url>
</organization>
<scm>
<connection>
scm:git:https://github.com/geonetwork/core-geonetwork
Expand Down Expand Up @@ -86,19 +91,20 @@
</mailingList>
</mailingLists>

<!-- TODO developer part-->
<developers>
<developer>
<name/>
<id/>
<organization/>
<organizationUrl/>
<email/>
<name>Jody Garnett</name>
<id>jodygarnett</id>
<organization>GeoCat B.V.</organization>
<organizationUrl>https://www.geocat.net</organizationUrl>
<email>[email protected]</email>
<roles>
<role/>
<role>Java Developer</role>
<role>Maven Build</role>
</roles>
<timezone/>
<timezone>America/Vancouver</timezone>
</developer>
<!-- TODO developer part-->
</developers>

<licenses>
Expand Down Expand Up @@ -645,13 +651,13 @@
<version>1.3</version> <!-- TODO check version -->
</dependency>
<!-- May be required to register connection unwrappers with
geotools
geotools
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
s <artifactId>spring-jdbc</artifactId>
jodygarnett marked this conversation as resolved.
Show resolved Hide resolved
<version>2.5.3</version>
</dependency>
-->
-->
<dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
Expand Down Expand Up @@ -680,7 +686,7 @@
<version>1.0</version>
</dependency>

<!-- Geotools and spatial search stuff -->
<!-- GeoTools and spatial search stuff -->
<dependency>
<groupId>org.geotools.xsd</groupId>
<artifactId>gt-xsd-gml3</artifactId>
Expand Down Expand Up @@ -854,18 +860,17 @@
<version>1.7.8</version>
</dependency>

<!-- Databased stuff -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.3.174</version>
</dependency>
<!-- Other stuff -->
<dependency>
<groupId>dlib</groupId> <!--FIXME Handled by local repository -->
<artifactId>dlib</artifactId>
<version>1.0</version> <!-- FIXME totally unknown -->
</dependency>
<dependency>
<groupId>org.mapfish.print</groupId>
<artifactId>print-lib</artifactId>
<version>${print-lib.version}</version>
jodygarnett marked this conversation as resolved.
Show resolved Hide resolved
</dependency>

<!-- Lib utils -->
<dependency>
Expand Down Expand Up @@ -895,6 +900,7 @@
<artifactId>metrics-log4j</artifactId>
<version>${metrics.version}</version>
</dependency>

<!-- Tests -->
<dependency>
<groupId>junit</groupId>
Expand Down Expand Up @@ -933,7 +939,12 @@
<scope>test</scope>
</dependency>

<!-- db -->
<!-- Databased stuff -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.3.174</version>
</dependency>
<dependency>
<groupId>org.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
Expand Down Expand Up @@ -961,7 +972,14 @@
<artifactId>ojdbc</artifactId>
<version>14</version>
</dependency>
-->
-->
<!-- Oracle changed policy, this is from maven central -->
<!-- Oracle Free Use Terms and Conditions (FUTC) -->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<version>19.6.0.0</version>
</dependency>
jodygarnett marked this conversation as resolved.
Show resolved Hide resolved
<dependency>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-standalone-compiler</artifactId>
Expand Down Expand Up @@ -1146,11 +1164,13 @@
<artifactId>elasticsearch</artifactId>
<version>${es.version}</version>
</dependency>-->

<!--Require Lucene 5 <dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>transport</artifactId>
<version>${es.version}</version>
</dependency>-->

<dependency>
<groupId>io.searchbox</groupId>
<artifactId>jest</artifactId>
Expand Down Expand Up @@ -1209,18 +1229,25 @@
<url>https://repo.osgeo.org/repository/release/</url>
</repository>

<repository>
<!-- managed by repo.osgeo.org k-int-cache -->
<!-- /marcxml/marcxml/* -->
<!-- /marc4j/marc4j/* -->
<!--repository>
<snapshots>
<enabled>false</enabled>
</snapshots>
<id>k-int</id>
<name>Developer k-int repository</name>
<url>http://maven.k-int.com/content/repositories/releases/</url>
</repository>
</repository-->

<!-- managed by repo.osgeo.org geonetwork-cache -->
<!-- third party jar upload -->
<!-- TODO: move this content to geonetwork-releases -->
<!--
<repository>
<snapshots>
<enabled>true</enabled>
<enabled>false</enabled>
</snapshots>
<releases>
<enabled>true</enabled>
Expand All @@ -1229,20 +1256,27 @@
<name>GeoNetwork remote repository</name>
<url>https://raw.githubusercontent.com/geonetwork/core-maven-repo/master</url>
</repository>

-->
<!-- managed by repo.osgeo.org seasar-cache -->
<!-- /net.arnx.jsonic/jsonic/* -->
<!-- seasar repo, has jsonic - used by langdetect -->
<!--
<repository>
<id>maven.seasar.org</id>
<name>The Seasar Foundation Maven2 Repository</name>
<url>http://maven.seasar.org/maven2</url>
</repository>

-->
<!-- managed by repo.osgeo.org geonetwork-releases -->
<!-- third party jar upload -->
<!-- org.mapfish.print:print-lib-2.1.6.jar -->
<!--
<repository>
<id>georchestra-mfprint</id>
<name>build-releases</name>
<url>https://packages.georchestra.org/artifactory/mapfish-print</url>
</repository>

-->
</repositories>


Expand Down Expand Up @@ -1320,13 +1354,28 @@
</profile>
</profiles>

<distributionManagement>
<repository>
<id>osgeo</id>
<name>OSGeo GeoNetwork Release Repository</name>
<url>https://repo.osgeo.org/repository/geonetwork-releases/</url>
</repository>
<snapshotRepository>
<id> osgeo </id>
jodygarnett marked this conversation as resolved.
Show resolved Hide resolved
<name>OSGeo GeoNetwork Snapshot Repository</name>
<url>https://repo.osgeo.org/repository/geonetwork-snapshots/</url>
</snapshotRepository>
</distributionManagement>

<!--
<distributionManagement>
<snapshotRepository>
<id>scp-repository.geonetwork-opensource.org</id>
<name>GeoNetwork opensource repositories</name>
<url>scpexe://TO DEFINED</url>
</snapshotRepository>
</distributionManagement>
-->

<properties>
<db.properties>WEB-INF/config-db/jdbc.properties</db.properties>
Expand Down
49 changes: 48 additions & 1 deletion web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,54 @@
<dependency>
<groupId>org.mapfish.print</groupId>
<artifactId>print-lib</artifactId>
<version>${print-lib.version}</version>
<!-- why no exclusions like in core/pom.xml? -->
jodygarnett marked this conversation as resolved.
Show resolved Hide resolved
<!--
<exclusions>
<exclusion>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-log4j</artifactId>
</exclusion>
<exclusion>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-servlet</artifactId>
</exclusion>
<exclusion>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-servlets</artifactId>
</exclusion>
<exclusion>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-httpclient</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
<exclusion>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-transcoder</artifactId>
</exclusion>
-->
</dependency>

<!-- ====================== -->
Expand Down