Adapted distribution to 3.1.0.M1

thymeleaf · Jan 30, 2022 · 451772b · 451772b
1 parent 5270037
commit 451772b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 41 deletions.
diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
   <groupId>org.thymeleaf</groupId>
   <artifactId>thymeleaf-dist</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.14.RELEASE</version>
+  <version>3.1.0.M1</version>
   <name>thymeleaf-dist</name>
   <url>http://www.thymeleaf.org</url>
 
@@ -156,24 +156,17 @@
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.thymeleaf</groupId>
-      <artifactId>thymeleaf-spring3</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-    </dependency>
 
     <dependency>
       <groupId>org.thymeleaf</groupId>
-      <artifactId>thymeleaf-spring4</artifactId>
+      <artifactId>thymeleaf-spring5</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>org.thymeleaf</groupId>
-      <artifactId>thymeleaf-spring5</artifactId>
+      <artifactId>thymeleaf-spring6</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>

diff --git a/src/assembly/dist.xml b/src/assembly/dist.xml
@@ -18,22 +18,15 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>${basedir}/../thymeleaf-spring/thymeleaf-spring3/target/checkout/thymeleaf-spring3/target/apidocs/</directory>
-      <outputDirectory>/apidocs/thymeleaf-spring3/</outputDirectory>
-      <includes>
-        <include>**/*</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${basedir}/../thymeleaf-spring/thymeleaf-spring4/target/checkout/thymeleaf-spring4/target/apidocs/</directory>
-      <outputDirectory>/apidocs/thymeleaf-spring4/</outputDirectory>
+      <directory>${basedir}/../thymeleaf-spring/thymeleaf-spring5/target/checkout/thymeleaf-spring5/target/apidocs/</directory>
+      <outputDirectory>/apidocs/thymeleaf-spring5/</outputDirectory>
       <includes>
         <include>**/*</include>
       </includes>
     </fileSet>
     <fileSet>
-      <directory>${basedir}/../thymeleaf-spring/thymeleaf-spring5/target/checkout/thymeleaf-spring5/target/apidocs/</directory>
-      <outputDirectory>/apidocs/thymeleaf-spring5/</outputDirectory>
+      <directory>${basedir}/../thymeleaf-spring/thymeleaf-spring6/target/checkout/thymeleaf-spring6/target/apidocs/</directory>
+      <outputDirectory>/apidocs/thymeleaf-spring6/</outputDirectory>
       <includes>
         <include>**/*</include>
       </includes>
@@ -48,30 +41,21 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>${basedir}/../thymeleaf-spring/thymeleaf-spring3/target/checkout/thymeleaf-spring3/target/</directory>
-      <outputDirectory>/dist</outputDirectory>
-      <includes>
-        <include>thymeleaf-spring3-${project.version}.jar</include>
-        <include>thymeleaf-spring3-${project.version}-javadoc.jar</include>
-        <include>thymeleaf-spring3-${project.version}-sources.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>${basedir}/../thymeleaf-spring/thymeleaf-spring4/target/checkout/thymeleaf-spring4/target/</directory>
+      <directory>${basedir}/../thymeleaf-spring/thymeleaf-spring5/target/checkout/thymeleaf-spring5/target/</directory>
       <outputDirectory>/dist</outputDirectory>
       <includes>
-        <include>thymeleaf-spring4-${project.version}.jar</include>
-        <include>thymeleaf-spring4-${project.version}-javadoc.jar</include>
-        <include>thymeleaf-spring4-${project.version}-sources.jar</include>
+        <include>thymeleaf-spring5-${project.version}.jar</include>
+        <include>thymeleaf-spring5-${project.version}-javadoc.jar</include>
+        <include>thymeleaf-spring5-${project.version}-sources.jar</include>
       </includes>
     </fileSet>
     <fileSet>
-      <directory>${basedir}/../thymeleaf-spring/thymeleaf-spring5/target/checkout/thymeleaf-spring5/target/</directory>
+      <directory>${basedir}/../thymeleaf-spring/thymeleaf-spring6/target/checkout/thymeleaf-spring6/target/</directory>
       <outputDirectory>/dist</outputDirectory>
       <includes>
-        <include>thymeleaf-spring5-${project.version}.jar</include>
-        <include>thymeleaf-spring5-${project.version}-javadoc.jar</include>
-        <include>thymeleaf-spring5-${project.version}-sources.jar</include>
+        <include>thymeleaf-spring6-${project.version}.jar</include>
+        <include>thymeleaf-spring6-${project.version}-javadoc.jar</include>
+        <include>thymeleaf-spring6-${project.version}-sources.jar</include>
       </includes>
     </fileSet>
     <fileSet>
@@ -93,9 +77,8 @@
       <scope>runtime</scope>
       <excludes>
         <exclude>org.thymeleaf:thymeleaf</exclude>
-        <exclude>org.thymeleaf:thymeleaf-spring3</exclude>
-        <exclude>org.thymeleaf:thymeleaf-spring4</exclude>
-        <exclude>org.thymeleaf:thymeleaf-spring5</exclude>
+	<exclude>org.thymeleaf:thymeleaf-spring5</exclude>
+	<exclude>org.thymeleaf:thymeleaf-spring6</exclude>
         <exclude>org.thymeleaf:thymeleaf-dist</exclude>
       </excludes>
     </dependencySet>