Skip to content

Commit

Permalink
fix: pom for java 11
Browse files Browse the repository at this point in the history
  • Loading branch information
f-necas committed Nov 15, 2023
1 parent 111ee24 commit 2a99e6c
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 4 deletions.
19 changes: 19 additions & 0 deletions common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,25 @@
</plugins>
</build>
</profile>
<profile>
<id>jdk11+</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<properties>
<java.version>11</java.version>
</properties>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
<properties>
<rootProjectDir>${basedir}/..</rootProjectDir>
Expand Down
47 changes: 43 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
Expand Down Expand Up @@ -1313,9 +1309,52 @@
<module>messaging</module>
<module>estest</module>
<module>index</module>
<module>georchestra-integration</module>
</modules>

<profiles>
<profile>
<id>jdk11+</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<properties>
<java.version>11</java.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>11</source>
<target>11</target>
<debug>true</debug> <!-- Whether to include debugging information. -->
<encoding>UTF-8</encoding> <!-- The -encoding argument for the Java compiler. -->
<compilerArgs>
<arg>-proc:none</arg>
<arg>--add-exports</arg>
<arg>java.base/sun.net.ftp=ALL-UNNAMED</arg>
</compilerArgs> <!-- disable automatic annotation processing according to: http://docs.jboss.org/hibernate/jpamodelgen/1.0/reference/en-US/html_single/#d0e261 -->
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<!-- force use of java 8 if available in toolchains.xml -->
<id>toolchain</id>
Expand Down

0 comments on commit 2a99e6c

Please sign in to comment.