-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Relocate sources and build georchestra dependencies
- fall back to Java 11. Georchestra modules won't build with Java 17. Revisit and possibly fix upstream.
- Loading branch information
Showing
61 changed files
with
265 additions
and
224 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED | ||
| --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED | ||
| --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED | ||
| --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED | ||
| --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,221 @@ | ||
| <?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 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.georchestra</groupId> | ||
| <artifactId>georchestra-gateway-parent</artifactId> | ||
| <version>${revision}</version> | ||
| </parent> | ||
| <artifactId>georchestra-gateway</artifactId> | ||
| <name>gateway</name> | ||
| <description>geOrchestra application gateway</description> | ||
| <properties> | ||
| <java.version>11</java.version> | ||
| <imageTag>${project.version}</imageTag> | ||
| <spring-boot.build-image.imageName>georchestra/gateway:${imageTag}</spring-boot.build-image.imageName> | ||
| </properties> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.georchestra</groupId> | ||
| <artifactId>georchestra-ldap-account-management</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-starter-oauth2-client</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-starter-security</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springframework.security</groupId> | ||
| <artifactId>spring-security-ldap</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springframework.cloud</groupId> | ||
| <artifactId>spring-cloud-starter-gateway</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-starter-actuator</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.projectlombok</groupId> | ||
| <artifactId>lombok</artifactId> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <!-- Annotation processor that generates metadata about classes annotated with @ConfigurationProperties. --> | ||
| <!-- This metadata is used by IDEs to provide auto-completion and documentation for the properties when editing application.properties | ||
| and application.yaml --> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-configuration-processor</artifactId> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <!-- Generates META-INF/spring-autoconfigure-metadata.properties for inclusion in the project's jar. --> | ||
| <!-- This file helps with startup time, but is not necessary for your app to function correctly. --> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-autoconfigure-processor</artifactId> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-devtools</artifactId> | ||
| <scope>runtime</scope> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-starter-test</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <!-- <dependency> --> | ||
| <!-- <groupId>org.springframework.security</groupId> --> | ||
| <!-- <artifactId>spring-security-test</artifactId> --> | ||
| <!-- <scope>test</scope> --> | ||
| <!-- </dependency> --> | ||
| </dependencies> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>net.revelc.code.formatter</groupId> | ||
| <artifactId>formatter-maven-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <goals> | ||
| <goal>${fmt.action}</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <inherited>true</inherited> | ||
| <configuration> | ||
| <skip>${fmt.skip}</skip> | ||
| <configFile>${maven.multiModuleProjectDirectory}/.mvn/formatter.xml</configFile> | ||
| <compilerSource>${java.version}</compilerSource> | ||
| <compilerCompliance>${java.version}</compilerCompliance> | ||
| <compilerTargetPlatform>${java.version}</compilerTargetPlatform> | ||
| <!-- Use Unix and Mac style line endings --> | ||
| <lineEnding>LF</lineEnding> | ||
| <encoding>UTF-8</encoding> | ||
| <skipJsFormatting>true</skipJsFormatting> | ||
| <skipCssFormatting>true</skipCssFormatting> | ||
| <skipHtmlFormatting>true</skipHtmlFormatting> | ||
| <skipJsonFormatting>true</skipJsonFormatting> | ||
| <skipXmlFormatting>true</skipXmlFormatting> | ||
| <skipJavaFormatting>false</skipJavaFormatting> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-enforcer-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>enforce-maven-and-java</id> | ||
| <goals> | ||
| <goal>enforce</goal> | ||
| </goals> | ||
| <configuration> | ||
| <rules> | ||
| <requireJavaVersion> | ||
| <version>[11,)</version> | ||
| </requireJavaVersion> | ||
| <requireMavenVersion> | ||
| <version>[3.6.3,)</version> | ||
| </requireMavenVersion> | ||
| </rules> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>com.github.ekryd.sortpom</groupId> | ||
| <artifactId>sortpom-maven-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <phase>verify</phase> | ||
| <goals> | ||
| <goal>${pom.fmt.action}</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <skip>${pom.fmt.skip}</skip> | ||
| <pomFile>pom.xml</pomFile> | ||
| <keepBlankLines>true</keepBlankLines> | ||
| <spaceBeforeCloseEmptyElement>false</spaceBeforeCloseEmptyElement> | ||
| <createBackupFile>false</createBackupFile> | ||
| <verifyFail>stop</verifyFail> | ||
| <verifyFailOn>strict</verifyFailOn> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.codehaus.mojo</groupId> | ||
| <artifactId>flatten-maven-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>flatten</id> | ||
| <phase>process-resources</phase> | ||
| <goals> | ||
| <goal>flatten</goal> | ||
| </goals> | ||
| </execution> | ||
| <execution> | ||
| <id>flatten.clean</id> | ||
| <phase>clean</phase> | ||
| <goals> | ||
| <goal>clean</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <updatePomFile>true</updatePomFile> | ||
| <!--flattenMode>resolveCiFriendliesOnly</flattenMode --> | ||
| <flattenMode>oss</flattenMode> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-maven-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>build-info</id> | ||
| <goals> | ||
| <goal>build-info</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| <profiles> | ||
| <profile> | ||
| <id>docker</id> | ||
| <activation> | ||
| <activeByDefault>false</activeByDefault> | ||
| </activation> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.springframework.boot</groupId> | ||
| <artifactId>spring-boot-maven-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <id>build-image</id> | ||
| <goals> | ||
| <goal>build-image</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| <configuration> | ||
| <image> | ||
| <pullPolicy>IF_NOT_PRESENT</pullPolicy> | ||
| </image> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </profile> | ||
| </profiles> | ||
| </project> |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.