GORA-714: resolves FTBFS with Conjars.org repository (#290)

* GORA-714 Remove conjars.org repository * GORA-714 Exclude org.pentaho dependencies from hive-service and hive-exec Taken from Apache Hudi project here: apache/hudi#3034 * GORA-714 Jenkins: Remove StabilityTestDataPublisher test-stability's Jenkins plugin is not installed anymore on ci-builds.apache.org See: https://cwiki.apache.org/confluence/display/INFRA/ci-builds.apache.org * GORA-714 Define maven-restlet in modules Avoid definition of a global repository in root Gora pom.xml => Define "maven-restlet" repository in gora-solr/pom.xml and gora-neo4J/pom.xml It's used for transitive org.restlet.jee artifacts
apache · Aug 16, 2023 · 0e8f804 · 0e8f804
1 parent 283fa0a
commit 0e8f804
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 48 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -89,7 +89,7 @@ pipeline {
 
             post {
                 always {
-                    junit testResults: '**/target/surefire-reports/TEST-*.xml', testDataPublishers: [[$class: 'StabilityTestDataPublisher']]
+                    junit testResults: '**/target/surefire-reports/TEST-*.xml'
                 }
             }
         }

diff --git a/gora-couchdb/pom.xml b/gora-couchdb/pom.xml
@@ -91,13 +91,6 @@
     </plugins>
   </build>
 
-  <repositories>
-    <repository>
-      <id>clojars.org</id>
-      <url>https://clojars.org/repo</url>
-    </repository>
-  </repositories>
-
   <dependencies>
     <!-- Gora Internal Dependencies -->
     <dependency>

diff --git a/gora-neo4j/pom.xml b/gora-neo4j/pom.xml
@@ -90,11 +90,13 @@
       </plugin>
     </plugins>
   </build>
+
   <repositories>
+    <!-- Used for transitive org.restlet.jee artifacts -->
     <repository>
       <id>maven-restlet</id>
       <name>Public online Restlet repository</name>
-      <url>https://maven.restlet.org</url>
+      <url>https://maven.restlet.talend.com/</url>
     </repository>
   </repositories>
 

diff --git a/gora-solr/pom.xml b/gora-solr/pom.xml
@@ -103,6 +103,15 @@
     </plugins>
   </build>
 
+  <repositories>
+    <!-- Used for transitive org.restlet.jee artifacts -->
+    <repository>
+      <id>maven-restlet</id>
+      <name>Public online Restlet repository</name>
+      <url>https://maven.restlet.talend.com/</url>
+    </repository>
+  </repositories>
+
   <dependencies>
     <!-- Gora Internal Dependencies -->
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -358,45 +358,6 @@
     <url>https://builds.apache.org/job/Gora-trunk/</url>
   </ciManagement>
 
-  <!--distributionManagement>
-    <repository>
-      <id>apache.releases.https</id>
-      <name>Apache Release Distribution Repository</name>
-      <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
-    </repository>
-    <snapshotRepository>
-      <id>apache.snapshots.https</id>
-      <name>Apache Development Snapshot Repository</name>
-      <url>https://repository.apache.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-  </distributionManagement>
-
-  <repositories>
-    <repository>
-      <id>apache.snapshots</id>
-      <url>http://repository.apache.org/snapshots/</url>
-      <name>Apache Snapshot Repo</name>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories-->
-
-  <repositories>
-    <repository>
-      <id>conjars</id>
-      <url>https://conjars.org/repo</url>
-    </repository>
-    <repository>
-      <id>maven-restlet</id>
-      <name>Public online Restlet repository</name>
-      <url>https://maven.restlet.talend.com/</url>
-    </repository>
-  </repositories>
-
   <build>
     <defaultGoal>install</defaultGoal>
     <directory>target</directory>
@@ -1948,6 +1909,10 @@
             <groupId>jdk.tools</groupId>
             <artifactId>jdk.tools</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.pentaho</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
 
@@ -1960,6 +1925,10 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.pentaho</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>