@@ -4,7 +4,7 @@

<groupId>fi.muikku</groupId>
<artifactId>bom</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Muikku BOM</name>

@@ -37,7 +37,7 @@

<!-- Muikku -->

<muikku.version>1.0.15-SNAPSHOT</muikku.version>
<muikku.version>1.0.16-SNAPSHOT</muikku.version>

<!-- Lucene -->
<lucene.version>4.10.2</lucene.version>
@@ -5,7 +5,7 @@
<parent>
<groupId>fi.muikku</groupId>
<artifactId>parent</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -5,7 +5,7 @@
<parent>
<groupId>fi.muikku</groupId>
<artifactId>parent</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -5,7 +5,7 @@
<parent>
<groupId>fi.muikku</groupId>
<artifactId>parent</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -5,7 +5,7 @@
<parent>
<groupId>fi.muikku</groupId>
<artifactId>parent</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
</parent>

<artifactId>dummy-mail-bridge-plugin</artifactId>
@@ -5,7 +5,7 @@
<parent>
<groupId>fi.muikku</groupId>
<artifactId>parent</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -5,7 +5,7 @@
<parent>
<groupId>fi.muikku</groupId>
<artifactId>parent</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -5,7 +5,7 @@
<parent>
<groupId>fi.muikku</groupId>
<artifactId>parent</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -5,7 +5,7 @@
<parent>
<groupId>fi.muikku</groupId>
<artifactId>parent</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -5,7 +5,7 @@
<parent>
<groupId>fi.muikku</groupId>
<artifactId>parent</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -3,7 +3,7 @@
<parent>
<groupId>fi.muikku</groupId>
<artifactId>parent</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -5,7 +5,7 @@
<parent>
<groupId>fi.muikku</groupId>
<artifactId>parent</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -9,7 +9,7 @@
<parent>
<groupId>fi.muikku</groupId>
<artifactId>parent</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -5,7 +5,7 @@
<parent>
<groupId>fi.muikku</groupId>
<artifactId>parent</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -78,7 +78,7 @@
<dependency>
<groupId>fi.pyramus</groupId>
<artifactId>rest-model</artifactId>
<version>0.7.16-SNAPSHOT</version>
<version>0.7.17-SNAPSHOT</version>
</dependency>

</dependencies>
@@ -5,7 +5,7 @@
<parent>
<groupId>fi.muikku</groupId>
<artifactId>parent</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -130,13 +130,13 @@
<dependency>
<groupId>fi.pyramus</groupId>
<artifactId>rest-model</artifactId>
<version>0.7.16-SNAPSHOT</version>
<version>0.7.17-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>fi.pyramus</groupId>
<artifactId>pyramus-webhooks</artifactId>
<version>0.7.16-SNAPSHOT</version>
<version>0.7.17-SNAPSHOT</version>
</dependency>

<!-- Muikku -->
@@ -5,7 +5,7 @@
<parent>
<groupId>fi.muikku</groupId>
<artifactId>parent</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -9,7 +9,7 @@
<parent>
<groupId>fi.muikku</groupId>
<artifactId>parent</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@@ -213,55 +213,55 @@
<dependency>
<groupId>fi.muikku</groupId>
<artifactId>h2db-plugin</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>fi.muikku</groupId>
<artifactId>school-data-pyramus</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>fi.muikku</groupId>
<artifactId>deus-nex-machina</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>fi.muikku</groupId>
<artifactId>dummy-mail-bridge-plugin</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>fi.muikku</groupId>
<artifactId>google-oauth-plugin</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>fi.muikku</groupId>
<artifactId>pyramus-oauth-plugin</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>fi.muikku</groupId>
<artifactId>facebook-oauth-plugin</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>fi.muikku</groupId>
<artifactId>mongo-log-plugin</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
</dependency>

<dependency>
<groupId>fi.muikku</groupId>
<artifactId>google-calendar-plugin</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
</dependency>

<!-- ENABLED PLUGINS END -->
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>fi.muikku</groupId>
<artifactId>parent</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Muikku Parent</name>

@@ -80,7 +79,7 @@
<dependency>
<groupId>fi.muikku</groupId>
<artifactId>bom</artifactId>
<version>1.0.15-SNAPSHOT</version>
<version>1.0.16-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>