This is an automated email from the ASF dual-hosted git repository.
maartenc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant-ivy.git
The following commit(s) were added to refs/heads/master by this push:
new af650208 project refresh
af650208 is described below
commit af6502084f6da7d3ca3074175d611ddb3956c6c3
Author: Eric Milles <[email protected]>
AuthorDate: Thu Jul 31 13:01:36 2025 -0500
project refresh
---
.classpath.default | 2 +-
.classpath.ivyde | 2 +-
.settings/org.eclipse.jdt.core.prefs | 11 +++++------
.settings/org.eclipse.jdt.ui.prefs | 7 ++++---
.settings/org.jayasoft.ivyde.eclipse.prefs | 23 -----------------------
asciidoc/release-notes.adoc | 14 +++++++-------
build.xml | 2 +-
src/etc/checkstyle/checkstyle-config | 10 +++++++---
8 files changed, 26 insertions(+), 45 deletions(-)
diff --git a/.classpath.default b/.classpath.default
index 6a072c8f..4f0dc3be 100644
--- a/.classpath.default
+++ b/.classpath.default
@@ -20,7 +20,7 @@
<classpath>
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="src" path="test/java"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="lib" path="lib/ant.jar"/>
<classpathentry kind="lib" path="lib/ant-testutil.jar"/>
<classpathentry kind="lib" path="lib/commons-codec.jar"/>
diff --git a/.classpath.ivyde b/.classpath.ivyde
index 4c2d172b..d5a5e4ef 100644
--- a/.classpath.ivyde
+++ b/.classpath.ivyde
@@ -20,7 +20,7 @@
<classpath>
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="src" path="test/java"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con"
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?project=ivy&ivyXmlPath=ivy.xml&confs=*&ivySettingsPath=&propertyFiles=version.properties"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/.settings/org.eclipse.jdt.core.prefs
b/.settings/org.eclipse.jdt.core.prefs
index 24c5eb7d..b22d8c16 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Thu Mar 13 22:45:49 CET 2014
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
@@ -7,9 +6,9 @@
# * 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
-# *
+# *
# * https://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
@@ -20,15 +19,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/.settings/org.eclipse.jdt.ui.prefs
b/.settings/org.eclipse.jdt.ui.prefs
index b9e56bf2..bb027837 100644
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -6,9 +6,9 @@
# * 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
-# *
+# *
# * https://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
@@ -21,6 +21,7 @@
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
formatter_profile=_Ivy Conventions
formatter_settings_version=12
internal.default.compliance=default
+org.eclipse.jdt.ui.importorder=java;javax;org.apache.ivy;org.apache;;\#java;\#javax;\#org.apache.ivy;\#org.apache;\#;
org.eclipse.jdt.ui.javadoc=false
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0"
encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true"
context\="gettercomment_context" deleted\="false" description\="Comment for
getter method" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment"
name\="gettercomment">/**\n * @return the ${bare_field_name}\n
*/</template><template autoinsert\="true" context\="settercomment_context"
deleted\="false" description\="Comment for set [...]
sp_cleanup.add_default_serial_version_id=true
@@ -39,7 +40,7 @@ sp_cleanup.always_use_this_for_non_static_method_access=false
sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code=false
sp_cleanup.format_source_code_changes_only=false
sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=false
diff --git a/.settings/org.jayasoft.ivyde.eclipse.prefs
b/.settings/org.jayasoft.ivyde.eclipse.prefs
deleted file mode 100644
index 58522257..00000000
--- a/.settings/org.jayasoft.ivyde.eclipse.prefs
+++ /dev/null
@@ -1,23 +0,0 @@
-#Sun Sep 03 16:43:34 PDT 2006
-# ***************************************************************
-# * 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
-# *
-# * https://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.
-# ***************************************************************
-acceptedTypes=[inherited]
-eclipse.preferences.version=1
-ivy_conf_path=file\:///./ivysettings.xml
-retreive.pattern=none
diff --git a/asciidoc/release-notes.adoc b/asciidoc/release-notes.adoc
index 6e2a57a0..9bea0811 100644
--- a/asciidoc/release-notes.adoc
+++ b/asciidoc/release-notes.adoc
@@ -75,7 +75,7 @@ Here is the list of people who have contributed source code
and documentation up
* Gintautas Grigelionis
* Xavier Hanin
* Nicolas Lalevée
-* Jan Matèrne
+* Jan Matèrne
* Jaikiran Pai
* Jon Schneider
* Gilles Scokart
@@ -160,21 +160,21 @@ Here is the list of people who have contributed source
code and documentation up
* Andrey Lomakin
* William Lyvers
* Sakari Maaranen
+* David Maplesden
+* Glen Marchesani
* Jan Materne
* Markus M. May
* Lewis John McGibbney
+* Phil Messenger
+* Steve Miller
+* Eric Milles
* Abel Muino
* J. Lewis Muir
+* Mathias Muller
* Stephen Nesbitt
* Joshua Nichols
* Bernard Niset
* Ales Nosek
-* David Maplesden
-* Glen Marchesani
-* Phil Messenger
-* Steve Miller
-* Eric Milles
-* Mathias Muller
* Randy Nott
* Peter Oxenham
* Douglas Palmer
diff --git a/build.xml b/build.xml
index 25904c7e..421ea598 100644
--- a/build.xml
+++ b/build.xml
@@ -597,7 +597,7 @@
</target>
<target name="init-checkstyle" depends="jar">
- <ivy:cachepath organisation="com.puppycrawl.tools" module="checkstyle"
revision="6.19"
+ <ivy:cachepath organisation="com.puppycrawl.tools" module="checkstyle"
revision="8.45.1"
inline="true" conf="default"
pathid="checkstyle.classpath" log="download-only"/>
<taskdef uri="antlib:com.puppycrawl.tools.checkstyle.ant"
resource="com/puppycrawl/tools/checkstyle/ant/antlib.xml"
classpathref="checkstyle.classpath"/>
diff --git a/src/etc/checkstyle/checkstyle-config
b/src/etc/checkstyle/checkstyle-config
index 06c739a6..624a0de9 100644
--- a/src/etc/checkstyle/checkstyle-config
+++ b/src/etc/checkstyle/checkstyle-config
@@ -34,6 +34,7 @@
<module name="JavadocType">
<property name="scope" value="protected"/>
</module>
+ <!--
<module name="JavadocMethod">
<property name="scope" value="protected"/>
<property name="allowUndeclaredRTE" value="true"/>
@@ -41,6 +42,7 @@
<module name="JavadocVariable">
<property name="scope" value="public"/>
</module>
+ -->
<!-- element naming -->
<module name="PackageName"/>
@@ -60,11 +62,13 @@
<module name="UnusedImports"/>
<!-- size limits -->
+ <!--
<module name="LineLength">
<property name="max" value="100"/>
<property name="ignorePattern" value="^ *\* *[^ ]+$"/>
<property name="tabWidth" value="4"/>
</module>
+ -->
<module name="MethodLength"/>
<module name="ParameterNumber"/>
@@ -120,9 +124,8 @@
<module name="ArrayTypeStyle"/>
<!-- <module name="TodoComment"/> -->
<module name="UpperEll"/>
- <!-- allow comment suppression of checks -->
- <module name="FileContentsHolder"/>
<!--
+ <module name="FileContentsHolder"/>
<module name="GenericIllegalRegexp">
<property name="format" value="\s+$"/>
<property name="message" value="Line has trailing spaces."/>
@@ -135,12 +138,13 @@
<property name="format" value="\s+$"/>
</module>
- <!-- <module name="au.com.redhillconsulting.simian.SimianCheck"/> -->
+ <!--
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CheckStyle\:([\w\|]+) *OFF"/>
<property name="onCommentFormat" value="CheckStyle\:([\w\|]+) *ON"/>
<property name="checkFormat" value="$1"/>
</module>
+ -->
<module name="SuppressionFilter">
<property name="file"
value="${checkstyle.src.dir}/checkstyle-suppress.xml"/>
