Skip to content

Commit 88b01a8

Browse files
author
Emmanuel Lécharny
committed
o Fix required by the OGNL new version
o Bumped updependencies and plugins
1 parent d86d6d1 commit 88b01a8

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/AbstractPropertyAccessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
*/
3030
public abstract class AbstractPropertyAccessor extends ObjectPropertyAccessor {
3131

32-
static final Object READ_ONLY_MODE = new Object();
32+
static final String READ_ONLY_MODE = "READ_ONLY_MODE";
3333

34-
static final Object QUERY = new Object();
34+
static final String QUERY = "QUERY";
3535

3636
@Override
3737
public final boolean hasGetProperty(OgnlContext context, Object target, Object oname) throws OgnlException {

mina-integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public Set<IoSession> find(Iterable<IoSession> sessions) throws OgnlException {
110110
}
111111

112112
Set<IoSession> answer = new LinkedHashSet<>();
113-
Map<Object,Object> values = new HashMap<>();
113+
Map<String,Object> values = new HashMap<>();
114114
values.put(AbstractPropertyAccessor.READ_ONLY_MODE, true);
115115
values.put(AbstractPropertyAccessor.QUERY, query);
116116

pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<version.jdepend.plugin>2.1</version.jdepend.plugin>
124124
<version.jxr.plugin>3.6.0</version.jxr.plugin>
125125
<version.model.plugin>3.9.4</version.model.plugin>
126-
<version.plexus.utils>4.0.0</version.plexus.utils>
126+
<version.plexus.utils>4.0.2</version.plexus.utils>
127127
<version.plugin.plugin>4.0.0-beta-1</version.plugin.plugin>
128128
<version.pmd.plugin>3.28.0</version.pmd.plugin>
129129
<version.project.plugin>3.0-alpha-2</version.project.plugin>
@@ -136,32 +136,32 @@
136136
<version.scm.plugin>2.2.1</version.scm.plugin>
137137
<version.site.plugin>4.0.0-M16</version.site.plugin>
138138
<version.source.plugin>3.3.1</version.source.plugin>
139-
<version.shade.plugin>3.5.0</version.shade.plugin>
139+
<version.shade.plugin>3.6.1</version.shade.plugin>
140140
<version.surefire.plugin>3.5.4</version.surefire.plugin>
141141
<version.surfire.report.plugin>3.5.4</version.surfire.report.plugin>
142142
<version.taglist.plugin>3.2.1</version.taglist.plugin>
143143
<version.tools.maven.plugin>1.4</version.tools.maven.plugin>
144144
<version.versions.plugin>2.19.1</version.versions.plugin>
145-
<version.xbean.plugin>4.25</version.xbean.plugin>
145+
<version.xbean.plugin>4.27</version.xbean.plugin>
146146

147147
<!-- Jars -->
148-
<version.bcprov>1.80</version.bcprov>
149-
<version.easymock>5.4.0</version.easymock>
148+
<version.bcprov>1.82</version.bcprov>
149+
<version.easymock>5.6.0</version.easymock>
150150
<version.jboss.javassist>3.8.0.GA</version.jboss.javassist>
151151
<version.jmock>1.2.0</version.jmock>
152152
<version.junit>4.13.2</version.junit>
153153
<version.jzlib>1.1.3</version.jzlib>
154154
<version.log4j>1.2.17</version.log4j>
155155
<version.mockito>4.11.0</version.mockito>
156-
<version.ognl>3.4.3</version.ognl>
157-
<version.pmd>7.7.0</version.pmd>
156+
<version.ognl>3.4.7</version.ognl>
157+
<version.pmd>7.17.0</version.pmd>
158158
<version.slf4j.api>1.7.36</version.slf4j.api>
159159
<version.slf4j.reload4j>1.7.36</version.slf4j.reload4j>
160160
<version.slf4j.jcl.over.slf4j>1.7.36</version.slf4j.jcl.over.slf4j>
161161
<version.springframework>5.3.39</version.springframework>
162162
<version.springframework.old>2.5.6.SEC03</version.springframework.old>
163163
<version.tomcat.jni>10.0.27</version.tomcat.jni>
164-
<version.xbean.spring>4.25</version.xbean.spring>
164+
<version.xbean.spring>4.27</version.xbean.spring>
165165

166166
<!-- OSGi minimum versions -->
167167
<osgi-min-version.slf4j.api>1.7</osgi-min-version.slf4j.api>

0 commit comments

Comments
 (0)