Permalink
Browse files

Merge branch 'master' into jackson2

Conflicts:
	.gitignore
	pom.xml
  • Loading branch information...
2 parents a978673 + 7cffbe8 commit 40cb03d0f563622a059f559fb662a4d1f33f6231 @imikushin imikushin committed May 13, 2012
Showing with 26 additions and 206 deletions.
  1. +1 −7 .gitignore
  2. +25 −15 pom.xml
  3. +0 −184 pom_2.8.2.xml
View
@@ -1,10 +1,4 @@
.idea*
*.iml
-lib_managed
target
-project/boot
-project/build/target
-project/plugins/lib_managed
-project/plugins/src_managed
-project/plugins/target
-project/plugins/project/build.properties
+
View
40 pom.xml
@@ -4,14 +4,18 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <prerequisites>
+ <maven>3.0.0</maven>
+ </prerequisites>
+
<groupId>com.codahale</groupId>
<artifactId>jerkson_2.9.1</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<name>Jerkson for Scala ${scala.version}</name>
<properties>
<scala.version>2.9.1</scala.version>
- <jackson.version>[2.0.0,3.0.0)</jackson.version>
+ <jackson.version>2.0.1</jackson.version>
</properties>
<developers>
@@ -32,10 +36,6 @@
<repositories>
<repository>
- <id>scala-tools-releases</id>
- <url>http://scala-tools.org/repo-releases/</url>
- </repository>
- <repository>
<id>repo.codahale.com</id>
<url>http://repo.codahale.com</url>
</repository>
@@ -45,13 +45,6 @@
</repository>
</repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>scala-tools-releases</id>
- <url>http://scala-tools.org/repo-releases/</url>
- </pluginRepository>
- </pluginRepositories>
-
<distributionManagement>
<repository>
<id>repo.codahale.com</id>
@@ -83,14 +76,20 @@
<dependency>
<groupId>com.codahale</groupId>
<artifactId>simplespec_${scala.version}</artifactId>
- <version>[0.5.0,0.6.0)</version>
+ <version>0.5.2</version>
<scope>test</scope>
</dependency>
</dependencies>
<profiles>
<profile>
- <id>sign</id>
+ <id>release-sign-artifacts</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
@@ -188,6 +187,17 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.2.1</version>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <mavenExecutorId>forked-path</mavenExecutorId>
+ <tagNameFormat>v@{project.version}</tagNameFormat>
+ <preparationGoals>clean test</preparationGoals>
+ </configuration>
+ </plugin>
</plugins>
<extensions>
<extension>
View
@@ -1,184 +0,0 @@
-<?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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>com.codahale</groupId>
- <artifactId>jerkson_2.8.2</artifactId>
- <version>0.5.1-SNAPSHOT</version>
- <name>Jerkson for Scala ${scala.version}</name>
-
- <properties>
- <scala.version>2.8.2</scala.version>
- <jackson.version>[1.9.0,2.0.0)</jackson.version>
- </properties>
-
- <developers>
- <developer>
- <name>Coda Hale</name>
- <email>coda.hale@gmail.com</email>
- <timezone>-8</timezone>
- </developer>
- </developers>
-
- <licenses>
- <license>
- <url>http://codahale.com/mit.txt</url>
- <name>The MIT License</name>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <repositories>
- <repository>
- <id>scala-tools-releases</id>
- <url>http://scala-tools.org/repo-releases/</url>
- </repository>
- <repository>
- <id>repo.codahale.com</id>
- <url>http://repo.codahale.com</url>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>scala-tools-releases</id>
- <url>http://scala-tools.org/repo-releases/</url>
- </pluginRepository>
- </pluginRepositories>
-
- <distributionManagement>
- <repository>
- <id>repo.codahale.com</id>
- <url>scp://codahale.com/home/codahale/repo.codahale.com</url>
- </repository>
- </distributionManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>${scala.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.codahale</groupId>
- <artifactId>simplespec_2.8.1</artifactId>
- <version>[0.5.0,0.6.0)</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>sign</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <version>2.15.2</version>
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <args>
- <arg>-optimise</arg>
- <arg>-unchecked</arg>
- <arg>-deprecation</arg>
- </args>
- <charset>UTF-8</charset>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.1.2</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.8.1</version>
- <configuration>
- <useSystemClassLoader>false</useSystemClassLoader>
- <argLine>-Xmx1024m</argLine>
- <includes>
- <include>**/*Spec.java</include>
- </includes>
- <excludes>
- <exclude>**/*Test.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh</artifactId>
- <version>1.0-beta-7</version>
- </extension>
- </extensions>
- </build>
-</project>

0 comments on commit 40cb03d

Please sign in to comment.