This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch maint-1.16.2 in repository https://gitbox.apache.org/repos/asf/isis.git
commit a0857dccf7a6bfbfa324c773ad9ec9d09dad450a Author: danhaywood <d...@haywood-associates.co.uk> AuthorDate: Fri Jul 6 12:45:47 2018 +0100 ISIS-1965: updates apps to use repo.incode.cloud rather than cloudbees Also: - bumps version of lombok --- core/pom.xml | 41 ++-- example/application/helloworld/pom.xml | 218 ++++++++++++++++----- example/application/simpleapp/pom.xml | 179 ++++++++++++++++- .../src/main/resources/archetype-resources/pom.xml | 2 +- 4 files changed, 369 insertions(+), 71 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 03f0ce8..5b1e55e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -2248,17 +2248,36 @@ ${license.additional-notes} </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 + + <!-- + this profile allows builds to be deployed to an inhouse nexus repo. + + export NEXUS_USERNAME=... + export NEXUS_PASSWORD=... + export NEXUS_REPO_URL=http://incode-binaries.westeurope.azurecontainer.io:8081/repository/maven2-incode-interims/ + + export REVISION=... + + mvn clean deploy \ + -Drevision=$REVISION \ + -Dnexus-deploy \ + -s .m2/settings.xml \ + -Dnexus-deploy.repositoryUrl=$NEXUS_REPO_URL + + with .m2/settings.xml as: + + <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd"> + <servers> + <server> + <id>nexus-deploy.serverId</id> + <username>${env.NEXUS_USERNAME}</username> + <password>${env.NEXUS_PASSWORD}</password> + </server> + </servers> + </settings> + --> <id>nexus-deploy</id> <activation> diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml index 131b08c..85563a9 100644 --- a/example/application/helloworld/pom.xml +++ b/example/application/helloworld/pom.xml @@ -31,7 +31,7 @@ <artifactId>helloworld</artifactId> <version>${revision}</version> - <name>Apache Isis App -HelloWorld</name> + <name>Apache Isis App - HelloWorld</name> <packaging>war</packaging> @@ -120,57 +120,6 @@ </plugins> </build> - <repositories> - <repository> - <id>apache.snapshots</id> - <name>Apache Snapshots</name> - <url>https://repository.apache.org/content/repositories/snapshots/</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - <repository> - <id>cloudbees.estatio.snapshots</id> - <url>http://repository-estatio.forge.cloudbees.com/snapshot/</url> - <name>CloudBees Snapshots (and Interim Releases)</name> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - <checksumPolicy>fail</checksumPolicy> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <layout>default</layout> - </repository> - <repository> - <id>sonatype-snapshots</id> - <url>https://oss.sonatype.org/content/repositories/snapshots</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>cloudbees.estatio.snapshots</id> - <name>CloudBees Snapshots (and Interim Releases)</name> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - <checksumPolicy>fail</checksumPolicy> - </releases> - <url>http://repository-estatio.forge.cloudbees.com/snapshot/</url> - <layout>default</layout> - </pluginRepository> - </pluginRepositories> - <dependencyManagement> <dependencies> <dependency> @@ -236,6 +185,171 @@ </plugins> </build> </profile> + + <!-- TODO: move up to incode-build --> + <profile> + <id>incode-cloud-maven</id> + <activation> + <property> + <name>!skip.incode-cloud-maven</name> + </property> + </activation> + <repositories> + <repository> + <id>incode-cloud-maven</id> + <url>https://repo.incode.cloud/repository/maven/</url> + <name>Incode Cloud (maven)</name> + <releases> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <layout>default</layout> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>incode-cloud-maven</id> + <name>Incode Cloud (maven)</name> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </releases> + <url>https://repo.incode.cloud/repository/maven/</url> + <layout>default</layout> + </pluginRepository> + </pluginRepositories> + </profile> + + <!-- TODO: move up to incode-build --> + <profile> + <id>incode-cloud-maven-dev</id> + <activation> + <property> + <name>incode-cloud-maven-dev</name> + </property> + </activation> + <repositories> + <repository> + <id>incode-cloud-maven-dev</id> + <url>https://repo.incode.cloud/repository/maven-dev/</url> + <name>Incode Cloud (maven-dev)</name> + <releases> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <layout>default</layout> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>incode-cloud-maven-dev</id> + <name>Incode Cloud (maven-dev)</name> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </releases> + <url>https://repo.incode.cloud/repository/maven-dev/</url> + <layout>default</layout> + </pluginRepository> + </pluginRepositories> + </profile> + + <!-- TODO: move up to incode-build --> + <profile> + <id>incode-cloud-maven-test</id> + <activation> + <property> + <name>incode-cloud-maven-test</name> + </property> + </activation> + <repositories> + <repository> + <id>incode-cloud-maven-test</id> + <url>https://repo.incode.cloud/repository/maven-test/</url> + <name>Incode Cloud (maven-test)</name> + <releases> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <layout>default</layout> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>incode-cloud-maven-test</id> + <name>Incode Cloud (maven-test)</name> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </releases> + <url>https://repo.incode.cloud/repository/maven-test/</url> + <layout>default</layout> + </pluginRepository> + </pluginRepositories> + </profile> + + <!-- TODO: move up to incode-build --> + <profile> + <id>incode-cloud-maven-prod</id> + <activation> + <property> + <name>incode-cloud-maven-prod</name> + </property> + </activation> + <repositories> + <repository> + <id>incode-cloud-maven-prod</id> + <url>https://repo.incode.cloud/repository/maven-prod/</url> + <name>Incode Cloud (maven-prod)</name> + <releases> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <layout>default</layout> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>incode-cloud-maven-prod</id> + <name>Incode Cloud (maven-prod)</name> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </releases> + <url>https://repo.incode.cloud/repository/maven-prod/</url> + <layout>default</layout> + </pluginRepository> + </pluginRepositories> + </profile> + </profiles> </project> diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml index c428976..d9db1b4 100644 --- a/example/application/simpleapp/pom.xml +++ b/example/application/simpleapp/pom.xml @@ -40,7 +40,7 @@ <isis.version>${revision}</isis.version> - <lombok.version>1.16.20</lombok.version> + <lombok.version>1.18.0</lombok.version> <compiler-plugin.source>1.8</compiler-plugin.source> <compiler-plugin.target>1.8</compiler-plugin.target> @@ -150,6 +150,12 @@ </dependency> </dependencies> + <modules> + <module>module-simple</module> + <module>application</module> + <module>webapp</module> + </modules> + <profiles> <profile> <id>m2e</id> @@ -173,12 +179,171 @@ </plugins> </build> </profile> - </profiles> - <modules> - <module>module-simple</module> - <module>application</module> - <module>webapp</module> - </modules> + <!-- TODO: move up to incode-build --> + <profile> + <id>incode-cloud-maven</id> + <activation> + <property> + <name>!skip.incode-cloud-maven</name> + </property> + </activation> + <repositories> + <repository> + <id>incode-cloud-maven</id> + <url>https://repo.incode.cloud/repository/maven/</url> + <name>Incode Cloud (maven)</name> + <releases> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <layout>default</layout> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>incode-cloud-maven</id> + <name>Incode Cloud (maven)</name> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </releases> + <url>https://repo.incode.cloud/repository/maven/</url> + <layout>default</layout> + </pluginRepository> + </pluginRepositories> + </profile> + + <!-- TODO: move up to incode-build --> + <profile> + <id>incode-cloud-maven-dev</id> + <activation> + <property> + <name>incode-cloud-maven-dev</name> + </property> + </activation> + <repositories> + <repository> + <id>incode-cloud-maven-dev</id> + <url>https://repo.incode.cloud/repository/maven-dev/</url> + <name>Incode Cloud (maven-dev)</name> + <releases> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <layout>default</layout> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>incode-cloud-maven-dev</id> + <name>Incode Cloud (maven-dev)</name> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </releases> + <url>https://repo.incode.cloud/repository/maven-dev/</url> + <layout>default</layout> + </pluginRepository> + </pluginRepositories> + </profile> + + <!-- TODO: move up to incode-build --> + <profile> + <id>incode-cloud-maven-test</id> + <activation> + <property> + <name>incode-cloud-maven-test</name> + </property> + </activation> + <repositories> + <repository> + <id>incode-cloud-maven-test</id> + <url>https://repo.incode.cloud/repository/maven-test/</url> + <name>Incode Cloud (maven-test)</name> + <releases> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <layout>default</layout> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>incode-cloud-maven-test</id> + <name>Incode Cloud (maven-test)</name> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </releases> + <url>https://repo.incode.cloud/repository/maven-test/</url> + <layout>default</layout> + </pluginRepository> + </pluginRepositories> + </profile> + + <!-- TODO: move up to incode-build --> + <profile> + <id>incode-cloud-maven-prod</id> + <activation> + <property> + <name>incode-cloud-maven-prod</name> + </property> + </activation> + <repositories> + <repository> + <id>incode-cloud-maven-prod</id> + <url>https://repo.incode.cloud/repository/maven-prod/</url> + <name>Incode Cloud (maven-prod)</name> + <releases> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </releases> + <snapshots> + <enabled>false</enabled> + <updatePolicy>always</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <layout>default</layout> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>incode-cloud-maven-prod</id> + <name>Incode Cloud (maven-prod)</name> + <releases> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + <checksumPolicy>fail</checksumPolicy> + </releases> + <url>https://repo.incode.cloud/repository/maven-prod/</url> + <layout>default</layout> + </pluginRepository> + </pluginRepositories> + </profile> + + </profiles> </project> diff --git a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml index 4a5bac4..cfe5d95 100644 --- a/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml +++ b/example/archetype/simpleapp/src/main/resources/archetype-resources/pom.xml @@ -38,7 +38,7 @@ <isis.version>1.16.2</isis.version> - <lombok.version>1.16.20</lombok.version> + <lombok.version>1.18.0</lombok.version> <compiler-plugin.source>1.8</compiler-plugin.source> <compiler-plugin.target>1.8</compiler-plugin.target>