Skip to content

Commit 03cf0bb

Browse files
committed
Updated to ph-commons v12
1 parent d77a8e3 commit 03cf0bb

File tree

236 files changed

+2731
-2687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+2731
-2687
lines changed

.github/workflows/maven.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@ name: Maven build
1919

2020
on:
2121
push:
22-
branches:
23-
- master
22+
pull_request:
2423

2524
jobs:
2625
build:
2726
runs-on: ubuntu-latest
2827
strategy:
2928
matrix:
30-
java: [ 11, 17, 21, 24 ]
29+
java: [ 17, 21, 24 ]
3130
name: Java ${{ matrix.java }} build
3231

3332
steps:
@@ -51,11 +50,11 @@ jobs:
5150
5251
- name: Publish to the Maven Central Repository
5352
run: mvn --batch-mode --update-snapshots -P release-snapshot deploy
54-
if: matrix.java == 11
53+
if: matrix.java == 17
5554
env:
5655
MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
5756
MAVEN_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
5857

5958
- name: Maven Build
6059
run: mvn --batch-mode --update-snapshots install
61-
if: matrix.java != 11
60+
if: matrix.java != 17

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,8 @@ Configuration items are:
314314

315315
## News and noteworthy
316316

317+
318+
317319
v7.1.0 - 2025-08-20
318320
* Improved the selector list handling in the grammar and added `@layer` support. See [#111](https://github.com/phax/ph-css/pull/111) - thx @shagkur and @jmini
319321
* This also fixes the issue #110

ph-css/pom.xml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,37 +61,44 @@
6161
<dependencies>
6262
<dependency>
6363
<groupId>com.helger.commons</groupId>
64-
<artifactId>ph-commons</artifactId>
64+
<artifactId>ph-typeconvert</artifactId>
6565
</dependency>
66-
6766
<dependency>
68-
<groupId>com.github.spotbugs</groupId>
69-
<artifactId>spotbugs-annotations</artifactId>
70-
<version>${spotbugs-annotations.version}</version>
71-
<scope>compile</scope>
72-
<optional>true</optional>
67+
<groupId>com.helger.commons</groupId>
68+
<artifactId>ph-collection</artifactId>
7369
</dependency>
74-
7570
<dependency>
76-
<groupId>junit</groupId>
77-
<artifactId>junit</artifactId>
78-
<scope>test</scope>
71+
<groupId>com.helger.commons</groupId>
72+
<artifactId>ph-cache</artifactId>
7973
</dependency>
8074
<dependency>
8175
<groupId>com.helger.commons</groupId>
82-
<artifactId>ph-collection</artifactId>
83-
<scope>test</scope>
76+
<artifactId>ph-io</artifactId>
8477
</dependency>
8578
<dependency>
8679
<groupId>com.helger.commons</groupId>
87-
<artifactId>ph-xml</artifactId>
80+
<artifactId>ph-mime</artifactId>
81+
</dependency>
82+
<dependency>
83+
<groupId>com.helger.commons</groupId>
84+
<artifactId>ph-text</artifactId>
85+
</dependency>
86+
87+
<dependency>
88+
<groupId>junit</groupId>
89+
<artifactId>junit</artifactId>
8890
<scope>test</scope>
8991
</dependency>
9092
<dependency>
9193
<groupId>org.slf4j</groupId>
9294
<artifactId>slf4j-simple</artifactId>
9395
<scope>test</scope>
9496
</dependency>
97+
<dependency>
98+
<groupId>com.helger.commons</groupId>
99+
<artifactId>ph-xml</artifactId>
100+
<scope>test</scope>
101+
</dependency>
95102
</dependencies>
96103

97104
<pluginRepositories>

ph-css/src/main/java/com/helger/css/CCSS.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
*/
1717
package com.helger.css;
1818

19-
import javax.annotation.concurrent.Immutable;
20-
21-
import com.helger.commons.annotation.PresentForCodeCoverage;
19+
import com.helger.annotation.concurrent.Immutable;
20+
import com.helger.annotation.style.PresentForCodeCoverage;
2221

2322
/**
2423
* Contains CSS style constants and utility stuff. Only constants that are part

ph-css/src/main/java/com/helger/css/CSSFilenameHelper.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
*/
1717
package com.helger.css;
1818

19-
import javax.annotation.Nonnull;
20-
import javax.annotation.Nullable;
21-
import javax.annotation.concurrent.Immutable;
19+
import com.helger.annotation.concurrent.Immutable;
20+
import com.helger.annotation.style.PresentForCodeCoverage;
21+
import com.helger.base.enforce.ValueEnforcer;
22+
import com.helger.base.string.StringHelper;
2223

23-
import com.helger.commons.ValueEnforcer;
24-
import com.helger.commons.annotation.PresentForCodeCoverage;
25-
import com.helger.commons.string.StringHelper;
24+
import jakarta.annotation.Nonnull;
25+
import jakarta.annotation.Nullable;
2626

2727
/**
2828
* Utility methods to deal with CSS filenames.

ph-css/src/main/java/com/helger/css/CSSSourceArea.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
*/
1717
package com.helger.css;
1818

19-
import javax.annotation.CheckForSigned;
20-
import javax.annotation.Nonnull;
21-
import javax.annotation.concurrent.Immutable;
19+
import com.helger.annotation.CheckForSigned;
20+
import com.helger.annotation.Nonempty;
21+
import com.helger.annotation.concurrent.Immutable;
22+
import com.helger.base.hashcode.HashCodeGenerator;
23+
import com.helger.base.tostring.ToStringGenerator;
2224

23-
import com.helger.commons.annotation.Nonempty;
24-
import com.helger.commons.hashcode.HashCodeGenerator;
25-
import com.helger.commons.string.ToStringGenerator;
25+
import jakarta.annotation.Nonnull;
2626

2727
/**
2828
* Defines the source location of a single token when reading CSS from a stream.

ph-css/src/main/java/com/helger/css/CSSSourceLocation.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
*/
1717
package com.helger.css;
1818

19-
import javax.annotation.CheckForSigned;
20-
import javax.annotation.Nonnull;
21-
import javax.annotation.Nullable;
22-
import javax.annotation.concurrent.Immutable;
23-
24-
import com.helger.commons.CGlobal;
25-
import com.helger.commons.ValueEnforcer;
26-
import com.helger.commons.annotation.Nonempty;
27-
import com.helger.commons.equals.EqualsHelper;
28-
import com.helger.commons.hashcode.HashCodeGenerator;
29-
import com.helger.commons.string.StringHelper;
30-
import com.helger.commons.string.ToStringGenerator;
19+
import com.helger.annotation.CheckForSigned;
20+
import com.helger.annotation.Nonempty;
21+
import com.helger.annotation.concurrent.Immutable;
22+
import com.helger.base.CGlobal;
23+
import com.helger.base.enforce.ValueEnforcer;
24+
import com.helger.base.equals.EqualsHelper;
25+
import com.helger.base.hashcode.HashCodeGenerator;
26+
import com.helger.base.string.StringHelper;
27+
import com.helger.base.tostring.ToStringGenerator;
28+
29+
import jakarta.annotation.Nonnull;
30+
import jakarta.annotation.Nullable;
3131

3232
/**
3333
* Defines the source location of an object when reading CSS from a stream. It

0 commit comments

Comments
 (0)