This is an automated email from the ASF dual-hosted git repository. michaelo pushed a commit to branch VELOCITY-971 in repository https://gitbox.apache.org/repos/asf/velocity-engine.git
commit a61516e964a15413a1b53e4522da00454c7882f6 Author: Michael Osipov <[email protected]> AuthorDate: Sat Feb 3 19:40:31 2024 +0100 [VELOCITY-971] Upgrade to Parent 6 --- pom.xml | 121 ++------------------------------- spring-velocity-support/pom.xml | 5 -- velocity-custom-parser-example/pom.xml | 4 +- velocity-engine-core/pom.xml | 11 +-- velocity-engine-scripting/pom.xml | 5 -- 5 files changed, 8 insertions(+), 138 deletions(-) diff --git a/pom.xml b/pom.xml index 3ca88df4..a2e446c7 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.velocity</groupId> <artifactId>velocity-master</artifactId> - <version>5</version> + <version>6</version> <relativePath /> </parent> @@ -43,29 +43,14 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <junit.version>4.13.2</junit.version> <slf4j.version>1.7.30</slf4j.version> - <surefire.plugin.version>2.22.1</surefire.plugin.version> - <jira.browse.url>https://issues.apache.org/jira/browse</jira.browse.url> - <maven.compiler.source>1.8</maven.compiler.source> - <maven.compiler.target>1.8</maven.compiler.target> </properties> <build> <defaultGoal>install</defaultGoal> <pluginManagement> <plugins> - <plugin> - <artifactId>maven-release-plugin</artifactId> - <version>3.0.0-M1</version> - <configuration> - <useReleaseProfile>false</useReleaseProfile> - <autoVersionSubmodules>true</autoVersionSubmodules> - <goals>deploy</goals> - <arguments>-Papache-release</arguments> - </configuration> - </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId> - <version>3.1.2</version> <configuration> <archive> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> @@ -80,74 +65,23 @@ <execution> <id>bundle-manifest</id> <phase>process-classes</phase> - <goals> + <goals> <goal>manifest</goal> - </goals> + </goals> </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>3.1.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>3.1.0</version> - </plugin> <plugin> <groupId>com.google.code.maven-replacer-plugin</groupId> <artifactId>replacer</artifactId> <version>1.5.3</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clean-plugin</artifactId> - <version>3.1.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>3.1.0</version> - <configuration> - <includePom>false</includePom> - </configuration> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar-no-fork</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>extra-enforcer-rules</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>3.2.0</version> - </plugin> </plugins> </pluginManagement> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <showDeprecation>true</showDeprecation> - <showWarning>true</showWarning> - <source>${maven.compiler.source}</source> - <target>${maven.compiler.target}</target> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>3.1.1</version> <configuration> <!-- full checking is left disabled <doclint>html,missing,reference,syntax</doclint> @@ -163,58 +97,13 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>enforce-bytecode-version</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <enforceBytecodeVersion> - <maxJdkVersion>${maven.compiler.target}</maxJdkVersion> - </enforceBytecodeVersion> - <requireJavaVersion> - <version>[1.8,)</version> - </requireJavaVersion> - </rules> - <fail>true</fail> - </configuration> - </execution> - <execution> - <id>ban-known-bad-maven-versions</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireMavenVersion> - <version>[3.0.5,)</version> - <message>Maven minimal expected version is 3.0.5.</message> - </requireMavenVersion> - </rules> - </configuration> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.codehaus.mojo</groupId> - <artifactId>extra-enforcer-rules</artifactId> - <version>1.3</version> - </dependency> - </dependencies> - </plugin> </plugins> </build> <distributionManagement> <site> <id>velocity.apache.org</id> - <url>scpexe://people.apache.org/www/velocity.apache.org/engine/devel/ - </url> + <url>scpexe://people.apache.org/www/velocity.apache.org/engine/devel/</url> </site> </distributionManagement> @@ -227,7 +116,7 @@ <issueManagement> <system>JIRA</system> - <url>${jira.browse.url}/VELOCITY</url> + <url>https://issues.apache.org/jira/browse/VELOCITY</url> </issueManagement> <modules> <module>velocity-engine-core</module> diff --git a/spring-velocity-support/pom.xml b/spring-velocity-support/pom.xml index 1ff931b0..ade1f408 100644 --- a/spring-velocity-support/pom.xml +++ b/spring-velocity-support/pom.xml @@ -68,14 +68,9 @@ </dependencies> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire.plugin.version}</version> <configuration> <systemProperties> <property> diff --git a/velocity-custom-parser-example/pom.xml b/velocity-custom-parser-example/pom.xml index 72c6ab73..4844488d 100644 --- a/velocity-custom-parser-example/pom.xml +++ b/velocity-custom-parser-example/pom.xml @@ -243,14 +243,12 @@ import org.apache.velocity.runtime.parser.node.*;</value> </execution> </executions> </plugin> - + <!-- tests --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire.plugin.version}</version> <configuration> - <skip>${maven.test.skip}</skip> <systemProperties> <property> <name>test</name> diff --git a/velocity-engine-core/pom.xml b/velocity-engine-core/pom.xml index 8ec2e390..43114183 100644 --- a/velocity-engine-core/pom.xml +++ b/velocity-engine-core/pom.xml @@ -41,7 +41,7 @@ <parser.char.at>@</parser.char.at> <parser.char.dollar>$</parser.char.dollar> <parser.char.hash>#</parser.char.hash> - + <!-- You can modify those properties locally to test the DataSourceResourceLoader against other engines. Please note that you may have to also alter the file @@ -59,10 +59,6 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> @@ -112,7 +108,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>3.2.1</version> <executions> <execution> <id>shade</id> @@ -174,7 +169,7 @@ </configuration> </execution> </executions> - </plugin> + </plugin> <!-- post-processing of parser genereted source files --> <plugin> @@ -236,9 +231,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire.plugin.version}</version> <configuration> - <skip>${maven.test.skip}</skip> <systemProperties> <property> <name>test</name> diff --git a/velocity-engine-scripting/pom.xml b/velocity-engine-scripting/pom.xml index 1c6eaf9f..3811ffb8 100644 --- a/velocity-engine-scripting/pom.xml +++ b/velocity-engine-scripting/pom.xml @@ -49,14 +49,9 @@ </dependencies> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire.plugin.version}</version> <configuration> <systemProperties> <property>
