You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/10/28 11:56:21 UTC
[isis] branch v2 updated (8434638 -> b49edfc)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 8434638 ISIS-2094: fixes 'cd' command in .gitlab-ci.yml
new 44a65e2 ISIS-2094: trying to get mavenmixin + flatten to work
new d1e0fa3 ISIS-2094: trying to get mavenmixin + flatten to work
new c9d4790 ISIS-2094: trying to get mavenmixin + flatten to work
new b49edfc ISIS-2094: moves build stuff into shell scripts
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitlab-ci.yml | 54 +-----------
build-core.sh | 28 ++++++
build-example-apps.sh | 50 +++++++++++
build-mixins.sh | 35 ++++++++
core/pom.xml | 1 -
examples/apps/demo/pom.xml | 8 +-
examples/pom.xml | 64 ++------------
mixins/datanucleus-enhance/pom.xml | 8 +-
mixins/docker/pom.xml | 8 +-
mixins/pom.xml | 176 +++++++++++++------------------------
mixins/standard/pom.xml | 9 +-
mixins/surefire/pom.xml | 8 +-
12 files changed, 199 insertions(+), 250 deletions(-)
create mode 100644 build-core.sh
create mode 100644 build-example-apps.sh
create mode 100644 build-mixins.sh
[isis] 03/04: ISIS-2094: trying to get mavenmixin + flatten to work
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit c9d4790b002910ac1802784bef8fe589c3e19f5d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 28 11:02:59 2019 +0000
ISIS-2094: trying to get mavenmixin + flatten to work
---
mixins/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mixins/pom.xml b/mixins/pom.xml
index 2f5b3ce..bba4990 100644
--- a/mixins/pom.xml
+++ b/mixins/pom.xml
@@ -15,10 +15,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>21</version>
- <relativePath />
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>${revision}</version>
+ <relativePath>../core/pom.xml</relativePath>
</parent>
<groupId>org.apache.isis.mixins</groupId>
[isis] 01/04: ISIS-2094: trying to get mavenmixin + flatten to work
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 44a65e296f7275037b2fe1eb8becbc72456ebe95
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 28 10:44:32 2019 +0000
ISIS-2094: trying to get mavenmixin + flatten to work
---
.gitlab-ci.yml | 4 ++++
mixins/pom.xml | 17 +++++++----------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 34d3bf1..6cc126d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,6 +63,10 @@ build-package-push:
-Dgcpappenginerepo-deploy.repositoryUrl=$GCPAPPENGINEREPO_URL \
-Drevision=$REVISION \
-Dskip.assemble-zip \
+ -Dskip.mavenmixin-standard \
+ -Dskip.mavenmixin-docker \
+ -Dskip.mavenmixin-surefire \
+ -Dskip.mavenmixin-datanucleus-enhance \
$CORE_ADDITIONAL_OPTS
- cd ..
- echo ""
diff --git a/mixins/pom.xml b/mixins/pom.xml
index 946e519..129e55a 100644
--- a/mixins/pom.xml
+++ b/mixins/pom.xml
@@ -15,14 +15,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>${revision}</version>
- <relativePath>../core/pom.xml</relativePath>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>21</version>
+ <relativePath />
</parent>
<groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixins</artifactId>
+ <version>${revision}</version>
<name>Apache Isis Maven Mixins</name>
<description>
@@ -66,17 +67,13 @@
</resources>
<plugins>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<configuration>
<updatePomFile>true</updatePomFile>
- <pomElements>
- <dependencyManagement>resolve</dependencyManagement>
- <dependencies>resolve</dependencies>
- </pomElements>
+ <flattenMode>minimum</flattenMode>
</configuration>
<executions>
<execution>
[isis] 04/04: ISIS-2094: moves build stuff into shell scripts
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b49edfc879402ec7898d8ec61f4cc8db9a3eada9
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 28 11:55:46 2019 +0000
ISIS-2094: moves build stuff into shell scripts
---
.gitlab-ci.yml | 58 +----------------
build-core.sh | 28 +++++++++
build-example-apps.sh | 50 +++++++++++++++
build-mixins.sh | 35 +++++++++++
core/pom.xml | 1 -
examples/apps/demo/pom.xml | 8 +--
examples/pom.xml | 64 +++----------------
mixins/datanucleus-enhance/pom.xml | 8 +--
mixins/docker/pom.xml | 8 +--
mixins/pom.xml | 124 +++++++++++++++++++------------------
mixins/standard/pom.xml | 9 +--
mixins/surefire/pom.xml | 8 +--
12 files changed, 201 insertions(+), 200 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6cc126d..2db6c57 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,6 @@
# - builds Docker image of simpleapp
# - pushes to hub.docker.com
#
-#
# It requires the following gitlab secret variables
#
# - GCPAPPENGINEREPO_USERNAME
@@ -46,60 +45,9 @@ stages:
build-package-push:
stage: build-package-push
script:
- - echo ""
- - echo ""
- - echo ""
- - echo "$REVISION"
- - echo "GCPAPPENGINEREPO_URL=$GCPAPPENGINEREPO_URL"
- - echo ""
- - echo ""
- - echo ""
- - cd core
- - >
- mvn -s .m2/settings.xml \
- --batch-mode \
- clean deploy \
- -Dgcpappenginerepo-deploy \
- -Dgcpappenginerepo-deploy.repositoryUrl=$GCPAPPENGINEREPO_URL \
- -Drevision=$REVISION \
- -Dskip.assemble-zip \
- -Dskip.mavenmixin-standard \
- -Dskip.mavenmixin-docker \
- -Dskip.mavenmixin-surefire \
- -Dskip.mavenmixin-datanucleus-enhance \
- $CORE_ADDITIONAL_OPTS
- - cd ..
- - echo ""
- - echo ""
- - echo ""
- - echo "$REVISION"
- - echo ""
- - echo ""
- - echo ""
- - cd examples/apps/$APP_NAME
- - >
- mvn --batch-mode \
- install \
- -Drevision=$REVISION \
- -Disis.version=$REVISION \
- $CORE_ADDITIONAL_OPTS \
- -Dmavenmixin-docker \
- -Ddocker-plugin.imageName=$ORG_NAME/$APP_NAME
- - >
- mvn -s .m2/settings.xml \
- --batch-mode \
- docker:push@push-image-tagged \
- -pl webapp \
- -DskipTests \
- -Dskip.isis-validate \
- -Dskip.isis-swagger \
- -Drevision=$REVISION \
- -Disis.version=$REVISION \
- -Dmavenmixin-docker \
- -Ddocker-plugin.imageName=$ORG_NAME/$APP_NAME \
- -Ddocker-plugin.serverId=docker-registry \
- -Ddocker.registryUrl=$DOCKER_REGISTRY_URL
- - cd ../../..
+ - sh build-mixins.sh
+ - sh build-core.sh
+ - sh build-example-apps.sh
#
diff --git a/build-core.sh b/build-core.sh
new file mode 100644
index 0000000..6c35451
--- /dev/null
+++ b/build-core.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+#set -x
+#trap read debug
+
+echo ""
+echo ""
+echo ""
+
+echo "\$REVISION = ${REVISION}"
+echo "\$GCPAPPENGINEREPO_URL = ${GCPAPPENGINEREPO_URL}"
+
+echo ""
+echo ""
+echo ""
+
+pushd core
+
+mvn -s .m2/settings.xml \
+ --batch-mode \
+ clean deploy \
+ -Dgcpappenginerepo-deploy \
+ -Dgcpappenginerepo-deploy.repositoryUrl=$GCPAPPENGINEREPO_URL \
+ -Drevision=$REVISION \
+ -Dskip.assemble-zip \
+ $CORE_ADDITIONAL_OPTS
+
+popd
+
diff --git a/build-example-apps.sh b/build-example-apps.sh
new file mode 100644
index 0000000..1f39f7e
--- /dev/null
+++ b/build-example-apps.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+#set -x
+#trap read debug
+
+echo ""
+echo ""
+echo ""
+
+echo "\$REVISION = ${REVISION}"
+echo "\$GCPAPPENGINEREPO_URL = ${GCPAPPENGINEREPO_URL}"
+echo "\$ORG_NAME = ${ORG_NAME}"
+echo "\$APP_NAME = ${APP_NAME}"
+echo "\$DOCKER_REGISTRY_URL = ${DOCKER_REGISTRY_URL}"
+
+echo ""
+echo ""
+echo ""
+
+pushd examples/apps/$APP_NAME
+
+mvn -s .m2/settings.xml \
+ --batch-mode \
+ clean deploy \
+ -Dgcpappenginerepo-deploy \
+ -Dgcpappenginerepo-deploy.repositoryUrl=$GCPAPPENGINEREPO_URL \
+ -Drevision=$REVISION
+
+mvn --batch-mode \
+ install \
+ -Drevision=$REVISION \
+ -Disis.version=$REVISION
+ -Dmavenmixin-docker \
+ -Ddocker-plugin.imageName=$ORG_NAME/$APP_NAME
+
+mvn -s .m2/settings.xml \
+ --batch-mode \
+ docker:push@push-image-tagged \
+ -pl webapp \
+ -DskipTests \
+ -Dskip.isis-validate \
+ -Dskip.isis-swagger \
+ -Drevision=$REVISION \
+ -Disis.version=$REVISION \
+ -Dmavenmixin-docker \
+ -Ddocker-plugin.imageName=$ORG_NAME/$APP_NAME \
+ -Ddocker-plugin.serverId=docker-registry \
+ -Ddocker.registryUrl=$DOCKER_REGISTRY_URL
+
+popd
+
diff --git a/build-mixins.sh b/build-mixins.sh
new file mode 100644
index 0000000..fce052d
--- /dev/null
+++ b/build-mixins.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+#set -x
+#trap read debug
+
+echo ""
+echo ""
+echo ""
+
+echo "\$REVISION = ${REVISION}"
+echo "\$GCPAPPENGINEREPO_URL = ${GCPAPPENGINEREPO_URL}"
+
+echo ""
+echo ""
+echo ""
+
+
+pushd mixins
+
+# can't use flatten pom, so have to edit directly instead...
+mvn versions:set -DnewVersion=$REVISION > /dev/null
+
+mvn -s .m2/settings.xml \
+ --batch-mode \
+ clean deploy \
+ -Dgcpappenginerepo-deploy \
+ -Dgcpappenginerepo-deploy.repositoryUrl=$GCPAPPENGINEREPO_URL \
+ -Drevision=$REVISION \
+ -Dskip.mavenmixin-standard \
+ -Dskip.mavenmixin-docker \
+ -Dskip.mavenmixin-surefire \
+ -Dskip.mavenmixin-datanucleus-enhance \
+ $CORE_ADDITIONAL_OPTS
+
+popd
+
diff --git a/core/pom.xml b/core/pom.xml
index b12dd1d..38413f7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2487,7 +2487,6 @@
<modules>
<module>../supplemental-model</module>
- <module>../mixins</module>
<module>schema</module>
<module>commons</module>
diff --git a/examples/apps/demo/pom.xml b/examples/apps/demo/pom.xml
index ee540d8..7b10528 100644
--- a/examples/apps/demo/pom.xml
+++ b/examples/apps/demo/pom.xml
@@ -227,19 +227,19 @@
<configuration>
<mixins>
<mixin>
- <groupId>org.apache.isis.mavendeps</groupId>
+ <groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixin-standard</artifactId>
</mixin>
<mixin>
- <groupId>org.apache.isis.mavendeps</groupId>
+ <groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixin-datanucleus-enhance</artifactId>
</mixin>
<mixin>
- <groupId>org.apache.isis.mavendeps</groupId>
+ <groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixin-surefire</artifactId>
</mixin>
<mixin>
- <groupId>org.apache.isis.mavendeps</groupId>
+ <groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixin-docker</artifactId>
</mixin>
</mixins>
diff --git a/examples/pom.xml b/examples/pom.xml
index 648c152..d7e5afd 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -150,19 +150,19 @@
<configuration>
<mixins>
<mixin>
- <groupId>org.apache.isis.mavendeps</groupId>
+ <groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixin-standard</artifactId>
</mixin>
<mixin>
- <groupId>org.apache.isis.mavendeps</groupId>
+ <groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixin-datanucleus-enhance</artifactId>
</mixin>
<mixin>
- <groupId>org.apache.isis.mavendeps</groupId>
+ <groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixin-surefire</artifactId>
</mixin>
<mixin>
- <groupId>org.apache.isis.mavendeps</groupId>
+ <groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixin-docker</artifactId>
</mixin>
</mixins>
@@ -288,78 +288,30 @@
<!-- MIXINS -->
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
+ <groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixin-standard</artifactId>
<version>${isis.version}</version>
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
+ <groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixin-datanucleus-enhance</artifactId>
<version>${isis.version}</version>
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
+ <groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixin-surefire</artifactId>
<version>${isis.version}</version>
<type>pom</type>
</dependency>
<dependency>
- <groupId>org.apache.isis.mavendeps</groupId>
+ <groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixin-docker</artifactId>
<version>${isis.version}</version>
<type>pom</type>
</dependency>
- <!-- <dependency> -->
- <!-- <groupId>com.danhaywood.mavenmixin</groupId> -->
- <!-- <artifactId>datanucleusenhance</artifactId> -->
- <!-- <version>${mavenmixin-datanucleusenhance.version}</version> -->
- <!-- <type>pom</type> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>com.danhaywood.mavenmixin</groupId> -->
- <!-- <artifactId>docker</artifactId> -->
- <!-- <version>${mavenmixin-docker.version}</version> -->
- <!-- <type>pom</type> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>com.danhaywood.mavenmixin</groupId> -->
- <!-- <artifactId>standard</artifactId> -->
- <!-- <version>${mavenmixin-standard.version}</version> -->
- <!-- <type>pom</type> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>com.danhaywood.mavenmixin</groupId> -->
- <!-- <artifactId>surefire</artifactId> -->
- <!-- <version>${mavenmixin-surefire.version}</version> -->
- <!-- <type>pom</type> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>com.danhaywood.mavenmixin</groupId> -->
- <!-- <artifactId>enforcerrelaxed</artifactId> -->
- <!-- <version>${mavenmixin-enforcerrelaxed.version}</version> -->
- <!-- <type>pom</type> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>com.danhaywood.mavenmixin</groupId> -->
- <!-- <artifactId>sourceandjavadoc</artifactId> -->
- <!-- <version>${mavenmixin-sourceandjavadoc.version}</version> -->
- <!-- <type>pom</type> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>com.danhaywood.mavenmixin</groupId> -->
- <!-- <artifactId>staticanalysis</artifactId> -->
- <!-- <version>${mavenmixin-staticanalysis.version}</version> -->
- <!-- <type>pom</type> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>com.danhaywood.mavenmixin</groupId> -->
- <!-- <artifactId>cucumberreporting</artifactId> -->
- <!-- <version>${mavenmixin-cucumberreporting.version}</version> -->
- <!-- <type>pom</type> -->
- <!-- </dependency> -->
</dependencies>
</dependencyManagement>
diff --git a/mixins/datanucleus-enhance/pom.xml b/mixins/datanucleus-enhance/pom.xml
index 65766ce..06f48f5 100644
--- a/mixins/datanucleus-enhance/pom.xml
+++ b/mixins/datanucleus-enhance/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixins</artifactId>
- <version>${revision}</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>isis-mixin-datanucleus-enhance</artifactId>
- <version>${revision}</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -31,10 +31,6 @@
Maven mixin providing the ability to run datanucleus:enhance on JDO/DN entities.
</description>
- <properties>
- <revision>2.0.0-M3-SNAPSHOT</revision>
- </properties>
-
<profiles>
<profile>
<id>mavenmixin-datanucleusenhance</id>
diff --git a/mixins/docker/pom.xml b/mixins/docker/pom.xml
index 0f3517c..51aec72 100644
--- a/mixins/docker/pom.xml
+++ b/mixins/docker/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixins</artifactId>
- <version>${revision}</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>isis-mixin-docker</artifactId>
- <version>${revision}</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -31,10 +31,6 @@
Maven mixin providing the ability to build, tag and deploy Docker images.
</description>
- <properties>
- <revision>2.0.0-M3-SNAPSHOT</revision>
- </properties>
-
<profiles>
<profile>
diff --git a/mixins/pom.xml b/mixins/pom.xml
index bba4990..d8434d4 100644
--- a/mixins/pom.xml
+++ b/mixins/pom.xml
@@ -15,15 +15,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>${revision}</version>
- <relativePath>../core/pom.xml</relativePath>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>21</version>
+ <relativePath />
</parent>
<groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixins</artifactId>
- <version>${revision}</version>
+ <version>1.0.0</version>
<name>Apache Isis Maven Mixins</name>
<description>
@@ -36,65 +36,11 @@
<jar-plugin.automaticModuleName>org.apache.isis.mixins</jar-plugin.automaticModuleName>
<git-plugin.propertiesDir>org/apache/isis/mixins</git-plugin.propertiesDir>
- <lombok.version>[1.18,)</lombok.version>
-
- <failOnMissingWebXml>false</failOnMissingWebXml>
-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
- <build>
- <resources>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>**</include>
- </includes>
- </resource>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/java</directory>
- <includes>
- <include>**</include>
- </includes>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>flatten-maven-plugin</artifactId>
- <version>1.1.0</version>
- <configuration>
- <updatePomFile>true</updatePomFile>
- <flattenMode>minimum</flattenMode>
- </configuration>
- <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>
- </plugin>
- </plugins>
- </build>
-
<modules>
<module>standard</module>
<module>surefire</module>
@@ -102,6 +48,66 @@
<module>docker</module>
</modules>
+ <profiles>
+ <!-- this profile allows builds to be deployed to GCP, hosting a Maven
+ repo backed by Google Storage see: https://github.com/renaudcerrato/appengine-maven-repository
+ export GCPAPPENGINEREPO_USERNAME=... export GCPAPPENGINEREPO_PASSWORD=...
+ export GCPAPPENGINEREPO_URL=... export REVISION=... mvn -s .m2/settings.xml
+ \ -B \ clean deploy \ -Dgcpappenginerepo-deploy \ -Dgcpappenginerepo-deploy.repositoryUrl=$GCPAPPENGINEREPO_URL
+ \ -Drevision=$REVISION \ -Dskip.assemble-zip \ $CORE_ADDITIONAL_OPTS 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>gcpappenginerepo-deploy.serverId</id>
+ <username>${env.GCPAPPENGINEREPO_USERNAME}</username> <password>${env.GCPAPPENGINEREPO_PASSWORD}</password>
+ </server> </servers> </settings> -->
+ <profile>
+ <id>gcpappenginerepo-deploy</id>
+ <activation>
+ <property>
+ <name>gcpappenginerepo-deploy</name>
+ </property>
+ </activation>
+ <properties>
+ <gcpappenginerepo-deploy.repositoryUrl>https://my-gcp-project-id.appspot.com</gcpappenginerepo-deploy.repositoryUrl>
+ </properties>
+ <distributionManagement>
+ <repository>
+ <id>gcpappenginerepo-deploy.serverId</id>
+ <url>${gcpappenginerepo-deploy.repositoryUrl}</url>
+ </repository>
+ </distributionManagement>
+ </profile>
+
+ <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>
+
+ </profiles>
+
</project>
diff --git a/mixins/standard/pom.xml b/mixins/standard/pom.xml
index ee55792..33fc520 100644
--- a/mixins/standard/pom.xml
+++ b/mixins/standard/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixins</artifactId>
- <version>${revision}</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>isis-mixin-standard</artifactId>
- <version>${revision}</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -31,12 +31,7 @@
Maven mixin for the "standard" set of plugins.
</description>
- <properties>
- <revision>2.0.0-M3-SNAPSHOT</revision>
- </properties>
-
<profiles>
-
<profile>
<id>mavenmixin-standard</id>
<activation>
diff --git a/mixins/surefire/pom.xml b/mixins/surefire/pom.xml
index d4f2023..62d93b0 100644
--- a/mixins/surefire/pom.xml
+++ b/mixins/surefire/pom.xml
@@ -18,11 +18,11 @@
<parent>
<groupId>org.apache.isis.mixins</groupId>
<artifactId>isis-mixins</artifactId>
- <version>${revision}</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>isis-mixin-surefire</artifactId>
- <version>${revision}</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -31,10 +31,6 @@
Maven mixin that configures the surefire plugin to run unit tests, integration tests and BDD specs in separate executions.
</description>
- <properties>
- <revision>2.0.0-M3-SNAPSHOT</revision>
- </properties>
-
<profiles>
<profile>
[isis] 02/04: ISIS-2094: trying to get mavenmixin + flatten to work
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d1e0fa32a92843f842757e0569fe44f9eacf7e7d
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Oct 28 10:55:15 2019 +0000
ISIS-2094: trying to get mavenmixin + flatten to work
---
mixins/pom.xml | 53 -----------------------------------------------------
1 file changed, 53 deletions(-)
diff --git a/mixins/pom.xml b/mixins/pom.xml
index 129e55a..2f5b3ce 100644
--- a/mixins/pom.xml
+++ b/mixins/pom.xml
@@ -95,59 +95,6 @@
</plugins>
</build>
- <profiles>
- <profile>
- <id>jdk11</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
-
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-ri</artifactId>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- </dependencies>
-
- </profile>
- </profiles>
-
- <dependencyManagement>
- <dependencies>
-
- <!-- ISIS CORE -->
- <dependency>
- <groupId>org.apache.isis.core</groupId>
- <artifactId>isis</artifactId>
- <version>${isis.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
- <!-- LOMBOK -->
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
<modules>
<module>standard</module>
<module>surefire</module>