Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-03 11:35:29 -04:00
Code Issues Projects Releases Wiki Activity
936 Commits 23 Branches 40 Tags
Commit Graph

80 Commits

Author SHA1 Message Date
Harald Kuhr
c8745f4df7 [maven-release-plugin] prepare for next development iteration 2017-02-02 21:30:47 +01:00
Harald Kuhr
e8d427ae5f [maven-release-plugin] prepare release twelvemonkeys-3.3.2 2017-02-02 21:30:39 +01:00
Harald Kuhr
41e6b041c9 [maven-release-plugin] prepare for next development iteration 2016-11-29 20:31:57 +01:00
Harald Kuhr
4e5127404f [maven-release-plugin] prepare release twelvemonkeys-3.3.1 2016-11-29 20:31:51 +01:00
Harald Kuhr
2cede0e8cc Updating POM versions for bugfix release 2016-11-29 20:25:38 +01:00
Harald Kuhr
654e111605 [maven-release-plugin] prepare release twelvemonkeys-3.3 2016-11-02 19:36:45 +01:00
Harald Kuhr
6d043d0208 [maven-release-plugin] rollback the release of twelvemonkeys-3.3 2016-11-02 19:31:52 +01:00
Harald Kuhr
e4b91ab34c [maven-release-plugin] prepare release twelvemonkeys-3.3 2016-11-02 19:27:22 +01:00
Harald Kuhr
c7208c2c97 Clean up after merge. 2016-08-09 09:32:58 +02:00
Torstein Krause Johansen
0db676f1be Re-added test case lost in large merge 
- Removed imageio-jmagick (again)

- Removed internal Maven repo

- fixed line endings on a number of files to avoid a humongous merge
  diff when getting changes into upstream

- Re-enabled a few tests
 2016-06-29 14:16:44 +02:00
Torstein Krause Johansen
1e3c8b26f6 Merge branch 'master' into madness 2016-06-28 14:18:30 +02:00
Torstein Krause Johansen
ea5b9c5606 Merge remote-tracking branch 'upstream/master' 2016-06-28 12:43:11 +02:00
Harald Kuhr
1ce2a06859 [maven-release-plugin] prepare for next development iteration 2015-11-01 19:51:40 +01:00
Harald Kuhr
9c9d2c700e [maven-release-plugin] prepare release twelvemonkeys-3.2 2015-11-01 19:51:34 +01:00
Harald Kuhr
df735b9a45 TMI #168: Change Maven test dependencies from classifier test to type test-jar for better sbt support 2015-08-24 11:07:17 +02:00
Harald Kuhr
f645e46495 Updated POM to 3.2-SNAPSHOT 2015-06-08 14:12:04 +02:00
Harald Kuhr
475fdec33f [maven-release-plugin] prepare for next development iteration 2015-04-10 12:16:14 +02:00
Harald Kuhr
2f249a3885 [maven-release-plugin] prepare release twelvemonkeys-3.1.0 2015-04-10 12:16:08 +02:00
Shihab Uddin
e14cbbd853 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	pom.xml
 2015-03-30 13:53:30 +02:00
Harald Kuhr
6dd68dd54e [maven-release-plugin] prepare for next development iteration 2014-10-01 11:21:42 +02:00
Harald Kuhr
d054ee9bb1 [maven-release-plugin] prepare release twelvemonkeys-3.0 2014-10-01 11:21:34 +02:00
Harald Kuhr
845944b25f [maven-release-plugin] prepare for next development iteration 2014-10-01 10:32:30 +02:00
Harald Kuhr
d12f9bdbbd [maven-release-plugin] prepare release twelvemonkeys-3.0-rc7 2014-10-01 10:32:23 +02:00
Harald Kuhr
3e9820bb22 Prepare for new development 2014-10-01 10:25:34 +02:00
Harald Kuhr
2098e6a898 [maven-release-plugin] prepare release twelvemonkeys-3.0-rc6 2014-10-01 10:19:06 +02:00
Harald Kuhr
feb20eefdd [maven-release-plugin] prepare for next development iteration 2014-09-30 12:48:20 +02:00
Harald Kuhr
6977e52059 [maven-release-plugin] prepare release twelvemonkeys-3.0-rc6 2014-09-30 12:48:12 +02:00
Rune Bremnes
113480b9e7 Merge branch 'master' of https://github.com/haraldk/TwelveMonkeys 
Conflicts:
	imageio/imageio-reference/pom.xml
	imageio/imageio-thumbsdb/pom.xml
 2014-03-03 12:33:01 +01:00
Rune Bremnes
cb276c8aff Merge branch 'master' of https://github.com/haraldk/TwelveMonkeys 
Conflicts:
	sandbox/sandbox-common/src/main/java/com/twelvemonkeys/io/enc/DeflateEncoder.java
	sandbox/sandbox-common/src/main/java/com/twelvemonkeys/io/enc/InflateDecoder.java
	servlet/src/main/java/com/twelvemonkeys/servlet/GenericFilter.java
	servlet/src/main/java/com/twelvemonkeys/servlet/GenericServlet.java
	servlet/src/main/java/com/twelvemonkeys/servlet/HttpServlet.java
	servlet/src/main/java/com/twelvemonkeys/servlet/ServletResponseStreamDelegate.java
	servlet/src/main/java/com/twelvemonkeys/servlet/cache/CacheResponseWrapper.java
	servlet/src/main/java/com/twelvemonkeys/servlet/cache/HTTPCache.java
	servlet/src/main/java/com/twelvemonkeys/servlet/cache/SerlvetCacheResponseWrapper.java
	servlet/src/main/java/com/twelvemonkeys/servlet/cache/WritableCachedResponseImpl.java
	servlet/src/main/java/com/twelvemonkeys/servlet/image/ImageServletResponseImpl.java
 2014-02-24 10:28:26 +01:00
Trygve Laugstøl
0ab9294004 [maven-release-plugin] prepare for next development iteration 2014-02-15 13:14:41 +01:00
Trygve Laugstøl
ed5a5e0dca [maven-release-plugin] prepare release twelvemonkeys-3.0-rc5 2014-02-15 13:13:39 +01:00
Harald Kuhr
14e12eb2c1 TMS-29: Code clean up after merge. 2014-01-02 13:25:37 +01:00
Harald Kuhr
0ded2f211a TMS-29: Test case exposing .ConcurrentModificationException. 2014-01-02 13:21:37 +01:00
Harald Kuhr
ed11259e58 Merge branch 'master' of github.com:haraldk/TwelveMonkeys 2014-01-02 13:18:58 +01:00
Harald Kuhr
5779a40a32 TMS-29: Test case exposing .ConcurrentModificationException. 2014-01-02 13:16:26 +01:00
Andreas Kohn
ecc08daa2d Call #deregisterServiceProvider() outside of the iteration over the existing service providers 2013-12-30 17:57:38 +01:00
Harald Kuhr
a1f9e979b9 Servlet changes for 3.0. 2013-12-23 11:11:48 +01:00
Harald Kuhr
cd6e9ebbf5 TMS: Updated POM with new build-plugin version. 2013-09-08 14:43:51 +02:00
Harald Kuhr
2f69847b23 Moved old obsolete stuff to sandbox. 2013-09-08 14:16:31 +02:00
Harald Kuhr
c5f1d8101b Moved old obsolete stuff to sandbox. 2013-09-08 14:08:38 +02:00
Rune Bremnes
c5929d9479 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	servlet/src/main/java/com/twelvemonkeys/servlet/ServletUtil.java
	servlet/src/main/java/com/twelvemonkeys/servlet/cache/HTTPCache.java
	servlet/src/test/java/com/twelvemonkeys/servlet/ServletConfigMapAdapterTest.java
	servlet/src/test/java/com/twelvemonkeys/servlet/ServletHeadersMapAdapterTest.java
	servlet/src/test/java/com/twelvemonkeys/servlet/ServletParametersMapAdapterTest.java
 2013-08-14 09:45:32 +02:00
justwrote
0860db2166 mockito should be a test dependency 2013-06-21 12:07:49 +02:00
Harald Kuhr
33ffc14e3f TMS-XXX: Code style. 2013-06-05 10:56:12 +02:00
Harald Kuhr
b97d95cca7 More Maven-friendly test suite. 2013-03-04 15:16:59 +01:00
Harald Kuhr
1ffe694538 TMS-XXXX: New map adapters for servlet context and request attributes + minor API tweaks. 2013-03-04 14:48:50 +01:00
Shihab Uddin
f28ad2d396 building 3.0-ece-1 2012-09-26 13:42:04 +02:00
Shihab Uddin
5bd8c37c2d fixed merge conflicts 2012-09-26 11:51:25 +02:00
Erlend Hamnaberg
e72700b032 Use rectangle instead of package protected method. 2012-09-26 11:48:26 +02:00
Erlend Hamnaberg
2f06f2de6d Cleanup of AreaOfInterest 
Conflicts:
	servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java
 2012-09-26 11:47:53 +02:00
Erlend Hamnaberg
8137165bac Cleanup of AreaOfInterest 
- Extracted AreaOfInterest into an interface
- Added an AreaOfInterestFactory.
- Use AreaOfInterestFactory in ImageServletResponseImpl
- fixed version

Conflicts:
	servlet/pom.xml
	servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java
 2012-09-26 11:45:04 +02:00