Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/OSBI/saiku
Browse files Browse the repository at this point in the history
  • Loading branch information
@brunogamacatao
brunogamacatao committed Apr 24, 2017
2 parents b1ec2d7 + d6bd098 commit e0afc29
Show file tree
Hide file tree
Showing 27 changed files with 868 additions and 865 deletions.
23 changes: 16 additions & 7 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@
<groupId>org.saikuanalytics</groupId>
<artifactId>saiku</artifactId>
<packaging>pom</packaging>
<<<<<<< HEAD
<version>3.14-SNAPSHOT</version>
=======
<version>3.8.8</version>
>>>>>>> parent of 4d35073... SE-450: #comment Added Hazelcast Client dependency and created a new session service called HazelcastSessionService
<name>Saiku Module Project</name>
<scm>
<developerConnection>
Expand Down Expand Up @@ -538,6 +542,16 @@
<artifactId>batik-js</artifactId>
<version>1.7</version>
</dependency>
<dependency>
<groupId>batik</groupId>
<artifactId>batik-transcoder</artifactId>
<version>1.7</version>
</dependency>
<dependency>
<groupId>batik</groupId>
<artifactId>batik-ext</artifactId>
<version>1.7</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
Expand Down Expand Up @@ -665,11 +679,6 @@
<artifactId>batik-svg-dom</artifactId>
<version>1.7</version>
</dependency>
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-ext</artifactId>
<version>1.7</version>
</dependency>
<dependency>
<groupId>iText</groupId>
<artifactId>iText</artifactId>
Expand All @@ -694,7 +703,7 @@
<dependency>
<groupId>pentaho</groupId>
<artifactId>mondrian</artifactId>
<version>4.3.0.1.1-SPARK</version>
<version>4.3.0.1.2-SPARK</version>
</dependency>
<!-- Spring modules -->
<dependency>
Expand Down Expand Up @@ -998,7 +1007,7 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox-app</artifactId>
<version>2.0.0</version>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>pentaho</groupId>
Expand Down
8 changes: 8 additions & 0 deletions saiku-bi-platform-plugin-p5/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,20 @@
<parent>
<artifactId>saiku</artifactId>
<groupId>org.saikuanalytics</groupId>
<<<<<<< HEAD
<version>3.14-SNAPSHOT</version>
=======
<version>3.8.8</version>
>>>>>>> parent of 4d35073... SE-450: #comment Added Hazelcast Client dependency and created a new session service called HazelcastSessionService
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>saiku-bi-platform-plugin-p5</artifactId>
<packaging>jar</packaging>
<<<<<<< HEAD
<version>3.14-SNAPSHOT</version>
=======
<version>3.8.8</version>
>>>>>>> parent of 4d35073... SE-450: #comment Added Hazelcast Client dependency and created a new session service called HazelcastSessionService
<name>saiku biserver plugin</name>

<build>
Expand Down
8 changes: 8 additions & 0 deletions saiku-bi-platform-plugin-p6/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,20 @@
<parent>
<artifactId>saiku</artifactId>
<groupId>org.saikuanalytics</groupId>
<<<<<<< HEAD
<version>3.14-SNAPSHOT</version>
=======
<version>3.8.8</version>
>>>>>>> parent of 4d35073... SE-450: #comment Added Hazelcast Client dependency and created a new session service called HazelcastSessionService
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>saiku-bi-platform-plugin-p6</artifactId>
<packaging>jar</packaging>
<<<<<<< HEAD
<version>3.14-SNAPSHOT</version>
=======
<version>3.8.8</version>
>>>>>>> parent of 4d35073... SE-450: #comment Added Hazelcast Client dependency and created a new session service called HazelcastSessionService
<name>saiku biserver plugin</name>

<build>
Expand Down
13 changes: 11 additions & 2 deletions saiku-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,23 @@
<parent>
<artifactId>saiku</artifactId>
<groupId>org.saikuanalytics</groupId>
<<<<<<< HEAD
<version>3.14-SNAPSHOT</version>
=======
<version>3.8.8</version>
>>>>>>> parent of 4d35073... SE-450: #comment Added Hazelcast Client dependency and created a new session service called HazelcastSessionService
</parent>

<modelVersion>4.0.0</modelVersion>
<artifactId>saiku-core</artifactId>
<packaging>pom</packaging>
<name>saiku - core libraries</name>
<<<<<<< HEAD
<version>3.14-SNAPSHOT</version>
=======
<version>3.8.8</version>

>>>>>>> parent of 4d35073... SE-450: #comment Added Hazelcast Client dependency and created a new session service called HazelcastSessionService

<modules>
<module>saiku-olap-util</module>
Expand All @@ -36,7 +45,7 @@
</execution>
</executions>
</plugin>
<!-- <plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version>
<configuration>
Expand All @@ -55,7 +64,7 @@
</goals>
</execution>
</executions>
</plugin> -->
</plugin>
</plugins>
</build>
<reporting>
Expand Down
8 changes: 8 additions & 0 deletions saiku-core/saiku-olap-util/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,19 @@
<parent>
<artifactId>saiku-core</artifactId>
<groupId>org.saikuanalytics</groupId>
<<<<<<< HEAD
<version>3.14-SNAPSHOT</version>
</parent>
<artifactId>saiku-olap-util</artifactId>
<packaging>jar</packaging>
<version>3.14-SNAPSHOT</version>
=======
<version>3.8.8</version>
</parent>
<artifactId>saiku-olap-util</artifactId>
<packaging>jar</packaging>
<version>3.8.8</version>
>>>>>>> parent of 4d35073... SE-450: #comment Added Hazelcast Client dependency and created a new session service called HazelcastSessionService
<name>saiku olap util</name>
<properties>
<maven.compiler.source>1.5</maven.compiler.source>
Expand Down
15 changes: 9 additions & 6 deletions saiku-core/saiku-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,20 @@
<parent>
<artifactId>saiku-core</artifactId>
<groupId>org.saikuanalytics</groupId>
<<<<<<< HEAD
<version>3.14-SNAPSHOT</version>
=======
<version>3.8.8</version>
>>>>>>> parent of 4d35073... SE-450: #comment Added Hazelcast Client dependency and created a new session service called HazelcastSessionService
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
<artifactId>saiku-service</artifactId>
<<<<<<< HEAD
<version>3.14-SNAPSHOT</version>
=======
<version>3.8.8</version>
>>>>>>> parent of 4d35073... SE-450: #comment Added Hazelcast Client dependency and created a new session service called HazelcastSessionService
<name>saiku - services</name>
<build>
<plugins>
Expand All @@ -33,7 +41,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<version>2.12.4</version>
<configuration>
<argLine>-Xmx512m</argLine>
</configuration>
Expand Down Expand Up @@ -177,11 +185,6 @@
</exclusions>
</dependency>
<!-- Hazelcast dependency for distributed sessions -->
<dependency>
<groupId>com.hazelcast</groupId>
<artifactId>hazelcast-wm</artifactId>
<version>3.6.2</version>
</dependency>
<dependency>
<groupId>org.olap4j</groupId>
<artifactId>olap4j-xmlaserver</artifactId>
Expand Down
185 changes: 0 additions & 185 deletions saiku-core/saiku-service/src/main/java/org/saiku/repository/MarkLogicRepositoryManager.java
View file

This file was deleted.

Loading

0 comments on commit e0afc29

Please sign in to comment.