Skip to content

Commit c3ab85e

Browse files
scordioscordio
committed
Replace assertj-parent-pom with assertj-parent 3.27.6
This change also simplifies the POM configuration and brings the necessary pieces to publish to the Central Publisher Portal.
1 parent 611ca51 commit c3ab85e

File tree

6 files changed

+154
-68
lines changed

6 files changed

+154
-68
lines changed

‎javadoc-theme/assertj-theme.css‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
:root {
2+
/* body, block and code fonts */
3+
--body-font-family: Verdana, Geneva, sans-serif;
4+
--block-font-family: Verdana, Geneva, serif;
5+
/* Text colors for body and block elements */
6+
--body-text-color: #000000;
7+
--block-text-color: #000000;
8+
/* Background colors for various structural elements */
9+
--body-background-color: #edd9a6;
10+
--section-background-color: #e9d195;
11+
--detail-background-color: #edd9a6;
12+
/* Colors for navigation bar and table captions */
13+
--navbar-background-color: #232323;
14+
--navbar-text-color: #edd9a6;
15+
/* Background color for subnavigation and various headers */
16+
--subnav-background-color: #e5c880;
17+
/* Background and text colors for selected tabs and navigation items */
18+
--selected-background-color: #e5c880;
19+
--selected-text-color: #000000;
20+
--selected-link-color: #861203;
21+
/* Background colors for generated tables */
22+
--even-row-color: #edd9a6;
23+
--odd-row-color: #e7ce8e;
24+
/* Text color for page title */
25+
--title-color: #000000;
26+
/* Text colors for links */
27+
--link-color: #861203;
28+
--link-color-active: #641003;
29+
/* Border colors for structural elements and user defined tables */
30+
--border-color: #e5c880;
31+
/* Search input colors */
32+
--search-input-background-color: #edd9a6;
33+
}

‎javadoc-theme/hljs-theme.css‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
/*
2+
3+
Railscasts-like style (c) Visoft, Inc. (Damien White)
4+
5+
*/
6+
7+
.hljs {
8+
display: block;
9+
overflow-x: auto;
10+
padding: 0.5em;
11+
background: #232323;
12+
color: #e6e1dc;
13+
/* added by us */
14+
border-radius:8px;
15+
}
16+
17+
.hljs-comment,
18+
.hljs-quote {
19+
color: #bc9458;
20+
font-style: italic;
21+
}
22+
23+
.hljs-keyword,
24+
.hljs-selector-tag {
25+
color: #c26230;
26+
}
27+
28+
.hljs-string,
29+
.hljs-number,
30+
.hljs-regexp,
31+
.hljs-variable,
32+
.hljs-template-variable {
33+
color: #a5c261;
34+
}
35+
36+
.hljs-subst {
37+
color: #519f50;
38+
}
39+
40+
.hljs-tag,
41+
.hljs-name {
42+
color: #e8bf6a;
43+
}
44+
45+
.hljs-type {
46+
color: #ffc66d;
47+
}
48+
49+
50+
.hljs-symbol,
51+
.hljs-bullet,
52+
.hljs-built_in,
53+
.hljs-builtin-name,
54+
.hljs-attr,
55+
.hljs-link {
56+
color: #6d9cbe;
57+
}
58+
59+
.hljs-params {
60+
color: #d0d0ff;
61+
}
62+
63+
.hljs-attribute {
64+
color: #cda869;
65+
}
66+
67+
.hljs-meta {
68+
color: #9b859d;
69+
}
70+
71+
.hljs-title,
72+
.hljs-section {
73+
color: #ffc66d;
74+
}
75+
76+
.hljs-addition {
77+
background-color: #144212;
78+
color: #e6e1dc;
79+
display: inline-block;
80+
width: 100%;
81+
}
82+
83+
.hljs-deletion {
84+
background-color: #600;
85+
color: #e6e1dc;
86+
display: inline-block;
87+
width: 100%;
88+
}
89+
90+
.hljs-selector-class {
91+
color: #9b703f;
92+
}
93+
94+
.hljs-selector-id {
95+
color: #8b98ab;
96+
}
97+
98+
.hljs-emphasis {
99+
font-style: italic;
100+
}
101+
102+
.hljs-strong {
103+
font-weight: bold;
104+
}
105+
106+
.hljs-link {
107+
text-decoration: underline;
108+
}

‎pom.xml‎

Lines changed: 3 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
<parent>
77
<groupId>org.assertj</groupId>
8-
<artifactId>assertj-parent-pom</artifactId>
9-
<version>2.2.18</version>
8+
<artifactId>assertj-parent</artifactId>
9+
<version>3.27.6</version>
1010
</parent>
1111

1212
<artifactId>assertj-vavr</artifactId>
@@ -16,13 +16,6 @@
1616
<description>Rich and fluent assertions for testing Vavr tools</description>
1717
<inceptionYear>2017</inceptionYear>
1818

19-
<licenses>
20-
<license>
21-
<name>The Apache License, Version 2.0</name>
22-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
23-
</license>
24-
</licenses>
25-
2619
<scm>
2720
<developerConnection>scm:git:[email protected]:assertj/assertj-vavr.git</developerConnection>
2821
<connection>scm:git:[email protected]:assertj/assertj-vavr.git</connection>
@@ -68,40 +61,11 @@
6861
<url>https://github.com/assertj/assertj-vavr/issues</url>
6962
</issueManagement>
7063

71-
<distributionManagement>
72-
<snapshotRepository>
73-
<id>ossrh</id>
74-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
75-
</snapshotRepository>
76-
<repository>
77-
<id>ossrh</id>
78-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
79-
</repository>
80-
</distributionManagement>
81-
82-
<dependencyManagement>
83-
<dependencies>
84-
<dependency>
85-
<groupId>org.junit</groupId>
86-
<artifactId>junit-bom</artifactId>
87-
<version>5.11.3</version>
88-
<type>pom</type>
89-
<scope>import</scope>
90-
</dependency>
91-
<dependency>
92-
<groupId>junit</groupId>
93-
<artifactId>junit</artifactId>
94-
<version>4.13.2</version>
95-
<scope>test</scope>
96-
</dependency>
97-
</dependencies>
98-
</dependencyManagement>
99-
10064
<dependencies>
10165
<dependency>
10266
<groupId>org.assertj</groupId>
10367
<artifactId>assertj-core</artifactId>
104-
<version>3.26.3</version>
68+
<version>3.27.6</version>
10569
</dependency>
10670
<dependency>
10771
<groupId>io.vavr</groupId>
@@ -132,12 +96,6 @@
13296
</dependency>
13397
</dependencies>
13498

135-
<properties>
136-
<maven.compiler.release>8</maven.compiler.release>
137-
<maven.compiler.source>8</maven.compiler.source>
138-
<maven.compiler.target>8</maven.compiler.target>
139-
</properties>
140-
14199
<build>
142100
<plugins>
143101
<plugin>
@@ -156,23 +114,6 @@
156114
</execution>
157115
</executions>
158116
</plugin>
159-
160-
<plugin>
161-
<groupId>com.mycila</groupId>
162-
<artifactId>license-maven-plugin</artifactId>
163-
<configuration>
164-
<properties>
165-
<!-- Values to be substituted in template -->
166-
<currentYear>2024</currentYear>
167-
</properties>
168-
</configuration>
169-
</plugin>
170-
171-
<plugin>
172-
<groupId>org.apache.maven.plugins</groupId>
173-
<artifactId>maven-surefire-plugin</artifactId>
174-
</plugin>
175-
176117
<plugin>
177118
<groupId>org.jacoco</groupId>
178119
<artifactId>jacoco-maven-plugin</artifactId>

‎src/test/java/org/assertj/vavr/api/SetAssert_allSatisfy_Test.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ void should_fail_if_all_Set_elements_do_not_satisfy_consumer() {
6969
})
7070
)
7171
.isInstanceOf(AssertionError.class)
72-
.hasMessage("\n" +
72+
.hasMessageStartingWith("\n" +
7373
"Expecting all elements of:\n" +
7474
" HashSet(value1, value2)\n" +
7575
"to satisfy given requirements, but these elements did not:\n" +
7676
"\n" +
7777
"\"value2\"\n" +
78-
"error: \n" +
78+
"error: org.opentest4j.AssertionFailedError: \n" +
7979
"expected: \"value1\"\n" +
8080
" but was: \"value2\"");
8181
}

‎src/test/java/org/assertj/vavr/api/soft/JUnitSoftVavrAssertionsFailureTest.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,17 @@ public void should_rule_for_soft_assertion_work() {
3737
softly.assertThat(actual).as("instance").containsLeftInstanceOf(Long.class);
3838

3939
// WHEN simulating the rule
40-
MultipleFailuresError multipleFailuresError = catchThrowableOfType(() -> softly.apply(mock(Statement.class), null).evaluate(),
41-
MultipleFailuresError.class);
40+
MultipleFailuresError multipleFailuresError = catchThrowableOfType(MultipleFailuresError.class,
41+
() -> softly.apply(mock(Statement.class), null).evaluate());
4242

4343
// THEN
4444
List<Throwable> failures = multipleFailuresError.getFailures();
4545
assertThat(failures).hasSize(2);
46-
assertThat(failures.get(0)).hasMessageStartingWith(format("[contains] %nExpecting:%n <Left(something)>%nto contain:%n <\"else\">%nbut did not."));
46+
assertThat(failures.get(0)).hasMessageStartingWith(format("[contains] %nExpecting:%n" +
47+
" <Left(something)>%" +
48+
"nto contain:%n" +
49+
" <\"else\"> on the [LEFT]%n" +
50+
"but did not."));
4751
assertThat(failures.get(1)).hasMessageStartingWith(format("[instance] %nExpecting:%n" +
4852
" <Left>%n" +
4953
"to contain a value that is an instance of:%n" +

‎src/test/java/org/assertj/vavr/api/soft/SoftVavrAssertionsHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static void verifyErrors(Double evaluatedVal, MultipleFailuresError e) {
5959
assertThat(errors.get(7))
6060
.contains(format("java.lang.AssertionError: %nExpecting Lazy to be evaluated, but it was not"));
6161
assertThat(errors.get(8))
62-
.startsWith(format("java.lang.AssertionError: %nExpecting all elements of:%n HashSet(Frodo, Bilbo)%nto satisfy given requirements, but these elements did not:%n%n\"Bilbo\"%nerror: %nExpecting actual:%n \"Bilbo\"%nto start with:%n \"F\"%n"));
62+
.startsWith(format("java.lang.AssertionError: %nExpecting all elements of:%n HashSet(Frodo, Bilbo)%nto satisfy given requirements, but these elements did not:%n%n\"Bilbo\"%nerror: java.lang.AssertionError: %nExpecting actual:%n \"Bilbo\"%nto start with:%n \"F\"%n"));
6363
assertThat(errors.get(9))
6464
.contains(format("java.lang.AssertionError: %nExpected size: 1 but was: 2 in:%nHashSet(Frodo, Bilbo)"));
6565
assertThat(errors.get(10))

0 commit comments

Comments
 (0)