Final release of JAF 1.2.0.

javaee · Sep 6, 2017 · 8f8ec08 · 8f8ec08
1 parent 14532dc
commit 8f8ec08
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/activation/pom.xml b/activation/pom.xml
@@ -48,7 +48,7 @@
     <parent>
 	<groupId>com.sun.activation</groupId>
 	<artifactId>all</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.activation</groupId>
@@ -60,6 +60,9 @@
 	<activation.extensionName>
 	    javax.activation
 	</activation.extensionName>
+	<activation.moduleName>
+	    java.activation
+	</activation.moduleName>
 	<activation.specificationTitle>
 	    JavaBeans(TM) Activation Framework Specification
 	</activation.specificationTitle>

diff --git a/activationapi/pom.xml b/activationapi/pom.xml
@@ -55,7 +55,7 @@
     <parent>
 	<groupId>com.sun.activation</groupId>
 	<artifactId>all</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>javax.activation</groupId>
@@ -67,6 +67,9 @@
 	<activation.extensionName>
 	    javax.activation
 	</activation.extensionName>
+	<activation.moduleName>
+	    java.activation
+	</activation.moduleName>
 	<activation.packages.export>
 	    javax.activation.*; version=${activation.spec.version}
 	</activation.packages.export>
@@ -100,7 +103,7 @@
 				<artifactItem>
 				    <groupId>com.sun.activation</groupId>
 				    <artifactId>javax.activation</artifactId>
-				    <version>${activation.version}</version>
+				    <version>${project.version}</version>
 				    <classifier>sources</classifier>
 				    <outputDirectory>
 					${project.build.directory}/sources
@@ -115,7 +118,7 @@
 			<artifactItem>
 			    <groupId>com.sun.activation</groupId>
 			    <artifactId>javax.activation</artifactId>
-			    <version>${activation.version}</version>
+			    <version>${project.version}</version>
 			</artifactItem>
 		    </artifactItems>
 		    <outputDirectory>

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -48,7 +48,7 @@
     <parent>
 	<groupId>com.sun.activation</groupId>
 	<artifactId>all</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.activation</groupId>
@@ -61,8 +61,8 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.4</source>
-                    <target>1.4</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
 		    <excludes>
 			<exclude>internal/**</exclude>
 		    </excludes>

diff --git a/pom.xml b/pom.xml
@@ -54,7 +54,7 @@
     <groupId>com.sun.activation</groupId>
     <artifactId>all</artifactId>
     <packaging>pom</packaging>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
     <name>JavaBeans Activation Framework distribution</name>
     <description>${project.name}</description>
 
@@ -84,12 +84,14 @@
     </organization>
 
     <properties>
-	<activation.version>1.2.0-SNAPSHOT</activation.version>
 	<activation.spec.version>1.2</activation.spec.version>
 	<!-- defaults that are overridden in activation module -->
 	<activation.extensionName>
 	    ${project.groupId}.${project.artifactId}
 	</activation.extensionName>
+	<activation.moduleName>
+	    ${project.groupId}.${project.artifactId}
+	</activation.moduleName>
 	<activation.specificationTitle>
 	    ${project.groupId}.${project.artifactId}
 	</activation.specificationTitle>
@@ -435,6 +437,10 @@
 			    <Implementation-Vendor-Id>
 				com.sun
 			    </Implementation-Vendor-Id>
+			    <!-- for JDK 9 -->
+			    <Automatic-Module-Name>
+				${activation.moduleName}
+			    </Automatic-Module-Name>
 			</manifestEntries>
 		    </archive>
 		    <excludes>
@@ -608,7 +614,7 @@
 	    <dependency>
 		<groupId>com.sun.activation</groupId>
 		<artifactId>javax.activation</artifactId>
-		<version>${activation.version}</version>
+		<version>${project.version}</version>
 	    </dependency>
 	</dependencies>
     </dependencyManagement>