Skip to content

Commit

Permalink
versions updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@teverett
teverett committed Nov 19, 2017
1 parent 6e3d3ee commit 9fa52ce
Show file tree
Hide file tree
Showing 6 changed files with 68 additions and 162 deletions.
4 changes: 1 addition & 3 deletions omf-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
<parent>
<artifactId>omf-parent</artifactId>
<groupId>org.objectmapper</groupId>
<version>0.2.2</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../omf-parent</relativePath>
</parent>
<artifactId>omf-api</artifactId>
<packaging>bundle</packaging>
<name>Object Mapper - API</name>

<build>
<plugins>
<plugin>
Expand All @@ -25,5 +24,4 @@
</plugin>
</plugins>
</build>

</project>
9 changes: 1 addition & 8 deletions omf-impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
<parent>
<artifactId>omf-parent</artifactId>
<groupId>org.objectmapper</groupId>
<version>0.2.2</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../omf-parent</relativePath>
</parent>
<artifactId>omf-impl</artifactId>
<name>Object Mapper - Implementation</name>
<packaging>bundle</packaging>

<dependencies>
<dependency>
<groupId>org.objectmapper</groupId>
Expand All @@ -21,11 +20,6 @@
<artifactId>javax.inject</artifactId>
<version>1</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand All @@ -42,5 +36,4 @@
</plugin>
</plugins>
</build>

</project>
29 changes: 15 additions & 14 deletions omf-jcr/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,18 @@
<parent>
<artifactId>omf-parent</artifactId>
<groupId>org.objectmapper</groupId>
<version>0.2.2</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../omf-parent</relativePath>
</parent>
<artifactId>omf-jcr</artifactId>
<name>Object Mapper - JCR Backend</name>
<packaging>bundle</packaging>
<properties>
<guiceberry.version>3.3.1</guiceberry.version>
<jcr.version>2.0</jcr.version>
<jackrabbit.version>2.15.8</jackrabbit.version>
<guice.version>4.1.0</guice.version>
</properties>
<dependencies>
<dependency>
<groupId>org.objectmapper</groupId>
Expand All @@ -22,31 +29,31 @@
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
<version>2.0</version>
<version>${jcr.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
<version>2.4.0</version>
<version>${jackrabbit.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
<version>2.4.0</version>
<version>${jackrabbit.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-rmi</artifactId>
<version>2.4.0</version>
<version>${jackrabbit.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
<version>2.2.4</version>
<version>${jackrabbit.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -58,21 +65,16 @@
<dependency>
<groupId>com.google.guiceberry</groupId>
<artifactId>guiceberry</artifactId>
<version>3.1.0</version>
<version>${guiceberry.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>3.0</version>
<version>${guice.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</dependency>
</dependencies>
<packaging>bundle</packaging>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -105,7 +107,6 @@
<configuration>
</configuration>
</plugin>

</plugins>
</build>
</project>
18 changes: 8 additions & 10 deletions omf-osgi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<parent>
<artifactId>omf-parent</artifactId>
<groupId>org.objectmapper</groupId>
<version>0.2.2</version>
<version>1.0-SNAPSHOT</version>
<relativePath>../omf-parent</relativePath>
</parent>
<name>Object Mapper - OSGI Support</name>
<artifactId>omf-osgi</artifactId>
<packaging>bundle</packaging>

<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -36,7 +36,6 @@
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.objectmapper</groupId>
Expand All @@ -53,22 +52,21 @@
<artifactId>omf-jcr</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
<version>1.6.0</version>
<version>1.12.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<name>Object Mapper - OSGI Support</name>
</project>
74 changes: 24 additions & 50 deletions omf-parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,45 @@
<parent>
<artifactId>objectmapper</artifactId>
<groupId>org.objectmapper</groupId>
<version>0.2.2</version>
<version>1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<name>Object Mapper - Parent</name>
<artifactId>omf-parent</artifactId>
<packaging>pom</packaging>

<properties>
<guice.version>3.0</guice.version>
<junit.version>4.12</junit.version>
<jmock.version>2.8.3</jmock.version>
<mockito.version>1.9.5</mockito.version>
<slf4j.version>1.7.12</slf4j.version>
<hamcrest.version>1.3</hamcrest.version>
<cglib.version>3.2.5</cglib.version>
<osgi.version>6.0.0</osgi.version>
</properties>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
<version>2.5.1</version>
<version>${jmock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3.RC2</version>
<version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -44,35 +54,36 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.4</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.4</version>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.2.2</version>
<version>${cglib.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.1.0</version>
<version>${osgi.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>

<pluginManagement>
<plugins>
<plugin>
Expand All @@ -93,43 +104,7 @@
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.1</version>
<configuration>

<reportPlugins>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.5.1</version>
</plugin>

</reportPlugins>

</configuration>
</plugin>
</plugins>
</build>
<name>Object Mapper - Parent</name>

<profiles>
<profile>
<id>auto-deploy</id>
Expand All @@ -156,5 +131,4 @@
</build>
</profile>
</profiles>

</project>
Loading

0 comments on commit 9fa52ce

Please sign in to comment.