This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
The following commit(s) were added to refs/heads/master by this push:
new ae0923b8 Trailing spaces
ae0923b8 is described below
commit ae0923b819ae9fef21013faecbd4528d5e281ee7
Author: Sebb <s...@apache.org>
AuthorDate: Thu Oct 19 22:56:06 2023 +0100
Trailing spaces
---
.github/workflows/maven.yml | 16 ++++++++--------
src/changes/changes.xml | 2 +-
src/main/config/clirr-ignored.xml | 8 ++++----
.../META-INF/services/javax.script.ScriptEngineFactory | 10 +++++-----
src/site/xdoc/reference/index.xml | 5 ++---
5 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 99bb0340..4f7d723f 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -33,24 +33,24 @@ jobs:
# include:
# - java: 22-ea
# os: ubuntu-latest
-# experimental: true
+# experimental: true
# - java: 22-ea
# os: windows-latest
-# experimental: true
+# experimental: true
fail-fast: false
-
+
steps:
- - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- with:
- persist-credentials: false
- - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+ - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+ with:
+ persist-credentials: false
+ - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 #
v3.13.0
+ uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 #
v3.13.0
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index cc168002..0916150f 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -50,7 +50,7 @@
</action>
<action dev="ggregory" type="fix" due-to="step-security-bot, Gary
Gregory">
[StepSecurity] ci: Harden GitHub Actions #180.
- </action>
+ </action>
<!-- UPDATE -->
<action dev="henrib" type="update" due-to="dependabot">
Bump github actions.
diff --git a/src/main/config/clirr-ignored.xml
b/src/main/config/clirr-ignored.xml
index 1d767520..601d55f3 100644
--- a/src/main/config/clirr-ignored.xml
+++ b/src/main/config/clirr-ignored.xml
@@ -26,21 +26,21 @@
<method>org.apache.commons.jexl3.JexlScript
createScript(org.apache.commons.jexl3.JexlInfo, java.lang.String,
java.lang.String[])</method>
<to>org.apache.commons.jexl3.JexlScript
createScript(org.apache.commons.jexl3.JexlInfo, java.lang.String,
java.lang.String[])</to>
</difference>
-
+
<difference>
<className>org/apache/commons/jexl3/JexlEngine</className>
<differenceType>7013</differenceType> <!-- added abstract method on
abstract class not meant for the user to derive -->
<method>org.apache.commons.jexl3.JexlScript
createScript(org.apache.commons.jexl3.JexlFeatures,
org.apache.commons.jexl3.JexlInfo, java.lang.String,
java.lang.String[])</method>
<to>org.apache.commons.jexl3.JexlScript
createScript(org.apache.commons.jexl3.JexlFeatures,
org.apache.commons.jexl3.JexlInfo, java.lang.String, java.lang.String[])</to>
</difference>
-
+
<difference>
<className>org/apache/commons/jexl3/JexlScript</className>
<differenceType>7012</differenceType> <!-- method added to interface
that is not meant for the user to implement -->
<method>java.lang.String[] getUnboundParameters()</method>
<to>java.lang.String[] getUnboundParameters()</to>
</difference>
-
+
<difference>
<className>org/apache/commons/jexl3/introspection/JexlUberspect</className>
<differenceType>7012</differenceType> <!-- method added to interface
that is not meant for the user to implement -->
@@ -55,4 +55,4 @@
<method>JexlException$Tokenization(org.apache.commons.jexl3.JexlInfo,
org.apache.commons.jexl3.parser.TokenMgrError)</method>
<to>JexlException$Tokenization(org.apache.commons.jexl3.JexlInfo,
org.apache.commons.jexl3.parser.TokenMgrException)</to>
</difference>
-</differences>
\ No newline at end of file
+</differences>
diff --git
a/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
b/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
index 0bde1f3e..d10912cf 100644
--- a/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
+++ b/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory
@@ -1,19 +1,19 @@
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
-#
+#
+#
org.apache.commons.jexl3.scripting.JexlScriptEngineFactory
diff --git a/src/site/xdoc/reference/index.xml
b/src/site/xdoc/reference/index.xml
index e525592f..15157560 100644
--- a/src/site/xdoc/reference/index.xml
+++ b/src/site/xdoc/reference/index.xml
@@ -6,9 +6,9 @@
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,4 +34,3 @@
</section>
</body>
</document>
-
