(velocity-engine) branch remove-outdated-test updated (49b46992 -> fe2cda32)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch remove-outdated-test in repository https://gitbox.apache.org/repos/asf/velocity-engine.git discard 49b46992 Remove obsolete test new fe2cda32 [VELOCITY-976] Remove obsolete VelTools66TestCase This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (49b46992) \ N -- N -- N refs/heads/remove-outdated-test (fe2cda32) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes:
(velocity-engine) 01/01: [VELOCITY-976] Remove obsolete VelTools66TestCase
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch remove-outdated-test
in repository https://gitbox.apache.org/repos/asf/velocity-engine.git
commit fe2cda32a92dfb239257ce42fea3bff4fcdeebb9
Author: Michael Osipov
AuthorDate: Tue Feb 13 18:03:09 2024 +0100
[VELOCITY-976] Remove obsolete VelTools66TestCase
This closes #42
---
.../velocity/test/issues/VelTools66TestCase.java | 181 -
1 file changed, 181 deletions(-)
diff --git
a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java
b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java
deleted file mode 100644
index 529683ff..
---
a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.apache.velocity.test.issues;
-
-/*
- * 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.
- */
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.RuntimeInstance;
-import org.apache.velocity.test.BaseTestCase;
-import org.apache.velocity.test.misc.TestLogger;
-import org.apache.velocity.util.introspection.Introspector;
-
-import java.lang.reflect.Method;
-import java.security.AccessControlException;
-import java.security.Permission;
-
-/**
- * Test Case for https://issues.apache.org/jira/browse/VELTOOLS-66;>Velocity Tools Issue
66.
- */
-public class VelTools66TestCase
-extends BaseTestCase
-{
-protected static boolean DEBUG = false;
-
-public VelTools66TestCase(final String name)
-throws Exception
-{
-super(name);
-}
-
-public static Test suite()
-{
-return new TestSuite(VelTools66TestCase.class);
-}
-
-@Override
-public void setUp()
-throws Exception
-{
-Velocity.setProperty(
-Velocity.RUNTIME_LOG_INSTANCE, new TestLogger());
-
-Velocity.init();
-System.setSecurityManager(new TestSecurityManager());
-
-}
-
-protected static void log(String out)
-{
-Velocity.getLog().debug(out);
-if (DEBUG)
-{
-System.out.println(out);
-}
-}
-
-@Override
-public void tearDown()
-{
-System.setSecurityManager(null);
-}
-
-public void testVelTools66()
-throws Exception
-{
-/* the testcase is obsolete in JDK 8, as
SystemManager.checkMemberAccess is not anymore called
- * by Class.getMethods() */
-
-String [] javaVersionFields =
System.getProperty("java.version").split("\\.");
-int javaVersion = Integer.parseInt(javaVersionFields[0]);
-if (javaVersion == 1)
-{
-javaVersion = Integer.parseInt(javaVersionFields[1]);
-}
-
-if (javaVersion >= 8)
-{
-return;
-}
-
-Method verifyMethod = TestInterface.class.getMethod("getTestValue");
-
-RuntimeInstance ri = new RuntimeInstance();
-log = new TestLogger(false, false);
-Introspector introspector = new Introspector(log);
-
-Method testMethod = introspector.getMethod(TestObject.class,
"getTestValue", new Object[0]);
-assertNotNull(testMethod);
-assertEquals("Method object does not match!", verifyMethod,
testMethod);
-}
-
-public interface TestInterface
-{
-String getTestValue();
-
-void setTestValue(String testValue);
-}
-
-public static final class TestObject
-implements TestInterface
-{
-String testValue = null;
-
-public TestObject()
-{
-}
-
-@Override
-public String getTestValue()
-{
-return testValue;
-}
-
-@Override
-public void setTestValue(final String testValue)
-{
-this.testValue = testValue;
-}
-}
-
-public static final class TestSecurityManager extends SecurityManager
-{
-private final Class clazz = TestObject.class;
-
-public TestSecurityManager()
-{
-
(velocity-tools) 01/01: Skim and correct README
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch skim-readme in repository https://gitbox.apache.org/repos/asf/velocity-tools.git commit 50babae723eda54b3a9bbab1eb01f44424bc3533 Author: Michael Osipov AuthorDate: Tue Feb 13 22:03:04 2024 +0100 Skim and correct README There is no reason to duplicate information from the POM and force devs to keep the information in sync. --- README.md | 83 +++ 1 file changed, 4 insertions(+), 79 deletions(-) diff --git a/README.md b/README.md index a28ddf73..a5d69964 100644 --- a/README.md +++ b/README.md @@ -2,94 +2,19 @@ Title: Apache Velocity Tools # Apache Velocity Tools -Welcome to the VelocityTools projects. This is a subproject of the -Apache Velocity project hosted at http://velocity.apache.org/ +Welcome to the VelocityTools projects. This is a subproject of the +Apache Velocity project hosted at https://velocity.apache.org/ The VelocityTools project contains several subprojects: velocity-tools-generic/ A collection of general purpose tools velocity-tools-view/Tools servlets and filters for use in a webapp -velocity-tools-jsp/ Tools for a J2EE JSP context +velocity-tools-jsp/ Tools for a JEE JSP context velocity-tools-examples/ velocity-tools-examples-simple/ Simple examples velocity-tools-examples-showcase/ A full webapp demonstrating tools -## REQUIREMENTS - -Apache Velocity Tools 3.0 will run with any Java runtime engine v2+. - -Building from source requires Java development kit v1.8 or greater and Maven 3 (3.0.5+). - -Maven should fetch all needed dependencies for compile ant run time, which are: - -* velocity-engine-core v2.x and its dependencies -* commons-beanutils v1.9.3 -* commons-digester3 v3.2 -* JSON.simple v1.1.1 (only at compile time) - -Plus the following ones, needed for the integrated tests: - -* slf4j-simple v1.7.25 -* junit v4.12 -* easymock v3.6 - -## UPGRADING FROM EARLIER RELEASES - -Release with the same major number are intended to be drop-in -replacements. However, in most cases the versions of dependency jars -must be adjusted because newer versions of Velocity might require -updates. - -### Upgrading from Velocity Tools 2.0 to Velocity Tools 3.0 - - Dependency changes - -* Velocity Tools now relies on the use of Velocity Engine 2.0, and also switched -to the slf4j logging system. -* commons-beanutils:commons-beanutils has been updated to 1.9.3 -* org.apache.commons:commons-digester3 has been updated to 3.2 -* com.googlecode.json-simple 1.1.1 is now needed (only at compile time) -* for tests, junit:junit has been updated to 4.12 and org.easymock:easymock to 3.6 - - Behavor / API changes - -* tools autoloading turned off by default -With velocity-tools-view in a webapp context, if you want the default -tools loaded without explicitely loading them yourslef, you will have to enable autoloading in your `web.xml` file: - - - org.apache.velocity.tools.loadDefaults - true - - -(or the same with `` for a single servlet). -* the WebappResourceLoader, as other Engine loaders, now returns a Reader rather than an InputStream -* the unmaintained Struts tools have been dropped -* there are several new tools: LogTool, JsonTool, CollectionTool -* several tools became deprecated: AlternateTool, SortTool, ConversionTool (conversion methods are now located in DateTool and NumberTool) - -You can consult [the full list of changes](http://velocity.apache.org/tools/3.0/changes.html) - -## Upgrading from earlier versions - -Please refer to [Tools 2.0 upgrading instructions](http://velocity.apache.org/tools/2.0/upgrading.html). - -## Building Apache Velocity Tools - -In order to use the latest version of Apache Velocity Tools, you may want to build it. - -Building is easy. All components necessary to build are included or get -downloaded from the internet during the build, except for the Java SDK and the Maven build tool. - -**IMPORTANT** As the Apache Velocity Tools build process wants to download a number of jars -from the internet, you must be online when you are building for the first time. - -To build the Velocity Tools' jars, just run maven using the command: - -mvn - -This will create a `target/` directory containing the Velocity tools `.jar` -file in each sub-module directory. +Apache Velocity Tools require at least Java 8 to run. ## Feedback
(velocity-tools) branch skim-readme created (now 50babae7)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch skim-readme in repository https://gitbox.apache.org/repos/asf/velocity-tools.git at 50babae7 Skim and correct README This branch includes the following new commits: new 50babae7 Skim and correct README The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(velocity-tools) branch upgrade-easymock updated (ad50b88e -> 0fcf6125)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch upgrade-easymock in repository https://gitbox.apache.org/repos/asf/velocity-tools.git discard ad50b88e Upgrade to EasyMock 5.2.0 add 1f2ae807 Downgrade to Velocity Engine 2.3 new 0fcf6125 [VELTOOLS-207] Upgrade to EasyMock 5.2.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ad50b88e) \ N -- N -- N refs/heads/upgrade-easymock (0fcf6125) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(velocity-tools) 01/01: [VELTOOLS-207] Upgrade to EasyMock 5.2.0
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch upgrade-easymock in repository https://gitbox.apache.org/repos/asf/velocity-tools.git commit 0fcf61256ae64dface2cc0f3e7f3f9697a6f23c5 Author: Michael Osipov AuthorDate: Tue Feb 13 18:07:39 2024 +0100 [VELTOOLS-207] Upgrade to EasyMock 5.2.0 This closes #17 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9d79920b..3ebfbad2 100644 --- a/pom.xml +++ b/pom.xml @@ -180,7 +180,7 @@ org.easymock easymock -4.2 +5.2.0
(velocity-tools) branch upgrade-easymock created (now ad50b88e)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch upgrade-easymock in repository https://gitbox.apache.org/repos/asf/velocity-tools.git at ad50b88e Upgrade to EasyMock 5.2.0 This branch includes the following new commits: new ad50b88e Upgrade to EasyMock 5.2.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(velocity-tools) branch master updated: Downgrade to Velocity Engine 2.3
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/velocity-tools.git The following commit(s) were added to refs/heads/master by this push: new 1f2ae807 Downgrade to Velocity Engine 2.3 1f2ae807 is described below commit 1f2ae8071d15efd514bfe5d4bda75b9e66de0bec Author: Michael Osipov AuthorDate: Tue Feb 13 21:35:28 2024 +0100 Downgrade to Velocity Engine 2.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a103f4b4..9d79920b 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ org.apache.velocity velocity-engine-core -2.4 +2.3 org.apache.commons
(velocity-engine) branch remove-outdated-test created (now 49b46992)
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a change to branch remove-outdated-test in repository https://gitbox.apache.org/repos/asf/velocity-engine.git at 49b46992 Remove obsolete test This branch includes the following new commits: new 49b46992 Remove obsolete test The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(velocity-engine) 01/01: Remove obsolete test
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch remove-outdated-test
in repository https://gitbox.apache.org/repos/asf/velocity-engine.git
commit 49b46992e359acb1e7a4421c1911a377ac45ff03
Author: Michael Osipov
AuthorDate: Tue Feb 13 18:03:09 2024 +0100
Remove obsolete test
This test claims that with Java 8 it is obsolete, moreover it fails on
newer Java versions due to the setup of a security manager. Since we
require Java 8 already, the test is obsolete and can be removed.
---
.../velocity/test/issues/VelTools66TestCase.java | 181 -
1 file changed, 181 deletions(-)
diff --git
a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java
b/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java
deleted file mode 100644
index 529683ff..
---
a/velocity-engine-core/src/test/java/org/apache/velocity/test/issues/VelTools66TestCase.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.apache.velocity.test.issues;
-
-/*
- * 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.
- */
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.RuntimeInstance;
-import org.apache.velocity.test.BaseTestCase;
-import org.apache.velocity.test.misc.TestLogger;
-import org.apache.velocity.util.introspection.Introspector;
-
-import java.lang.reflect.Method;
-import java.security.AccessControlException;
-import java.security.Permission;
-
-/**
- * Test Case for https://issues.apache.org/jira/browse/VELTOOLS-66;>Velocity Tools Issue
66.
- */
-public class VelTools66TestCase
-extends BaseTestCase
-{
-protected static boolean DEBUG = false;
-
-public VelTools66TestCase(final String name)
-throws Exception
-{
-super(name);
-}
-
-public static Test suite()
-{
-return new TestSuite(VelTools66TestCase.class);
-}
-
-@Override
-public void setUp()
-throws Exception
-{
-Velocity.setProperty(
-Velocity.RUNTIME_LOG_INSTANCE, new TestLogger());
-
-Velocity.init();
-System.setSecurityManager(new TestSecurityManager());
-
-}
-
-protected static void log(String out)
-{
-Velocity.getLog().debug(out);
-if (DEBUG)
-{
-System.out.println(out);
-}
-}
-
-@Override
-public void tearDown()
-{
-System.setSecurityManager(null);
-}
-
-public void testVelTools66()
-throws Exception
-{
-/* the testcase is obsolete in JDK 8, as
SystemManager.checkMemberAccess is not anymore called
- * by Class.getMethods() */
-
-String [] javaVersionFields =
System.getProperty("java.version").split("\\.");
-int javaVersion = Integer.parseInt(javaVersionFields[0]);
-if (javaVersion == 1)
-{
-javaVersion = Integer.parseInt(javaVersionFields[1]);
-}
-
-if (javaVersion >= 8)
-{
-return;
-}
-
-Method verifyMethod = TestInterface.class.getMethod("getTestValue");
-
-RuntimeInstance ri = new RuntimeInstance();
-log = new TestLogger(false, false);
-Introspector introspector = new Introspector(log);
-
-Method testMethod = introspector.getMethod(TestObject.class,
"getTestValue", new Object[0]);
-assertNotNull(testMethod);
-assertEquals("Method object does not match!", verifyMethod,
testMethod);
-}
-
-public interface TestInterface
-{
-String getTestValue();
-
-void setTestValue(String testValue);
-}
-
-public static final class TestObject
-implements TestInterface
-{
-String testValue = null;
-
-public TestObject()
-{
-}
-
-@Override
-public String getTestValue()
-{
-return testValue;
-}
-
-@Override
-public void setTestValue(final String testValue)
-{
-this.testValue = testValue;
-}
-}
-
-public static final
(velocity-tools) 01/01: Upgrade to EasyMock 5.2.0
This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch upgrade-easymock in repository https://gitbox.apache.org/repos/asf/velocity-tools.git commit ad50b88eda0f1478b59322275695e97df8c940c4 Author: Michael Osipov AuthorDate: Tue Feb 13 18:07:39 2024 +0100 Upgrade to EasyMock 5.2.0 This fixes test failures on newer Java versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a103f4b4..8ea22b5e 100644 --- a/pom.xml +++ b/pom.xml @@ -180,7 +180,7 @@ org.easymock easymock -4.2 +5.2.0
