You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/05/30 11:06:04 UTC
[isis] branch master updated: ISIS-1277 rename mvn profile
'jdk9plus' -> 'jdk10plus'
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new d8aa4a2 ISIS-1277 rename mvn profile 'jdk9plus' -> 'jdk10plus'
d8aa4a2 is described below
commit d8aa4a206b982a62ae21cd330aa555e6166022bb
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed May 30 13:05:43 2018 +0200
ISIS-1277 rename mvn profile 'jdk9plus' -> 'jdk10plus'
---
core/pom.xml | 457 +++++++++++++++++++++++++++++------------------------------
1 file changed, 228 insertions(+), 229 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 4d68f34..33ff20d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2170,235 +2170,234 @@ ${license.additional-notes}
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-toolchains-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>toolchain</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <toolchains>
- <jdk>
- <version>1.8</version>
- <vendor>oracle</vendor>
- </jdk>
- </toolchains>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>jdk9plus</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <build>
- <plugins>
-
- <!-- Compile -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <showDeprecation>true</showDeprecation>
- <showWarnings>true</showWarnings>
- <source>${compileSource}</source>
- <target>${compileTarget}</target>
- <compilerArgs>
- <arg>--add-opens</arg>
- <arg>javax.xml/javax.xml.bind=ALL-UNNAMED</arg>
- </compilerArgs>
- </configuration>
- <!-- goal:compile binds to phase:compile -->
- <!-- goal:testCompile binds to phase:test-compile -->
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>m2e</id>
- <activation>
- <property>
- <name>m2e.version</name>
- </property>
- </activation>
- <build>
- <directory>target-ide</directory>
- </build>
- </profile>
-
-
- <profile>
- <id>deploy-local</id>
- <activation>
- <property>
- <name>deploy</name>
- <value>local</value>
- </property>
- </activation>
- <!-- to deploy locally -->
- <properties>
- <distMgmtSiteUrl>file:///tmp/m2-sites/isis</distMgmtSiteUrl>
- </properties>
- </profile>
-
- <!-- overrides inherited configuration to allow regular deploy plugin
- to work to snapshot repo. Use: -D deploy=snapshot -D modules=standard -D
- distMgmtSnapshotsUrl=... where the last property is the repo URL to deploy
- to -->
- <profile>
- <id>deploy-snapshot</id>
- <activation>
- <property>
- <name>deploy</name>
- <value>snapshot</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <skip>false</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <!--
- this profile allows builds to be deployed to an inhouse nexus repo.
-
- export NEXUS_USERNAME=...
- export NEXUS_PASSWORD=...
- export NEXUS_REPO_URL=...
-
- export REVISION=...
-
- mvn clean deploy \
- -Drevision=$REVISION \
- -Dnexus-deploy \
- -s .m2/settings.xml \
- -Dnexus-deploy.repositoryUrl=$NEXUS_REPO_URL
- -->
- <id>nexus-deploy</id>
- <activation>
- <property>
- <name>nexus-deploy</name>
- </property>
- </activation>
- <properties>
- <nexus-deploy.repositoryUrl>http://localhost:8081/repository/builds</nexus-deploy.repositoryUrl>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.8</version>
- <extensions>true</extensions>
- <configuration>
- <serverId>nexus-deploy.serverId</serverId>
- <skipStaging>true</skipStaging>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <distributionManagement>
- <repository>
- <id>nexus-deploy.serverId</id>
- <url>${nexus-deploy.repositoryUrl}</url>
- </repository>
- </distributionManagement>
- </profile>
- <profile>
- <id>owasp</id>
- <activation>
- <property>
- <name>owasp</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.owasp</groupId>
- <artifactId>dependency-check-maven</artifactId>
- <version>1.3.1</version>
- <executions>
- <execution>
- <id>owasp-aggregate</id>
- <goals>
- <goal>aggregate</goal>
- </goals>
- <configuration>
- <skipProvidedScope>true</skipProvidedScope>
- <skipRuntimeScope>true</skipRuntimeScope>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>jdeps</id>
- <activation>
- <property>
- <name>jdeps</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jdeps-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <id>jdeps-jdkinternals</id>
- <goals>
- <goal>jdkinternals</goal>
- <goal>test-jdkinternals</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>git</id>
- <activation>
- <property>
- <name>!skip.git</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>pl.project13.maven</groupId>
- <artifactId>git-commit-id-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-toolchains-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>toolchain</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <toolchains>
+ <jdk>
+ <version>1.8</version>
+ <vendor>oracle</vendor>
+ </jdk>
+ </toolchains>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>jdk10plus</id>
+ <activation>
+ <jdk>[10,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+
+ <!-- Compile -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <source>10</source>
+ <target>10</target>
+ <compilerArgs>
+ <arg>--add-opens</arg>
+ <arg>javax.xml/javax.xml.bind=ALL-UNNAMED</arg>
+ </compilerArgs>
+ </configuration>
+ <!-- goal:compile binds to phase:compile -->
+ <!-- goal:testCompile binds to phase:test-compile -->
+ </plugin>
+
+ <!-- pre-release, requires java 9+ -->
+ <plugin>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ <version>0.14.0-SNAPSHOT</version>
+ <configuration>
+ <removeOldOutput>true</removeOldOutput>
+ <episode>true</episode>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>m2e</id>
+ <activation>
+ <property>
+ <name>m2e.version</name>
+ </property>
+ </activation>
+ <build>
+ <directory>target-ide</directory>
+ </build>
+ </profile>
+
+
+ <profile>
+ <id>deploy-local</id>
+ <activation>
+ <property>
+ <name>deploy</name>
+ <value>local</value>
+ </property>
+ </activation>
+ <!-- to deploy locally -->
+ <properties>
+ <distMgmtSiteUrl>file:///tmp/m2-sites/isis</distMgmtSiteUrl>
+ </properties>
+ </profile>
+
+ <!-- overrides inherited configuration to allow regular deploy plugin to
+ work to snapshot repo. Use: -D deploy=snapshot -D modules=standard -D distMgmtSnapshotsUrl=...
+ where the last property is the repo URL to deploy to -->
+ <profile>
+ <id>deploy-snapshot</id>
+ <activation>
+ <property>
+ <name>deploy</name>
+ <value>snapshot</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <!-- this profile allows builds to be deployed to an inhouse nexus repo.
+ export NEXUS_USERNAME=... export NEXUS_PASSWORD=... export NEXUS_REPO_URL=...
+ export REVISION=... mvn clean deploy \ -Drevision=$REVISION \ -Dnexus-deploy
+ \ -s .m2/settings.xml \ -Dnexus-deploy.repositoryUrl=$NEXUS_REPO_URL -->
+ <id>nexus-deploy</id>
+ <activation>
+ <property>
+ <name>nexus-deploy</name>
+ </property>
+ </activation>
+ <properties>
+ <nexus-deploy.repositoryUrl>http://localhost:8081/repository/builds</nexus-deploy.repositoryUrl>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>nexus-staging-maven-plugin</artifactId>
+ <version>1.6.8</version>
+ <extensions>true</extensions>
+ <configuration>
+ <serverId>nexus-deploy.serverId</serverId>
+ <skipStaging>true</skipStaging>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <distributionManagement>
+ <repository>
+ <id>nexus-deploy.serverId</id>
+ <url>${nexus-deploy.repositoryUrl}</url>
+ </repository>
+ </distributionManagement>
+ </profile>
+ <profile>
+ <id>owasp</id>
+ <activation>
+ <property>
+ <name>owasp</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.owasp</groupId>
+ <artifactId>dependency-check-maven</artifactId>
+ <version>1.3.1</version>
+ <executions>
+ <execution>
+ <id>owasp-aggregate</id>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ <configuration>
+ <skipProvidedScope>true</skipProvidedScope>
+ <skipRuntimeScope>true</skipRuntimeScope>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>jdeps</id>
+ <activation>
+ <property>
+ <name>jdeps</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jdeps-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <id>jdeps-jdkinternals</id>
+ <goals>
+ <goal>jdkinternals</goal>
+ <goal>test-jdkinternals</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>git</id>
+ <activation>
+ <property>
+ <name>!skip.git</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<modules>
<module>schema</module>
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.