From 8aa7068f96e432f255e4fb7d972329c8de02a98a Mon Sep 17 00:00:00 2001
From: Alexandr_Romashko <alexandr_romashko@epam.com>
Date: Mon, 29 Jul 2019 16:09:47 +0300
Subject: [PATCH] fixing inactive url repos and org's in dependencies

---
 ivy.xml         |  16 ++++----
 ivysettings.xml |   2 +-
 pom.xml         | 104 ++++++++++++++++++++++++++++++++++++++++++------
 3 files changed, 101 insertions(+), 21 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index 6eedca0912..09f963ae4e 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -18,7 +18,7 @@
     <info organisation="${ivy.artifact.group}" module="${ivy.artifact.id}" revision="${project.revision}">
         <license name="EPL" url="http://www.eclipse.org/legal/epl-v10.html"/>
         <ivyauthor name="Julian Hyde" />
-        <repository name="pentaho-repository" url="http://repo.pentaho.org/artifactory"/>
+        <repository name="pentaho-repository" url="https://nexus.pentaho.org/content/groups/omni"/>
         <description homepage="http://mondrian.pentaho.com">
             Mondrian is an OLAP (online analytical processing) engine written
             in Java. It reads from JDBC data sources, aggregates data in a
@@ -52,9 +52,9 @@
         <dependency org="dom4j" name="dom4j" rev="1.6.1"/>
         <dependency org="javax.validation" name="validation-api" rev="1.0.0.GA"/>
         <dependency org="eigenbase" name="eigenbase-xom" rev="1.3.2"/>
-        <dependency org="eigenbase" name="eigenbase-properties" rev="1.1.3"/>
+        <dependency org="eigenbase" name="eigenbase-properties" rev="1.1.4"/>
         <dependency org="eigenbase" name="eigenbase-resgen" rev="1.3.2"/>
-        <dependency org="sun" name="jlfgr" rev="1.0"/>
+        <dependency org="com.sun" name="jlfgr" rev="1.0"/>
         <dependency org="com.sun" name="rt-jdk1.5" rev="1.5.0_22" conf="codegen->default" />
         <dependency org="net.java.openjdk" name="ctsym-java6" rev="1.6.0_24" conf="codegen->default" />
         <dependency org="javax.servlet" name="jsp-api" rev="2.0"/>
@@ -90,7 +90,7 @@
         <dependency org="xalan" name="xalan" rev="2.6.0"/>
         <dependency org="xerces" name="xercesImpl" rev="2.9.1"/>
 
-        <dependency org="biz.aQute" name="bnd" rev="2.3.0" conf="codegen->default">
+        <dependency org="biz.aQute.bnd" name="bnd" rev="2.3.0" conf="codegen->default">
           <artifact name="bnd" ext="jar"/>
         </dependency>
 
@@ -99,19 +99,19 @@
         <dependency org="backport-util-concurrent"
                 name="backport-util-concurrent" rev="3.1"
                 conf="default-jdk1.4->default"/>
-        <dependency org="asm" name="asm" rev="3.1"
+        <dependency org="asm" name="asm" rev="3.3.1"
                 conf="default-jdk1.4->default"/>
         <dependency org="asm" name="asm-commons" rev="3.1"
                 conf="default-jdk1.4->default"/>
         <dependency org="asm" name="asm-util" rev="3.1"
                 conf="default-jdk1.4->default"/>
-        <dependency org="retroweaver" name="retroweaver" rev="2.0.7"
+        <dependency org="net.sourceforge.retroweaver" name="retroweaver" rev="2.0.7"
                 conf="default-jdk1.4->default"/>
-        <dependency org="retroweaver" name="retroweaver-rt" rev="2.0.7"
+        <dependency org="net.sourceforge.retroweaver" name="retroweaver-rt" rev="2.0.7"
                 conf="default-jdk1.4->default"/>
 
         <!-- Distribution Jars -->
-        <dependency org="hsqldb" name="hsqldb" rev="1.8.0.10" conf="dist->default"/>
+        <dependency org="org.hsqldb" name="hsqldb" rev="1.8.0.10" conf="dist->default"/>
 
         <!-- Test Jars -->
         <dependency org="junit" name="junit" rev="3.8.1" conf="test->default"/>
diff --git a/ivysettings.xml b/ivysettings.xml
index 77b4a76447..204a18c18d 100644
--- a/ivysettings.xml
+++ b/ivysettings.xml
@@ -7,7 +7,7 @@
     override="false" />
     
   <!-- Repository for Pentaho-hosted artifacts -->  
-  <property name="pentaho.resolve.repo" value="http://ivy-nexus.pentaho.org/content/groups/omni" override="false" />
+  <property name="pentaho.resolve.repo" value="https://nexus.pentaho.org/content/groups/omni" override="false" />
   <!-- Repository for External-hosted artifacts (Optional. Defaults to Pentaho-hosted.) -->
   <property name="public.resolve.repo" value="${pentaho.resolve.repo}" override="false" />
 
diff --git a/pom.xml b/pom.xml
index 2aebbc12e3..b29f125b35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,17 +45,24 @@
     <url>http://github.com/pentaho/mondrian/tree/master</url>
   </scm>
   <issueManagement />
+
   <distributionManagement>
     <repository>
-      <id>pentaho</id>
+      <id>central</id>
       <name>Pentaho repository</name>
-      <url>http://repository.pentaho.org/artifactory/repo</url>
+      <url>https://nexus.pentaho.org/content/groups/omni</url>
     </repository>
   </distributionManagement>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <dependencies>
+    <dependency>
+    <groupId>com.sun</groupId>
+    <artifactId>jlfgr</artifactId>
+    <version>1.0</version>
+</dependency>
+
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
@@ -114,7 +121,7 @@
     <dependency>
       <groupId>eigenbase</groupId>
       <artifactId>eigenbase-xom</artifactId>
-      <version>1.3.1</version>
+      <version>1.3.2</version>
     </dependency>
     <dependency>
       <groupId>eigenbase</groupId>
@@ -122,10 +129,10 @@
       <version>1.1.2</version>
     </dependency>
     <dependency>
-      <groupId>eigenbase</groupId>
-      <artifactId>eigenbase-resgen</artifactId>
-      <version>1.3.1</version>
-    </dependency>
+  <groupId>eigenbase</groupId>
+  <artifactId>eigenbase-resgen</artifactId>
+  <version>1.3.2</version>
+</dependency>
     <dependency>
       <groupId>org.olap4j</groupId>
       <artifactId>olap4j</artifactId>
@@ -184,6 +191,44 @@
       <version>3.8.1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+    <groupId>asm</groupId>
+    <artifactId>asm-commons</artifactId>
+    <version>3.1</version>
+</dependency>
+    <dependency>
+    <groupId>org.hsqldb</groupId>
+    <artifactId>hsqldb</artifactId>
+    <version>1.8.0.10</version>
+    <scope>test</scope>
+</dependency>
+
+<dependency>
+    <groupId>asm</groupId>
+    <artifactId>asm-util</artifactId>
+    <version>3.1</version>
+    <scope>test</scope>
+</dependency>
+      <dependency>
+    <groupId>net.sourceforge.retroweaver</groupId>
+    <artifactId>retroweaver</artifactId>
+    <version>2.0.7</version>
+</dependency>
+<dependency>
+    <groupId>net.sourceforge.retroweaver</groupId>
+    <artifactId>retroweaver-rt</artifactId>
+    <version>2.0.7</version>
+</dependency>
+<dependency>
+   <groupId>pentaho</groupId>
+   <artifactId>mondrian-data-foodmart</artifactId>
+   <version>1.0.0</version>
+</dependency>
+<dependency>
+   <groupId>pentaho</groupId>
+   <artifactId>mondrian-data-foodmart-json</artifactId>
+   <version>0.1</version>
+</dependency>
     <dependency>
       <groupId>xmlunit</groupId>
       <artifactId>xmlunit</artifactId>
@@ -203,6 +248,20 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>central</id>
+      <name>Maven Plugin Repository</name>
+      <url>https://nexus.pentaho.org/content/groups/omni</url>
+      <layout>default</layout>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+    </pluginRepository>
+</pluginRepositories>
   <repositories>
     <repository>
       <releases>
@@ -210,9 +269,30 @@
         <updatePolicy>always</updatePolicy>
         <checksumPolicy>warn</checksumPolicy>
       </releases>
-      <id>pentaho</id>
+      <id>Pentaho2</id>
+      <name>Pentaho</name>
+      <url>http://maven.geotoolkit.org</url>
+    </repository>
+      <repository>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+        <checksumPolicy>warn</checksumPolicy>
+      </releases>
+      <id>conjars</id>
+      <name>Conjars</name>
+      <url>https://conjars.org/repo/</url>
+    </repository>
+
+    <repository>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+        <checksumPolicy>warn</checksumPolicy>
+      </releases>
+      <id>central</id>
       <name>Pentaho</name>
-      <url>https://public.nexus.pentaho.org/content/groups/omni/</url>
+      <url>https://nexus.pentaho.org/content/groups/omni</url>
     </repository>
   </repositories>
   <build>
@@ -311,8 +391,8 @@
           </execution>
         </executions>
         <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>1.6</source>
+          <target>1.6</target>
           <excludes>
             <exclude>**/FactoryJdbc3Impl.java</exclude>
             <exclude>**/FactoryJdbc4Impl.java</exclude>
@@ -348,7 +428,7 @@
             <artifactId>tools</artifactId>
             <version>1.5.0</version>
             <scope>system</scope>
-            <systemPath>${java.home}/../lib/tools.jar</systemPath>
+            <systemPath>${java.home}\lib\tools.jar</systemPath>
           </dependency>
         </dependencies>
       </plugin>