[maven-release-plugin] prepare release record-builder-1.18

.github/workflows/maven_java15.yml

@@ -20,5 +20,9 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 15
+    - name: Create Maven Directory
+      run: mkdir -p .mvn/
+    - name: Create Maven JVM file
+      run: echo "--enable-preview" > .mvn/jvm.config
     - name: Build with Maven
       run: mvn -P java15 -B package --file pom.xml

README.md

@@ -365,10 +365,8 @@ Alternatively, you can provide values for each individual meta data (or combinat
 
 ## Java 15 Versions
 
-Artifacts compiled wth Java 15 are available. The artifact IDs for these are:
-
-- core: `record-builder-core-java15`
-- processor: `record-builder-processor-java15`
+Artifacts compiled wth Java 15 are available. They are the same versions
+as the Java 16 versions with `-java15` appended.
 
 Note: records are a preview feature only in Java 15. You'll need take a number of steps in order to try RecordBuilder:
 
@@ -386,21 +384,21 @@ You will need to enable preview in your build tools:
 <dependencies>
     <dependency>
         <groupId>io.soabase.record-builder</groupId>
-        <artifactId>record-builder-core-java15</artifactId>
-        <version>set-version-here</version>
+        <artifactId>record-builder-core</artifactId>
+        <version>record-builder-version-java15</version>
     </dependency>
 </dependencies>
 
 <plugin>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-compiler-plugin</artifactId>
-    <version>set-version-here</version>
+    <version>maven-compiler-version</version>
     <configuration>
         <annotationProcessorPaths>
             <annotationProcessorPath>
                 <groupId>io.soabase.record-builder</groupId>
-                <artifactId>record-builder-processor-java15</artifactId>
-                <version>set-version-here</version>
+                <artifactId>record-builder-processor</artifactId>
+                <version>record-builder-version-java15</version>
             </annotationProcessorPath>
         </annotationProcessorPaths>
         <annotationProcessors>
@@ -425,8 +423,8 @@ Create a file in your project's root named `.mvn/jvm.config`. The file should ha
 
 ```
 dependencies {
-    annotationProcessor 'io.soabase.record-builder:record-builder-processor-java15:$version-goes-here'
-    compileOnly 'io.soabase.record-builder:record-builder-core-java15:$version-goes-here'
+    annotationProcessor 'io.soabase.record-builder:record-builder-processor:$record-builder-version-java15'
+    compileOnly 'io.soabase.record-builder:record-builder-core:$record-builder-version-java15'
 }
 
 tasks.withType(JavaCompile) {

java15.sh

@@ -18,3 +18,5 @@
 
 jenv local 15
 javahome
+mkdir -p .mvn/
+echo "--enable-preview" > .mvn/jvm.config

java16.sh

@@ -18,3 +18,4 @@
 
 jenv local 16-ea
 javahome
+rm -fr .mvn

pom.xml

@@ -5,13 +5,21 @@
     <groupId>io.soabase.record-builder</groupId>
     <artifactId>record-builder</artifactId>
     <packaging>pom</packaging>
-    <version>1.17</version>
+    <version>1.18</version>
+
+    <modules>
+        <module>record-builder-core</module>
+        <module>record-builder-processor</module>
+        <module>record-builder-test</module>
+    </modules>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
+        <enable-preview />
+
         <jdk-version>16</jdk-version>
 
         <maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>
@@ -65,7 +73,7 @@
         <url>https://github.com/randgalt/record-builder</url>
         <connection>scm:git:https://github.com/randgalt/record-builder.git</connection>
         <developerConnection>scm:git:git@github.com:randgalt/record-builder.git</developerConnection>
-        <tag>record-builder-1.17</tag>
+        <tag>record-builder-1.18</tag>
     </scm>
 
     <issueManagement>
@@ -100,12 +108,6 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>io.soabase.record-builder</groupId>
-                <artifactId>record-builder-core-java15</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter</artifactId>
@@ -123,6 +125,9 @@
                     <version>${maven-compiler-plugin-version}</version>
                     <configuration>
                         <release>${jdk-version}</release>
+                        <compilerArgs>
+                            <arg>${enable-preview}</arg>
+                        </compilerArgs>
                     </configuration>
                 </plugin>
 
@@ -274,6 +279,9 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>${maven-surefire-plugin-version}</version>
+                    <configuration>
+                        <argLine>${enable-preview}</argLine>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -312,19 +320,6 @@
     </build>
 
     <profiles>
-        <profile>
-            <id>main</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-
-            <modules>
-                <module>record-builder-core</module>
-                <module>record-builder-processor</module>
-                <module>record-builder-test</module>
-            </modules>
-        </profile>
-
         <profile>
             <id>oss</id>
             <build>
@@ -352,15 +347,10 @@
 
         <profile>
             <id>java15</id>
-
             <properties>
                 <jdk-version>15</jdk-version>
+                <enable-preview>--enable-preview</enable-preview>
             </properties>
-
-            <modules>
-                <module>record-builder-core-java15</module>
-                <module>record-builder-processor-java15</module>
-            </modules>
         </profile>
     </profiles>
 </project>

record-builder-core-java15/pom.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>io.soabase.record-builder</groupId>
-        <artifactId>record-builder</artifactId>
-        <version>1.17</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>record-builder-core-java15</artifactId>
-
-    <build>
-        <sourceDirectory>../record-builder-core/src/main/java</sourceDirectory>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <proc>none</proc>
-                    <release>${jdk-version}</release>
-                    <compilerArgs>
-                        <arg>--enable-preview</arg>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

record-builder-core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.soabase.record-builder</groupId>
         <artifactId>record-builder</artifactId>
-        <version>1.17-SNAPSHOT</version>
+        <version>1.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

record-builder-processor-java15/pom.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>io.soabase.record-builder</groupId>
-        <artifactId>record-builder</artifactId>
-        <version>1.17</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>record-builder-processor-java15</artifactId>
-
-    <build>
-        <sourceDirectory>../record-builder-processor/src/main/java</sourceDirectory>
-        <resources>
-            <resource>
-                <directory>../record-builder-processor/src/resources/**</directory>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <proc>none</proc>
-                    <release>${jdk-version}</release>
-                    <compilerArgs>
-                        <arg>--enable-preview</arg>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.squareup</groupId>
-            <artifactId>javapoet</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.soabase.record-builder</groupId>
-            <artifactId>record-builder-core-java15</artifactId>
-        </dependency>
-    </dependencies>
-</project>

record-builder-processor/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.soabase.record-builder</groupId>
         <artifactId>record-builder</artifactId>
-        <version>1.17-SNAPSHOT</version>
+        <version>1.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

record-builder-test/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.soabase.record-builder</groupId>
         <artifactId>record-builder</artifactId>
-        <version>1.17-SNAPSHOT</version>
+        <version>1.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -43,6 +43,10 @@
                     <annotationProcessors>
                         <annotationProcessor>io.soabase.recordbuilder.processor.RecordBuilderProcessor</annotationProcessor>
                     </annotationProcessors>
+                    <release>${jdk-version}</release>
+                    <compilerArgs>
+                        <arg>${enable-preview}</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>