Skip to content

Commit

Permalink
updating version to 3.5.15
Browse files Browse the repository at this point in the history
  • Loading branch information
fpriyatna committed Oct 23, 2015
1 parent 6b94d3f commit 0453844
Show file tree
Hide file tree
Showing 7 changed files with 166 additions and 37 deletions.
35 changes: 32 additions & 3 deletions morph-base-querytranslator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>es.upm.fi.dia.oeg.morph</groupId>
<artifactId>morph-rdb</artifactId>
<version>3.5.14</version>
<version>3.5.15</version>
</parent>
<packaging>jar</packaging>

Expand All @@ -18,7 +18,35 @@
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>

<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<versionRange>[2.15.2,)</versionRange>
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>

<plugins>
Expand All @@ -45,8 +73,8 @@
<altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo</altDeploymentRepository>
</configuration>
</plugin>
<plugin>

<plugin>
<groupId>com.github.github</groupId>
<artifactId>site-maven-plugin</artifactId>
<version>0.10</version>
Expand Down Expand Up @@ -74,6 +102,7 @@
</plugin>

</plugins>

</build>

<dependencies>
Expand Down
40 changes: 32 additions & 8 deletions morph-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>es.upm.fi.dia.oeg.morph</groupId>
<artifactId>morph-rdb</artifactId>
<version>3.5.14</version>
<version>3.5.15</version>
</parent>
<packaging>jar</packaging>

Expand Down Expand Up @@ -67,19 +67,42 @@
<version>0.1</version>
</dependency>

<!-- <dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc</artifactId>
<version>14</version>
</dependency>
-->

<!-- <dependency> <groupId>com.oracle</groupId> <artifactId>ojdbc</artifactId>
<version>14</version> </dependency> -->

</dependencies>

<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<versionRange>[2.15.2,)</versionRange>
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>

<plugins>
Expand Down Expand Up @@ -136,6 +159,7 @@
</plugin>

</plugins>

</build>

<repositories>
Expand Down
31 changes: 30 additions & 1 deletion morph-r2rml-rdb-querytranslator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>es.upm.fi.dia.oeg.morph</groupId>
<artifactId>morph-rdb</artifactId>
<version>3.5.14</version>
<version>3.5.15</version>
</parent>
<packaging>jar</packaging>

Expand All @@ -18,7 +18,35 @@
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>

<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<versionRange>[2.15.2,)</versionRange>
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>

<plugins>
Expand Down Expand Up @@ -75,6 +103,7 @@
</plugin>

</plugins>

</build>

<dependencies>
Expand Down
31 changes: 30 additions & 1 deletion morph-r2rml-rdb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>es.upm.fi.dia.oeg.morph</groupId>
<artifactId>morph-rdb</artifactId>
<version>3.5.14</version>
<version>3.5.15</version>
</parent>
<packaging>jar</packaging>

Expand All @@ -18,7 +18,35 @@
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>

<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<versionRange>[2.15.2,)</versionRange>
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>

<plugins>
Expand Down Expand Up @@ -74,6 +102,7 @@
</plugin>

</plugins>

</build>

<dependencies>
Expand Down
31 changes: 30 additions & 1 deletion morph-r2rml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>es.upm.fi.dia.oeg.morph</groupId>
<artifactId>morph-rdb</artifactId>
<version>3.5.14</version>
<version>3.5.15</version>
</parent>
<packaging>jar</packaging>

Expand All @@ -14,9 +14,38 @@
<build>
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>

<pluginManagement>
<plugins>
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
<versionRange>[2.15.2,)</versionRange>
<goals>
<goal>compile</goal>
<goal>testCompile</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>


<plugins>
<plugin>
<groupId>org.scala-tools</groupId>
Expand Down
2 changes: 1 addition & 1 deletion morph-rdb-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>es.upm.fi.dia.oeg.morph</groupId>
<artifactId>morph-rdb</artifactId>
<version>3.5.14</version>
<version>3.5.15</version>
</parent>

<artifactId>morph-rdb-dist</artifactId>
Expand Down
33 changes: 11 additions & 22 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@

<groupId>es.upm.fi.dia.oeg.morph</groupId>
<artifactId>morph-rdb</artifactId>
<version>3.5.14</version>
<version>3.5.15</version>

<modules>

<module>morph-base</module>

<module>morph-base-querytranslator</module>

<module>morph-r2rml</module>

<module>morph-r2rml-rdb</module>

<module>morph-r2rml-rdb-querytranslator</module>

<module>morph-rdb-dist</module>

</modules>

<properties>
Expand Down Expand Up @@ -77,23 +77,12 @@
</build>

<distributionManagement>
<!--
<repository>
<uniqueVersion>false</uniqueVersion>
<id>aldebaran-releases</id>
<name>Aldebaran Releases</name>
<url>http://aldebaran.dia.fi.upm.es/artifactory/sstreams-releases-local</url>
</repository>
<!-- <repository> <uniqueVersion>false</uniqueVersion> <id>aldebaran-releases</id>
<name>Aldebaran Releases</name> <url>http://aldebaran.dia.fi.upm.es/artifactory/sstreams-releases-local</url>
</repository> <snapshotRepository> <uniqueVersion>true</uniqueVersion> <id>aldebaran-snapshots</id>
<name>Aldebaran Snapshots</name> <url>http://aldebaran.dia.fi.upm.es/artifactory/sstreams-snapshots-local</url>
</snapshotRepository> -->

<snapshotRepository>
<uniqueVersion>true</uniqueVersion>
<id>aldebaran-snapshots</id>
<name>Aldebaran Snapshots</name>
<url>http://aldebaran.dia.fi.upm.es/artifactory/sstreams-snapshots-local</url>
</snapshotRepository>
-->

<repository>
<id>internal.repo</id>
<name>Temporary Staging Repository</name>
Expand Down

0 comments on commit 0453844

Please sign in to comment.