Merge branch 'release-1.1'

CHANGELOG.md

@@ -3,6 +3,16 @@
 The format here is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1] - 2023-07-06
+### Changed
+- Updated some dependency versions (Surefire, JUnit).
+
+### Fixed
+- Changed `log4j-slf4j-impl` → `slf4j-api` (but adds
+  `log4j-slf4j2-impl` for unit tests).
+- Fixed issue with over-eager property truncation, leading to
+  occasional invalid CSS.
+
 ## [1.0] - 2021-12-29
 ### Changed
 - Updated some dependency versions.

README.md

@@ -50,7 +50,7 @@ dependency:
     <dependency>
       <groupId>net.logicsquad</groupId>
       <artifactId>minifier</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
     </dependency>
 
 If you're building a Maven project, and just want to minify project

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.logicsquad</groupId>
   <artifactId>minifier</artifactId>
-  <version>1.0</version>
+  <version>1.1</version>
   <name>Minifier</name>
   <description>Java-based minification for web resources.</description>
   <url>https://github.com/logicsquad/minifier</url>
@@ -193,7 +193,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0-M5</version>
+        <version>3.1.2</version>
         <executions>
           <execution>
             <id>default-test</id>
@@ -300,16 +300,33 @@
     </plugins>
   </reporting>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.9.1</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>2.0.6</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <version>2.17.1</version>
+      <artifactId>log4j-slf4j2-impl</artifactId>
+      <version>2.20.0</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.8.2</version>
+      <artifactId>junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

src/main/java/net/logicsquad/minifier/css/CSSMinifier.java

@@ -219,7 +219,10 @@ public Selector(String selector)
 				if (contents.length() == 1) {
 					throw new EmptySelectorBodyException(selector);
 				}
-				contents = contents.substring(0, contents.length() - 2);
+				contents = contents.substring(0, contents.length() - 1);
+				if (contents.charAt(contents.length() - 1) == ';') {
+					contents = contents.substring(0, contents.length() - 1);
+				}
 
 				this.properties = new Property[0];
 				this.properties = parseProperties(contents).toArray(this.properties);

src/test/java/net/logicsquad/minifier/css/CSSMinifierTest.java

@@ -16,8 +16,8 @@ public class CSSMinifierTest extends AbstractMinifierTest {
 	/**
 	 * Indexes for input/output resources
 	 */
-	private static final List<String> RESOURCES = Arrays.asList("01", "02", "03", "04", "05", "06", "07", "08", "09",
-			"10", "11", "12", "13", "14", "15", "16", "17", "18");
+	private static final List<String> RESOURCES = Arrays.asList("01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16",
+			"17", "18", "19", "20", "21", "22", "23", "24", "25");
 
 	/**
 	 * Extension for resource files

src/test/resources/input/test-19.css

@@ -0,0 +1,3 @@
+.hacked-var {
+    color: var(--vert)
+}

src/test/resources/input/test-20.css

@@ -0,0 +1,3 @@
+.hacked-content:before {
+    content: "Quantité x"
+}

src/test/resources/input/test-21.css

@@ -0,0 +1,3 @@
+.hacked-important {
+     width: 50% !important
+}

src/test/resources/input/test-22.css

@@ -0,0 +1,3 @@
+.background-linear {
+    background: linear-gradient(0deg, rgba(152, 152, 139, 0.468207351299895) 0%, rgba(255, 255, 255, 0) 100%);
+}

src/test/resources/input/test-23.css

@@ -0,0 +1,3 @@
+.grid-template {
+    grid-template-columns: repeat(5, minmax(15%, 1fr));
+}

src/test/resources/input/test-24.css

@@ -0,0 +1,3 @@
+.calc {
+    top: calc((40px - 1.75rem) / 2);
+}

src/test/resources/log4j2.properties

@@ -0,0 +1,18 @@
+status=error
+name=PropertiesConfig
+
+filters=threshold
+
+filter.threshold.type=ThresholdFilter
+filter.threshold.level=debug
+
+appenders=console
+
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c %m%n
+
+rootLogger.level=info
+rootLogger.appenderRefs=stdout
+rootLogger.appenderRef.stdout.ref=STDOUT

src/test/resources/output/test-19.css

@@ -0,0 +1 @@
+.hacked-var{color:var(--vert)}

src/test/resources/output/test-20.css

@@ -0,0 +1 @@
+.hacked-content:before{content:"Quantité x"}

src/test/resources/output/test-21.css

@@ -0,0 +1 @@
+.hacked-important{width:50%!important}

src/test/resources/output/test-23.css

@@ -0,0 +1 @@
+.grid-template{grid-template-columns:repeat(5,minmax(15%,1fr))}

src/test/resources/output/test-24.css

@@ -0,0 +1 @@
+.calc{top:calc((40px - 1.75rem) / 2)}