Skip to content

Commit d67a744

Browse files
cowtowncodercowtowncoder
committed
Prepare for 1.0.0 release
1 parent ebcb6fc commit d67a744

File tree

2 files changed

+56
-75
lines changed

2 files changed

+56
-75
lines changed

‎pom.xml

Lines changed: 48 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
33
<parent>
4-
<groupId>org.sonatype.oss</groupId>
4+
<groupId>com.fasterxml</groupId>
55
<artifactId>oss-parent</artifactId>
6-
<version>7</version>
6+
<version>16</version>
77
</parent>
88
<groupId>com.fasterxml.util</groupId>
99
<artifactId>java-merge-sort</artifactId>
1010
<name>java-merge-sort</name>
11-
<version>0.9.2-SNAPSHOT</version>
11+
<version>1.0.0-SNAPSHOT</version>
1212
<packaging>bundle</packaging>
13-
<description>Basic disk-backed N-way merge sort
13+
<description>Basic configurable disk-backed N-way merge sort
1414
</description>
1515
<url>https://github.com/cowtowncoder/java-merge-sort</url>
1616
<scm>
@@ -19,21 +19,12 @@
1919
<url>http://github.com/cowtowncoder/java-merge-sort</url>
2020
</scm>
2121
<developers>
22-
<developer>
23-
<id>tatu</id>
24-
<name>Tatu Saloranta</name>
25-
<email>tatu.saloranta@iki.fi</email>
26-
</developer>
22+
<developer>
23+
<id>tatu</id>
24+
<name>Tatu Saloranta</name>
25+
<email>tatu.saloranta@iki.fi</email>
26+
</developer>
2727
</developers>
28-
29-
<prerequisites>
30-
<maven>2.2.1</maven>
31-
</prerequisites>
32-
<properties>
33-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
34-
</properties>
35-
36-
<!-- Licensing -->
3728
<licenses>
3829
<license>
3930
<name>The Apache Software License, Version 2.0</name>
@@ -42,77 +33,71 @@
4233
</license>
4334
</licenses>
4435

45-
<dependencies>
46-
<!-- very few dependencies... -->
36+
<properties>
37+
<javac.src.version>1.6</javac.src.version>
38+
<javac.target.version>1.6</javac.target.version>
39+
</properties>
4740

48-
<!-- and for testing, JUnit (or TestNG?) is needed -->
41+
<dependencies>
42+
<!-- only test dependencies; zero-dep for production -->
4943
<dependency>
5044
<groupId>junit</groupId>
5145
<artifactId>junit</artifactId>
52-
<version>4.8.2</version>
46+
<version>4.11</version>
5347
<scope>test</scope>
5448
</dependency>
49+
5550
<!-- Let's also test JSON-based sorting -->
51+
<!-- TODO: upgrade to Jackson 2 -->
5652
<dependency>
5753
<groupId>org.codehaus.jackson</groupId>
5854
<artifactId>jackson-mapper-asl</artifactId>
59-
<version>1.9.11</version>
55+
<version>1.9.13</version>
6056
<scope>test</scope>
6157
</dependency>
6258
</dependencies>
6359

6460
<build>
6561
<plugins>
66-
<plugin>
67-
<artifactId>maven-compiler-plugin</artifactId>
68-
<version>2.3.2</version>
69-
<configuration>
70-
<source>1.6</source>
71-
<target>1.6</target>
72-
</configuration>
73-
</plugin>
62+
<!--
7463
<plugin>
7564
<groupId>org.apache.maven.plugins</groupId>
7665
<artifactId>maven-release-plugin</artifactId>
7766
<configuration>
7867
<mavenExecutorId>forked-path</mavenExecutorId>
7968
</configuration>
8069
</plugin>
70+
-->
71+
72+
<!-- 04-Jun-2014, tatu: Not sure why source and javadoc plugins are needed
73+
here; parent pom SHOULD include enough info
74+
-->
8175
<plugin><!-- plug-in to attach source bundle in repo -->
82-
<groupId>org.apache.maven.plugins</groupId>
83-
<artifactId>maven-source-plugin</artifactId>
84-
<version>2.1.2</version>
85-
<executions>
86-
<execution>
87-
<id>attach-sources</id>
88-
<goals>
89-
<goal>jar</goal>
90-
</goals>
91-
</execution>
92-
</executions>
76+
<groupId>org.apache.maven.plugins</groupId>
77+
<artifactId>maven-source-plugin</artifactId>
78+
<version>2.1.2</version>
79+
<executions>
80+
<execution>
81+
<id>attach-sources</id>
82+
<goals>
83+
<goal>jar</goal>
84+
</goals>
85+
</execution>
86+
</executions>
9387
</plugin>
9488
<plugin>
95-
<groupId>org.apache.maven.plugins</groupId>
96-
<artifactId>maven-javadoc-plugin</artifactId>
97-
<version>2.6</version>
98-
<configuration>
99-
<source>1.5</source>
100-
<target>1.5</target>
101-
<encoding>UTF-8</encoding>
102-
<maxmemory>512m</maxmemory>
103-
<links>
104-
<link>http://java.sun.com/javase/6/docs/api/</link>
105-
</links>
106-
</configuration>
107-
<executions>
108-
<execution>
109-
<id>attach-javadocs</id>
110-
<phase>verify</phase>
111-
<goals>
112-
<goal>jar</goal>
113-
</goals>
114-
</execution>
115-
</executions>
89+
<groupId>org.apache.maven.plugins</groupId>
90+
<artifactId>maven-javadoc-plugin</artifactId>
91+
<version>2.6</version>
92+
<executions>
93+
<execution>
94+
<id>attach-javadocs</id>
95+
<phase>verify</phase>
96+
<goals>
97+
<goal>jar</goal>
98+
</goals>
99+
</execution>
100+
</executions>
116101
</plugin>
117102

118103
<!-- Plus, let's make jars OSGi bundles as well -->

‎release-notes/VERSION

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,27 @@
11
Project: java-merge-sort
22
License: Apache License 2.0
3-
Version: 0.9.1
4-
Release date: 12-Oct-2013
3+
Version: 1.0.0
4+
Release date: 04-Jun-2014
55

6-
0.9.1
7-
8-
#11: Change more constructors to be public
9-
(contributed by Nathan W)
10-
#12: Fix an issue with implementation of #11
11-
(contributed by Nathan W)
6+
The first official non-beta release. No changes since 0.9.1.
127

138
------------------------------------------------------------------------
149
=== History: ===
1510
------------------------------------------------------------------------
1611

17-
0.9.0 (10-Oct-2013)
12+
0.9.1 (12-Oct-2013)
1813

14+
#11: Change more constructors to be public
15+
(contributed by Nathan W)
16+
#12: Fix an issue with implementation of #11
17+
(contributed by Nathan W)
1918
#10: Add Iterator-based (pull-style) sorter as an alternative
2019
(contributed by Nathan W)
2120

2221
0.8.1 (07-Aug-2013)
2322

2423
#8: Sorter._merge() not closing streams correctly
2524
(reported by tjoneslo@github)
26-
27-
0.8.0 (24-Jul-2013)
28-
2925
#6: Incorrect handling of '\r'
3026
(reported, patch contributed by ndikan@github.bom)
3127

0 commit comments

Comments
 (0)