prepare for 1.5.0

krzysiekbielicki · Mar 23, 2019 · fa9a598 · fa9a598
1 parent 949000c
commit fa9a598
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 8 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -3,10 +3,11 @@ Java ClassMate project: licensed under Apache License 2.0
 
 Release notes:
 
-1.4.1 (not yet released)
+1.5.0 (23-Mar-2019)
 
 #43: Missing synchronization on `ResolvedObjectType#getConstructors`
  (reported by pkwarren@github)
+- Add JDK9+ module-info using Moditect plugin
 
 1.4.0 (27-Mar-2018)
 

diff --git a/pom.xml b/pom.xml
@@ -3,11 +3,11 @@
     <parent>
         <groupId>com.fasterxml</groupId>
         <artifactId>oss-parent</artifactId>
-        <version>24</version>
+        <version>35</version>
     </parent>
     <artifactId>classmate</artifactId>
     <name>ClassMate</name>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <description>Library for introspecting types with full generic information
         including resolving of field and method types.
@@ -65,7 +65,7 @@ com.fasterxml.classmate.*;version=${project.version}
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>${version.junit}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -85,7 +85,6 @@ com.fasterxml.classmate.*;version=${project.version}
 
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.2</version>
                 <configuration>
                     <source>${version.jdk}</source>
                     <target>${version.jdk}</target>
@@ -94,7 +93,7 @@ com.fasterxml.classmate.*;version=${project.version}
             <plugin><!-- plug-in to attach source bundle in repo -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.1.2</version>
+                <version>${version.plugin.source}</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -128,7 +127,29 @@ com.fasterxml.classmate.*;version=${project.version}
                     </execution>
                  </executions>
             </plugin>
-
+	    <!--  22-Mar-2019, tatu: Add rudimentary JDK9+ module info. To build with JDK 8
+		  will have to use `moduleInfoFile` which is not optimal but anything else
+		  requires JDK 9+.
+              -->
+	    <plugin>
+              <groupId>org.moditect</groupId>
+              <artifactId>moditect-maven-plugin</artifactId>
+              <executions>
+		<execution>
+		  <id>add-module-infos</id>
+		  <phase>package</phase>
+		  <goals>
+		    <goal>add-module-info</goal>
+		  </goals>
+		  <configuration>
+		    <overwriteExistingFiles>true</overwriteExistingFiles>
+		    <module>
+                      <moduleInfoFile>src/moditect/module-info.java</moduleInfoFile>
+		    </module>
+		  </configuration>
+		</execution>
+              </executions>
+	    </plugin>
         </plugins>
     </build>
     <profiles>
@@ -145,7 +166,6 @@ com.fasterxml.classmate.*;version=${project.version}
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.1</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>

diff --git a/src/moditect/module-info.java b/src/moditect/module-info.java
@@ -0,0 +1,7 @@
+// NOTE: auto-generated with Moditect plugin, on 22-Mar-2019
+module com.fasterxml.classmate {
+    exports com.fasterxml.classmate;
+    exports com.fasterxml.classmate.members;
+    exports com.fasterxml.classmate.types;
+    exports com.fasterxml.classmate.util;
+}