Shift to new maven repositories (OSGeo) (#4700)

* shift to new maven repositories Signed-off-by: Jody Garnett <[email protected]> * Setup geonetwork-cache repository Signed-off-by: Jody Garnett <[email protected]> * Add additional project information Signed-off-by: Jody Garnett <[email protected]> * revise based on feedback Signed-off-by: Jody Garnett <[email protected]> * exclude mapfish transitive dependencies for web Signed-off-by: Jody Garnett <[email protected]> * allowing print-libs to pull in com.codahale.metrics pending feedback Signed-off-by: Jody Garnett <[email protected]> * revise based on feedback Signed-off-by: Jody Garnett <[email protected]> * revise based on feedback Signed-off-by: Jody Garnett <[email protected]> * Additional print-lib exclusions * Replace print.lib.version with use of dependency management * Revised based on feedback use of dependency management to handle mapfish print version Signed-off-by: Jody Garnett <[email protected]> * restore codahale transitive dependencies for mapfish print Signed-off-by: Jody Garnett <[email protected]> * list additional camptocamp developers Details reverse engineered from github and public emails, please review. Signed-off-by: Jody Garnett <[email protected]> * remove list of developers to seperate isse Signed-off-by: Jody Garnett <[email protected]>
geonetwork · May 26, 2020 · 95fb0b5 · 95fb0b5
1 parent 5528972
commit 95fb0b5
Show file tree

Hide file tree

Showing 3 changed files with 113 additions and 35 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -356,7 +356,6 @@
     <dependency>
       <groupId>org.mapfish.print</groupId>
       <artifactId>print-lib</artifactId>
-      <version>${print-lib.version}</version>
       <exclusions>
         <exclusion>
           <groupId>commons-httpclient</groupId>

diff --git a/pom.xml b/pom.xml
@@ -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
@@ -86,21 +91,6 @@
     </mailingList>
   </mailingLists>
 
-  <!-- TODO developer part-->
-  <developers>
-    <developer>
-      <name/>
-      <id/>
-      <organization/>
-      <organizationUrl/>
-      <email/>
-      <roles>
-        <role/>
-      </roles>
-      <timezone/>
-    </developer>
-  </developers>
-
   <licenses>
     <license>
       <name>General Public License (GPL)</name>
@@ -645,13 +635,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>
         <version>2.5.3</version>
       </dependency>
-			-->
+      -->
       <dependency>
         <groupId>org.eclipse.core</groupId>
         <artifactId>org.eclipse.core.runtime</artifactId>
@@ -680,7 +670,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>
@@ -860,18 +850,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>2.1.6</version>
+      </dependency>
 
       <!-- Lib utils -->
       <dependency>
@@ -901,6 +890,7 @@
         <artifactId>metrics-log4j</artifactId>
         <version>${metrics.version}</version>
       </dependency>
+
       <!-- Tests -->
       <dependency>
         <groupId>junit</groupId>
@@ -939,7 +929,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>
@@ -967,7 +962,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>
       <dependency>
         <groupId>org.codehaus.izpack</groupId>
         <artifactId>izpack-standalone-compiler</artifactId>
@@ -1152,11 +1154,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>
@@ -1215,18 +1219,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>
@@ -1235,20 +1246,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>
 
 
@@ -1326,13 +1344,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>
+      <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>
@@ -1458,7 +1491,6 @@
     <node.version>v8.11.1</node.version>
     <npm.version>5.8.0</npm.version>
     <xmlunit.version>2.1.1</xmlunit.version>
-    <print-lib.version>2.1.6</print-lib.version>
     <jackson.version>2.10.3</jackson.version>
     <flying-saucer>9.0.7</flying-saucer>
     <camel.version>2.14.4</camel.version>

diff --git a/web/pom.xml b/web/pom.xml
@@ -317,7 +317,54 @@
     <dependency>
       <groupId>org.mapfish.print</groupId>
       <artifactId>print-lib</artifactId>
-      <version>${print-lib.version}</version>
+      <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>
+      </exclusions>
     </dependency>
 
     <!-- ====================== -->