Skip to content

Commit a865760

Browse files
shagkurshagkur
committed
Merge remote-tracking branch 'upstream/master'
- fix pseudo 'is' nad 'where'
2 parents bff2bb3 + 699a1fe commit a865760

File tree

495 files changed

+1770
-12381
lines changed

Some content is hidden

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

495 files changed

+1770
-12381
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,14 @@ jobs:
4848
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
4949
restore-keys: |
5050
${{ runner.os }}-maven-
51-
52-
- name: Build and deploy with Maven
51+
52+
- name: Publish to the Maven Central Repository
5353
run: mvn --batch-mode --update-snapshots deploy
54+
if: matrix.Java == 11
5455
env:
5556
MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
5657
MAVEN_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
58+
59+
- name: Maven Build
60+
run: mvn --batch-mode --update-snapshots install
61+
if: matrix.Java != 11

‎README.md‎

Lines changed: 20 additions & 6 deletions

‎ph-css/findbugs-exclude.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
3-
Copyright (C) 2014-2024 Philip Helger (www.helger.com)
3+
Copyright (C) 2014-2025 Philip Helger (www.helger.com)
44
philip[at]helger[dot]com
55
66
Licensed under the Apache License, Version 2.0 (the "License");

‎ph-css/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (C) 2014-2024 Philip Helger (www.helger.com)
4+
Copyright (C) 2014-2025 Philip Helger (www.helger.com)
55
philip[at]helger[dot]com
66
77
Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>unblu.patched.com.helger</groupId>
2424
<artifactId>ph-css-parent-pom</artifactId>
25-
<version>7.0.3-SNAPSHOT</version>
25+
<version>7.0.5-SNAPSHOT</version>
2626
</parent>
2727
<artifactId>ph-css</artifactId>
2828
<packaging>bundle</packaging>
@@ -67,6 +67,7 @@
6767
<dependency>
6868
<groupId>com.github.spotbugs</groupId>
6969
<artifactId>spotbugs-annotations</artifactId>
70+
<version>${spotbugs-annotations.version}</version>
7071
<scope>compile</scope>
7172
<optional>true</optional>
7273
</dependency>

‎ph-css/src/etc/javadoc.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (C) 2014-2024 Philip Helger (www.helger.com)
2+
* Copyright (C) 2014-2025 Philip Helger (www.helger.com)
33
* philip[at]helger[dot]com
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");

‎ph-css/src/etc/license-template.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) 2014-2024 Philip Helger (www.helger.com)
1+
Copyright (C) 2014-2025 Philip Helger (www.helger.com)
22
philip[at]helger[dot]com
33

44
Licensed under the Apache License, Version 2.0 (the "License");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2014-2024 Philip Helger (www.helger.com)
2+
* Copyright (C) 2014-2025 Philip Helger (www.helger.com)
33
* philip[at]helger[dot]com
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2014-2024 Philip Helger (www.helger.com)
2+
* Copyright (C) 2014-2025 Philip Helger (www.helger.com)
33
* philip[at]helger[dot]com
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2014-2024 Philip Helger (www.helger.com)
2+
* Copyright (C) 2014-2025 Philip Helger (www.helger.com)
33
* philip[at]helger[dot]com
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2014-2024 Philip Helger (www.helger.com)
2+
* Copyright (C) 2014-2025 Philip Helger (www.helger.com)
33
* philip[at]helger[dot]com
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");

0 commit comments

Comments
 (0)