Compare commits

..

9 Commits

Author SHA1 Message Date
Jordan Zimmerman
378d19390c [maven-release-plugin] prepare release record-builder-1.17 2021-02-01 13:03:17 -05:00
Jordan Zimmerman
fe4eaec702 [maven-release-plugin] rollback the release of record-builder-1.17 2021-02-01 13:02:40 -05:00
Jordan Zimmerman
3f9ab38fb1 [maven-release-plugin] prepare release record-builder-1.17 2021-02-01 13:02:24 -05:00
Jordan Zimmerman
75d684f260 Merge branch 'master' of github.com:Randgalt/record-builder 2021-02-01 13:01:33 -05:00
Jordan Zimmerman
bdedc6e15a [maven-release-plugin] prepare for next development iteration 2021-02-01 12:28:04 -05:00
Jordan Zimmerman
3ddcecea08 [maven-release-plugin] prepare release record-builder-1.17 2021-02-01 12:27:56 -05:00
Jordan Zimmerman
56df5c1107 [maven-release-plugin] rollback the release of record-builder-1.17 2021-02-01 12:27:28 -05:00
Jordan Zimmerman
3dc1d87a3f [maven-release-plugin] prepare release record-builder-1.17 2021-02-01 12:27:15 -05:00
Jordan Zimmerman
1f02dcf4fe Support alternate artifacts built with Java 15 2021-02-01 12:26:07 -05:00
10 changed files with 116 additions and 40 deletions

View File

@@ -20,9 +20,5 @@ 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

View File

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

View File

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

View File

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

44
pom.xml
View File

@@ -5,21 +5,13 @@
<groupId>io.soabase.record-builder</groupId>
<artifactId>record-builder</artifactId>
<packaging>pom</packaging>
<version>1.18</version>
<modules>
<module>record-builder-core</module>
<module>record-builder-processor</module>
<module>record-builder-test</module>
</modules>
<version>1.17</version>
<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>
@@ -73,7 +65,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.18</tag>
<tag>record-builder-1.17</tag>
</scm>
<issueManagement>
@@ -108,6 +100,12 @@
<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>
@@ -125,9 +123,6 @@
<version>${maven-compiler-plugin-version}</version>
<configuration>
<release>${jdk-version}</release>
<compilerArgs>
<arg>${enable-preview}</arg>
</compilerArgs>
</configuration>
</plugin>
@@ -279,9 +274,6 @@
<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>
@@ -320,6 +312,19 @@
</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>
@@ -347,10 +352,15 @@
<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>

View File

@@ -0,0 +1,29 @@
<?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>

View File

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

View File

@@ -0,0 +1,46 @@
<?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>

View File

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

View File

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