Merge pull request google#104 from opinali/master

v1.3.0
jalele · Feb 3, 2017 · 7e500fd · 7e500fd
2 parents 72103eb + 1ff62aa
commit 7e500fd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 RELEASE NOTES
 ----------------------------------------------------------------------
 
+## Version 1.3.0, 03-02-2017
+* Updated Protocol Buffers to v3.2.0!  You will need to install this
+  exact version of protobuf, have it in the PATH, rebuild everything.
+
 ## Version 1.2.2, 09-01-2017
 * OpenRTB proto update (docs only).
 

diff --git a/openrtb-core/src/test/java/com/google/openrtb/util/OpenRtbUtilsTest.java b/openrtb-core/src/test/java/com/google/openrtb/util/OpenRtbUtilsTest.java
@@ -41,8 +41,8 @@ public class OpenRtbUtilsTest {
 
   @Test
   public void testCatUtils() {
-    assertThat(OpenRtbUtils.categoryFromName("IAB10-1")).isSameAs(ContentCategory.IAB10_1);
     assertThat(OpenRtbUtils.categoryFromName("IAB10_1")).isSameAs(ContentCategory.IAB10_1);
+    assertThat(OpenRtbUtils.categoryFromName("IAB10-1")).isSameAs(ContentCategory.IAB10_1);
     assertThat(OpenRtbUtils.categoryToJsonName("IAB10-1")).isEqualTo("IAB10-1");
     assertThat(OpenRtbUtils.categoryToJsonName("IAB10_1")).isEqualTo("IAB10-1");
     assertThat(OpenRtbUtils.categoryToJsonName(ContentCategory.IAB10_1)).isEqualTo("IAB10-1");

diff --git a/pom.xml b/pom.xml
@@ -204,7 +204,7 @@
 
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>