Skip to content

Commit

Permalink
Merge branch 'platform-independent-compile'
Browse files Browse the repository at this point in the history
  • Loading branch information
@velo
velo committed Jan 5, 2024
2 parents d09aca5 + d8d9bde commit 42a1bad
Show file tree
Hide file tree
Showing 29 changed files with 331 additions and 1,289 deletions.
24 changes: 24 additions & 0 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,24 @@ jobs:
command: |
./mvnw -ntp -B verify -Pno-databases
- save-test-results

windows:
machine:
image: windows-server-2019-vs2019:current # Windows machine image
resource_class: windows.medium

steps:
- checkout
- restore_cache:
keys:
- querydsl-dependencies-{{ checksum "pom.xml" }}
- querydsl-dependencies-
- run:
name: 'Test'
command: |
./mvnw -ntp -B verify -Pno-databases -Dtoolchain.skip=true
shell: bash.exe

buildExamples:
<<: *defaults
working_directory: ~/querydsl
Expand Down Expand Up @@ -337,6 +355,12 @@ workflows:
- 'Resolve dependencies'
filters:
<<: *all-branches
- windows:
name: 'Compile and Test on Windows (no external databases)'
requires:
- 'Resolve dependencies'
filters:
<<: *all-branches
- buildExamples:
name: 'Compile and Test Examples'
requires:
Expand Down
178 changes: 88 additions & 90 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,60 @@
<packaging>pom</packaging>
<name>Querydsl</name>
<description>parent project for Querydsl modules</description>
<url>https://querydsl.github.io/</url>

<inceptionYear>2007</inceptionYear>

<organization>
<name>OpenFeign</name>
<url>https://github.com/openfeign</url>
</organization>

<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<developers>
<developer>
<id>velo</id>
<name>Marvin Herman Froeder</name>
</developer>
</developers>

<contributors>
<contributor>
<name>Timo Westkämper</name>
<organization>Mysema Ltd</organization>
</contributor>
<contributor>
<name>Samppa Saarela</name>
<organization>Mysema Ltd</organization>
</contributor>
<contributor>
<name>Vesa Marttila</name>
<organization>Mysema Ltd</organization>
</contributor>
<contributor>
<name>Lassi Immonen</name>
<organization>Mysema Ltd</organization>
</contributor>
<contributor>
<name>Ruben Dijkstra</name>
</contributor>
<contributor>
<name>John Tims</name>
</contributor>
<contributor>
<name>Robert Bain</name>
</contributor>
<contributor>
<name>Jan-Willem Gmelig Meyling</name>
</contributor>
</contributors>

<modules>
<module>querydsl-core</module>
Expand Down Expand Up @@ -46,6 +100,23 @@

</modules>

<scm>
<connection>${project.checkout}</connection>
<developerConnection>${project.checkout}</developerConnection>
<url>${project.githubpage}</url>
</scm>

<distributionManagement>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>

<properties>
<failIfNoTests>false</failIfNoTests>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -109,46 +180,6 @@
<!-- try to removed this after 6.0.0 is out -->
<japicmp.skip>true</japicmp.skip>
</properties>
<url>https://querydsl.github.io/</url>

<inceptionYear>2007</inceptionYear>

<organization>
<name>OpenFeign</name>
<url>https://github.com/openfeign</url>
</organization>

<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<url>${project.githubpage}</url>
<connection>${project.checkout}</connection>
<developerConnection>${project.checkout}</developerConnection>
</scm>

<developers>
<developer>
<id>velo</id>
<name>Marvin Herman Froeder</name>
</developer>
</developers>

<distributionManagement>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>

<dependencyManagement>
<dependencies>
Expand Down Expand Up @@ -362,10 +393,10 @@
<executions>
<execution>
<id>bundle-manifest</id>
<phase>process-classes</phase>
<goals>
<goal>manifest</goal>
</goals>
<phase>process-classes</phase>
<inherited>true</inherited>
<configuration>
<instructions>
Expand All @@ -382,10 +413,10 @@
<version>${dokka.version}</version>
<executions>
<execution>
<phase>prepare-package</phase>
<goals>
<goal>javadocJar</goal>
</goals>
<phase>prepare-package</phase>
</execution>
</executions>
</plugin>
Expand All @@ -408,10 +439,10 @@
<executions>
<execution>
<id>enforce-maven</id>
<phase>validate</phase>
<goals>
<goal>enforce</goal>
</goals>
<phase>validate</phase>
<configuration>
<rules>
<dependencyConvergence></dependencyConvergence>
Expand All @@ -420,10 +451,10 @@
</execution>
<execution>
<id>enforce-banned-dependencies</id>
<phase>validate</phase>
<goals>
<goal>enforce</goal>
</goals>
<phase>validate</phase>
<configuration>
<rules>
<bannedDependencies>
Expand Down Expand Up @@ -492,10 +523,10 @@
</configuration>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>cmp</goal>
</goals>
<phase>verify</phase>
</execution>
</executions>
</plugin>
Expand Down Expand Up @@ -534,21 +565,21 @@
<!-- Ensure main source tree compiles to Java ${main.java.version} bytecode. -->
<execution>
<id>default-compile</id>
<phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
<phase>compile</phase>
<configuration>
<source>${main.java.version}</source>
<target>${main.java.version}</target>
</configuration>
</execution>
<execution>
<id>default-testCompile</id>
<phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
<phase>test-compile</phase>
<configuration>
<source>${latest.java.version}</source>
<target>${latest.java.version}</target>
Expand Down Expand Up @@ -604,7 +635,6 @@
<version>0.103.1</version>
<inherited>false</inherited>
<configuration>
<bomTemplateUrl>file://${project.basedir}/src/config/bom.xml</bomTemplateUrl>
<boms>
<bom>
<artifactId>querydsl-bom</artifactId>
Expand Down Expand Up @@ -638,6 +668,14 @@
<groupId>com.cosium.code</groupId>
<artifactId>git-code-format-maven-plugin</artifactId>
<version>${git-code-format-maven-plugin.version}</version>
<dependencies>
<!-- Enable https://github.com/google/google-java-format -->
<dependency>
<groupId>com.cosium.code</groupId>
<artifactId>google-java-format</artifactId>
<version>${git-code-format-maven-plugin.version}</version>
</dependency>
</dependencies>
<executions>
<!-- On commit, format the modified files -->
<execution>
Expand All @@ -655,14 +693,6 @@
</goals>
</execution>
</executions>
<dependencies>
<!-- Enable https://github.com/google/google-java-format -->
<dependency>
<groupId>com.cosium.code</groupId>
<artifactId>google-java-format</artifactId>
<version>${git-code-format-maven-plugin.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>com.github.ekryd.sortpom</groupId>
Expand All @@ -671,24 +701,23 @@
<configuration>
<keepBlankLines>true</keepBlankLines>
<lineSeparator>\n</lineSeparator>
<sortOrderFile>src/config/pomSortOrder.xml</sortOrderFile>
<predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
<createBackupFile>false</createBackupFile>
</configuration>
<executions>
<execution>
<id>format</id>
<phase>validate</phase>
<goals>
<goal>sort</goal>
</goals>
<phase>validate</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>

<profile>
<id>docs</id>
<modules>
Expand Down Expand Up @@ -993,35 +1022,4 @@
</profile>
</profiles>

<contributors>
<contributor>
<name>Timo Westkämper</name>
<organization>Mysema Ltd</organization>
</contributor>
<contributor>
<name>Samppa Saarela</name>
<organization>Mysema Ltd</organization>
</contributor>
<contributor>
<name>Vesa Marttila</name>
<organization>Mysema Ltd</organization>
</contributor>
<contributor>
<name>Lassi Immonen</name>
<organization>Mysema Ltd</organization>
</contributor>
<contributor>
<name>Ruben Dijkstra</name>
</contributor>
<contributor>
<name>John Tims</name>
</contributor>
<contributor>
<name>Robert Bain</name>
</contributor>
<contributor>
<name>Jan-Willem Gmelig Meyling</name>
</contributor>
</contributors>

</project>
4 changes: 2 additions & 2 deletions querydsl-apt/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,10 @@
<executions>
<execution>
<id>apt-jars</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<phase>package</phase>
<configuration>
<descriptors>
<descriptor>src/main/general.xml</descriptor>
Expand All @@ -184,11 +184,11 @@
<version>1.1.3</version>
<executions>
<execution>
<phase>generate-test-sources</phase>
<goals>
<goal>test-process</goal>
<goal>add-test-sources</goal>
</goals>
<phase>generate-test-sources</phase>
<configuration>
<outputDirectory>target/generated-test-sources/java</outputDirectory>
<logOnlyOnError>true</logOnlyOnError>
Expand Down
2 changes: 1 addition & 1 deletion querydsl-codegen/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>test-jar</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>
Expand Down
Loading

0 comments on commit 42a1bad

Please sign in to comment.