Merge pull request #67 from oskopek/friday-refactoring

Moved to JDK8 and added revapi from 2.0.0 onwards
oskopek · Jan 13, 2017 · e9e9ca1 · e9e9ca1
2 parents 5e10026 + a593d6c
commit e9e9ca1
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,6 @@ language: java
 sudo: false
 
 jdk:
-  - openjdk7
-  - oraclejdk7
   - oraclejdk8
 
 cache:

diff --git a/pom.xml b/pom.xml
@@ -79,11 +79,12 @@
 
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.5.1</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -300,14 +301,15 @@
                 </configuration>
                 <executions>
                     <execution>
-                        <id>make-assembly</id> 
+                        <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
+
         </plugins>
     </build>
     <dependencies>
@@ -390,6 +392,44 @@
                 <skipTests>false</skipTests>
                 <skipITs>${skipTests}</skipITs>
             </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.revapi</groupId>
+                        <artifactId>revapi-maven-plugin</artifactId>
+                        <version>0.8.1</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.revapi</groupId>
+                                <artifactId>revapi-java</artifactId>
+                                <version>0.13.1</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>org.revapi</groupId>
+                                <artifactId>revapi-reporter-text</artifactId>
+                                <version>0.6.1</version>
+                            </dependency>
+                        </dependencies>
+                        <configuration>
+                            <oldArtifacts>
+                                <artifact>${project.groupId}:${project.artifactId}:2.0.0</artifact>
+                            </oldArtifacts>
+                            <analysisConfigurationFiles>
+                                <path>src/build/revapi-config.json</path>
+                            </analysisConfigurationFiles>
+                            <failOnMissingConfigurationFiles>true</failOnMissingConfigurationFiles>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>check</id>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
     </profiles>
 </project>
diff --git a/src/build/revapi-config.json b/src/build/revapi-config.json
@@ -0,0 +1,23 @@
+{
+  "revapi": {
+    "semver": {
+      "ignore": {
+        "enabled": true,
+        "versionIncreaseAllows": {
+          "major": "breaking",
+          "minor": "nonBreaking",
+          "patch": "equivalent"
+        },
+        "passThroughDifferences": [
+          "java.class.nonPublicPartOfAPI"
+        ]
+      }
+    },
+    "reporter": {
+      "text": {
+        "output": "out",
+        "append": false
+      }
+    }
+  }
+}
diff --git a/src/main/resources/syntax.xml b/src/main/resources/syntax.xml
@@ -15,8 +15,7 @@
   ~ permissions and limitations under the License.
   -->
 
-<!DOCTYPE structure SYSTEM "https://raw.githubusercontent.com/oskopek/javaanpr/master/src/main/resources/dtd/syntax.dtd">
-<!-- TODO: Host DTD in a proper place -->
+<!DOCTYPE structure SYSTEM "src/main/resources/dtd/syntax.dtd">
 
 <structure>
     <type name="germany">