Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Infrastructure improvements - Migration to Java 11 from Java 8 #3836

Draft
wants to merge 14 commits into
base: jena4-upgrade
Choose a base branch
from
Draft

Infrastructure improvements - Migration to Java 11 from Java 8 #3836

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bc76f38
Change project.version to 1.14.1-SNAPSHOT
michel-heon Feb 22, 2023
a7f21fc
Adding an echo mechanism for maven properties
michel-heon Feb 22, 2023
5acba05
Replacing
michel-heon Feb 22, 2023
28ad9db
Update pom.xml
michel-heon Feb 25, 2023
e9ba32a
Update pom.xml
michel-heon Feb 25, 2023
612a410
Update pom.xml
michel-heon Feb 25, 2023
8ed6385
Update pom.xml
michel-heon Feb 25, 2023
d522f63
Update pom.xml
michel-heon Feb 25, 2023
4efce05
Update pom.xml
michel-heon Feb 25, 2023
ad83d94
Update pom.xml
michel-heon Feb 25, 2023
1a877a2
Update pom.xml
michel-heon Feb 25, 2023
b3e301a
Removing the properties trace (echoing messages) used by Maven
michel-heon Feb 27, 2023
e9428f6
Added configuration for enforcer and updated enforcer-version to (3.2.1)
michel-heon Feb 27, 2023
c71ae4d
Remove Maven rules in enforcer
michel-heon Mar 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

<groupId>org.vivoweb</groupId>
<artifactId>vivo-api</artifactId>
<version>1.13.1-SNAPSHOT</version>
<version>1.14.1-SNAPSHOT</version>
<packaging>jar</packaging>

<parent>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-project</artifactId>
<version>1.13.1-SNAPSHOT</version>
<version>1.14.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions home/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

<groupId>org.vivoweb</groupId>
<artifactId>vivo-home</artifactId>
<version>1.13.1-SNAPSHOT</version>
<version>1.14.1-SNAPSHOT</version>
<packaging>pom</packaging>

<parent>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-project</artifactId>
<version>1.13.1-SNAPSHOT</version>
<version>1.14.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions installer/home/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-installer-home</artifactId>
<version>1.13.1-SNAPSHOT</version>
<version>1.14.1-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-installer</artifactId>
<version>1.13.1-SNAPSHOT</version>
<version>1.14.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<name>VIVO Install Home</name>
Expand Down
4 changes: 1 addition & 3 deletions installer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-installer</artifactId>
<version>1.13.1-SNAPSHOT</version>
<version>1.14.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>VIVO Installer</name>

Expand All @@ -19,8 +19,6 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
Expand Down
4 changes: 2 additions & 2 deletions installer/webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-installer-vivo</artifactId>
<version>1.13.1-SNAPSHOT</version>
<version>1.14.1-SNAPSHOT</version>
<packaging>war</packaging>
<parent>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-installer</artifactId>
<version>1.13.1-SNAPSHOT</version>
<version>1.14.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
63 changes: 60 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.vivoweb</groupId>
<artifactId>vivo-project</artifactId>
<version>1.13.1-SNAPSHOT</version>
<version>1.14.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>VIVO</name>
Expand Down Expand Up @@ -58,6 +58,7 @@
<maven-site-plugin.skip>false</maven-site-plugin.skip>
<stagingBase>/</stagingBase>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.release>11</maven.compiler.release>
</properties>

<modules>
Expand Down Expand Up @@ -297,14 +298,70 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
<compilerArgs>
<arg>-XDcompilePolicy=simple</arg>
</compilerArgs>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>echo-properties</id>
<phase>validate</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<skip>false</skip>
<target>
<echo message="###################################################################" />
<echo message="Displaying value of '${project.artifactId}' properties" />
<echo message="###################################################################" />
<echo message="[app-name] ${app-name}" />
<echo message="[vivo-dir] ${vivo-dir}" />
<echo message="[tomcat-dir] ${tomcat-dir}" />
<echo message="[default-theme] ${default-theme}" />
<echo message="[vitro-version] ${vitro-version}" />
<echo message="[vivo-version] ${vivo-version}" />
<echo message="[vivo-dir] ${vivo-dir}" />
<echo message="[project.version] ${project.version}" />
<echo message="[java.vendor.version] ${java.vendor.version}" />
<echo message="[java.version] ${java.version}" />
<echo message="[java.specification.version] ${java.specification.version}" />
<echo message="[maven.compiler.release] ${maven.compiler.release}" />
<echo message="###################################################################" />
<echo message="###################################################################" />
</target>
</configuration>
</execution>
</executions>
</plugin>
<!--Allows you to list all the properties used by Maven. Do <skip>false</skip> to activate the plugin-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<executions>
<execution>
<id>echo-all-properties</id>
<phase>validate</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<skip>true</skip>
<target>
<echoproperties />
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

<groupId>org.vivoweb</groupId>
<artifactId>vivo-webapp</artifactId>
<version>1.13.1-SNAPSHOT</version>
<version>1.14.1-SNAPSHOT</version>
<packaging>war</packaging>

<parent>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-project</artifactId>
<version>1.13.1-SNAPSHOT</version>
<version>1.14.1-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down Expand Up @@ -69,7 +69,7 @@
<dependency>
<groupId>org.vivoweb</groupId>
<artifactId>vivo-api</artifactId>
<version>1.13.1-SNAPSHOT</version>
<version>1.14.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>