Skip to content

Commit

Permalink
v1.5.0
Browse files Browse the repository at this point in the history
- Upgrade to Play 1.5.3
- Disable Illegal Access warning (with Java 9+)
- Remove DisableDocViewer plugin (already fixed in playframework/play1#1103)
  • Loading branch information
naku committed Apr 29, 2019
1 parent ca776bd commit f7d24c1
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 36 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ sudo: required
dist: trusty
language: java
env:
PLAY_VERSION=1.4.2
PLAY_VERSION=1.5.3
before_script:
wget http://downloads.typesafe.com/play/${PLAY_VERSION}/play-${PLAY_VERSION}.zip;
wget https://nexus.sismics.com/repository/sismics/play-${PLAY_VERSION}.zip
unzip -q play-${PLAY_VERSION}.zip
script:
if [ "$TRAVIS_BRANCH" == "release" ]; then
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
## Change Log
### Version 1.5.0 (2019-04-29)
- Upgrade to Play 1.5.3
- Disable Illegal Access warning (with Java 9+)
- Remove DisableDocViewer plugin (already fixed in https://github.com/playframework/play1/issues/1103)
### Version 1.4.0 (2019-04-05)
- Automate release
- Add JSON helper
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/test/RestFunctionalTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ private void onActionCompleted() {

@Override
public Invoker.InvocationContext getInvocationContext() {
ActionInvoker.resolve(request, response);
ActionInvoker.resolve(request);
return new Invoker.InvocationContext(Http.invocationType, request.invokedMethod.getAnnotations(),
request.invokedMethod.getDeclaringClass().getAnnotations());
}
Expand Down
1 change: 1 addition & 0 deletions app/play.plugins
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
510:play.plugins.AppBinder
520:play.plugins.DisableIllegalAccessWarning
530:play.plugins.UTCTimeZonePlugin
32 changes: 0 additions & 32 deletions app/play/plugins/DisableDocViewerPlugin.java

This file was deleted.

26 changes: 26 additions & 0 deletions app/play/plugins/DisableIllegalAccessWarning.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package play.plugins;

import play.PlayPlugin;
import sun.misc.Unsafe;

import java.lang.reflect.Field;

/**
* @author jtremeaux
*/
public class DisableIllegalAccessWarning extends PlayPlugin {
@Override
public void onLoad() {
try {
Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
theUnsafe.setAccessible(true);
Unsafe u = (Unsafe) theUnsafe.get(null);

Class cls = Class.forName("jdk.internal.module.IllegalAccessLogger");
Field logger = cls.getDeclaredField("logger");
u.putObjectVolatile(cls, u.staticFieldOffset(logger), null);
} catch (Exception e) {
// ignore
}
}
}
9 changes: 8 additions & 1 deletion conf/dependencies.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
self: play -> playful 1.4.0
self: play -> playful 1.5.0

configurations:
- provided:
Expand All @@ -7,3 +7,10 @@ configurations:
require:
- play
- com.sismics.sapparot -> sapparot 1.3.0

repositories:
- sismicsNexusMaven:
type: iBiblio
root: "https://nexus.sismics.com/repository/com.sismics/"
contains:
- com.sismics.sapparot -> *

0 comments on commit f7d24c1

Please sign in to comment.