Skip to content

Commit 5a02fb0

Browse files
carterpagecarterpage
committed
Publish site and javadoc through maven.
Fix ordering of assertEquals parameters in test.
1 parent 60c5ed1 commit 5a02fb0

File tree

5 files changed

+35
-11
lines changed

5 files changed

+35
-11
lines changed

‎pom.xml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,32 @@
8080
</configuration>
8181
</plugin>
8282
</plugins>
83+
<extensions>
84+
<extension>
85+
<groupId>org.apache.maven.scm</groupId>
86+
<artifactId>maven-scm-provider-gitexe</artifactId>
87+
<version>1.3</version>
88+
</extension>
89+
<extension>
90+
<groupId>org.apache.maven.scm</groupId>
91+
<artifactId>maven-scm-manager-plexus</artifactId>
92+
<version>1.3</version>
93+
</extension>
94+
<extension>
95+
<groupId>org.kathrynhuxtable.maven.wagon</groupId>
96+
<artifactId>wagon-gitsite</artifactId>
97+
<version>0.3.1</version>
98+
</extension>
99+
</extensions>
83100
</build>
84101

102+
<distributionManagement>
103+
<site>
104+
<id>github-project-site</id>
105+
<url>gitsite:git@github.com/skyscreamer/JSONassert.git</url>
106+
</site>
107+
</distributionManagement>
108+
85109
<profiles>
86110
<profile>
87111
<id>release-sign-artifacts</id>

‎src/site/resources/cookbook.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h2>a <a href="http://skyscreamer.org">Skyscreamer</a> project</h2>
3232
<li><a class="intro" href="./">Introduction</a></li>
3333
<li><a class="cookbook" href="">Cookbook</a></li>
3434
<li><a class="quickstart" href="quickstart.html">Quickstart</a></li>
35-
<li><a class="javadoc" href="javadoc/index.html">Javadoc</a></li>
35+
<li><a class="javadoc" href="apidocs/index.html">Javadoc</a></li>
3636
<li><a class="download" href="https://github.com/skyscreamer/jsonassert/downloads">Download</a></li>
3737
<li><a class="contrib" href="https://github.com/skyscreamer/jsonassert"> &nbsp; </a></li>
3838
</ul>

‎src/site/resources/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h2>a <a href="http://skyscreamer.org">Skyscreamer</a> project</h2>
3232
<li><a class="intro" href="./">Introduction</a></li>
3333
<li><a class="cookbook" href="cookbook.html">Cookbook</a></li>
3434
<li><a class="quickstart" href="quickstart.html">Quickstart</a></li>
35-
<li><a class="javadoc" href="javadoc/index.html">Javadoc</a></li>
35+
<li><a class="javadoc" href="apidocs/index.html">Javadoc</a></li>
3636
<li><a class="download" href="https://github.com/skyscreamer/jsonassert/downloads">Download</a></li>
3737
<li><a class="contrib" href="https://github.com/skyscreamer/jsonassert"> &nbsp; </a></li>
3838
</ul>

‎src/site/resources/quickstart.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h2>a <a href="http://skyscreamer.org">Skyscreamer</a> project</h2>
3232
<li><a class="intro" href="./">Introduction</a></li>
3333
<li><a class="cookbook" href="cookbook.html">Cookbook</a></li>
3434
<li><a class="quickstart" href="">Quickstart</a></li>
35-
<li><a class="javadoc" href="javadoc/index.html">Javadoc</a></li>
35+
<li><a class="javadoc" href="apidocs/index.html">Javadoc</a></li>
3636
<li><a class="download" href="https://github.com/skyscreamer/jsonassert/downloads">Download</a></li>
3737
<li><a class="contrib" href="https://github.com/skyscreamer/jsonassert"> &nbsp; </a></li>
3838
</ul>

‎src/test/java/org/skyscreamer/jsonassert/JSONCompareModeTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public void testWithStrictOrdering() {
2121
assertTrue(NON_EXTENSIBLE.withStrictOrdering(true).hasStrictOrder());
2222
assertFalse(NON_EXTENSIBLE.withStrictOrdering(true).isExtensible());
2323

24-
assertEquals(STRICT.withStrictOrdering(true), STRICT);
25-
assertEquals(STRICT_ORDER.withStrictOrdering(true), STRICT_ORDER);
24+
assertEquals(STRICT, STRICT.withStrictOrdering(true));
25+
assertEquals(STRICT_ORDER, STRICT_ORDER.withStrictOrdering(true));
2626
}
2727

2828
@Test
@@ -32,8 +32,8 @@ public void testWithoutStrictOrdering() {
3232
assertFalse(STRICT.withStrictOrdering(false).hasStrictOrder());
3333
assertFalse(STRICT.withStrictOrdering(false).isExtensible());
3434

35-
assertEquals(LENIENT.withStrictOrdering(false), LENIENT);
36-
assertEquals(NON_EXTENSIBLE.withStrictOrdering(false), NON_EXTENSIBLE);
35+
assertEquals(LENIENT, LENIENT.withStrictOrdering(false));
36+
assertEquals(NON_EXTENSIBLE, NON_EXTENSIBLE.withStrictOrdering(false));
3737
}
3838

3939
@Test
@@ -43,8 +43,8 @@ public void testWithExtensibility() {
4343
assertTrue(STRICT.withExtensible(true).isExtensible());
4444
assertTrue(STRICT.withExtensible(true).hasStrictOrder());
4545

46-
assertEquals(LENIENT.withExtensible(true), LENIENT);
47-
assertEquals(STRICT_ORDER.withExtensible(true), STRICT_ORDER);
46+
assertEquals(LENIENT, LENIENT.withExtensible(true));
47+
assertEquals(STRICT_ORDER, STRICT_ORDER.withExtensible(true));
4848
}
4949

5050
@Test
@@ -54,7 +54,7 @@ public void testWithoutExtensibility() {
5454
assertFalse(LENIENT.withExtensible(false).isExtensible());
5555
assertFalse(LENIENT.withExtensible(false).hasStrictOrder());
5656

57-
assertEquals(STRICT.withExtensible(false), STRICT);
58-
assertEquals(NON_EXTENSIBLE.withExtensible(false), NON_EXTENSIBLE);
57+
assertEquals(STRICT, STRICT.withExtensible(false));
58+
assertEquals(NON_EXTENSIBLE, NON_EXTENSIBLE.withExtensible(false));
5959
}
6060
}

0 commit comments

Comments
 (0)