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/29 08:34:47 UTC
[isis] branch master updated: ISIS-1841 simpleapp: bumping lombok
and maven-compiler-plugin versions
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 8d621268 ISIS-1841 simpleapp: bumping lombok and maven-compiler-plugin versions
8d621268 is described below
commit 8d6212689a3e609310e94c138a20a83a63b6054b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue May 29 10:34:17 2018 +0200
ISIS-1841 simpleapp: bumping lombok and maven-compiler-plugin versions
---
example/application/simpleapp/application/pom.xml | 2 --
.../application/simpleapp/module-simple/pom.xml | 8 -------
example/application/simpleapp/pom.xml | 27 +---------------------
example/application/simpleapp/webapp/pom.xml | 1 -
4 files changed, 1 insertion(+), 37 deletions(-)
diff --git a/example/application/simpleapp/application/pom.xml b/example/application/simpleapp/application/pom.xml
index 7098f15..a3d3705 100644
--- a/example/application/simpleapp/application/pom.xml
+++ b/example/application/simpleapp/application/pom.xml
@@ -107,7 +107,6 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-wrapper</artifactId>
- <version>${isis.version}</version>
</dependency>
<!-- test -->
@@ -121,7 +120,6 @@
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
- <version>${isis.version}</version>
<type>pom</type>
<scope>test</scope>
</dependency>
diff --git a/example/application/simpleapp/module-simple/pom.xml b/example/application/simpleapp/module-simple/pom.xml
index 29f5121..09db1bc 100644
--- a/example/application/simpleapp/module-simple/pom.xml
+++ b/example/application/simpleapp/module-simple/pom.xml
@@ -144,7 +144,6 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-applib</artifactId>
- <version>${isis.version}</version>
</dependency>
<!-- ISIS CORE PLUGINS -->
@@ -152,31 +151,26 @@
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-codegen-javassist</artifactId>
- <version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-discovery-reflections</artifactId>
- <version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jdo-datanucleus-5</artifactId>
- <version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-eventbus-guava</artifactId>
- <version>${isis.version}</version>
</dependency>
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-plugins-jaxrs-resteasy-3</artifactId>
- <version>${isis.version}</version>
</dependency>
<!-- TESTS -->
@@ -184,7 +178,6 @@
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-testing</artifactId>
- <version>${isis.version}</version>
<type>pom</type>
<scope>test</scope>
</dependency>
@@ -192,7 +185,6 @@
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>${hsqldb.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 9c95460..242ede8 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -39,7 +39,7 @@
<revision>2.0.0-M1-SNAPSHOT</revision>
<isis.version>2.0.0-M1-SNAPSHOT</isis.version>
- <lombok.version>1.16.20</lombok.version>
+ <lombok.version>[1.16,)</lombok.version>
<compiler-plugin.source>1.8</compiler-plugin.source>
<compiler-plugin.target>1.8</compiler-plugin.target>
@@ -150,31 +150,6 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>m2e</id>
- <activation>
- <property>
- <name>m2e.version</name>
- </property>
- </activation>
- <build>
- <directory>target-ide</directory>
- <plugins>
- <!-- eclipse doesn't seem to support maven mixins config, so repeat here -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${compiler-plugin.source}</source>
- <target>${compiler-plugin.target}</target>
- <compilerArgument>${compiler-plugin.compilerArgument}</compilerArgument>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
<modules>
<module>module-simple</module>
<module>application</module>
diff --git a/example/application/simpleapp/webapp/pom.xml b/example/application/simpleapp/webapp/pom.xml
index 498c24d..b7b6701 100644
--- a/example/application/simpleapp/webapp/pom.xml
+++ b/example/application/simpleapp/webapp/pom.xml
@@ -118,7 +118,6 @@
<dependency>
<groupId>org.apache.isis.mavendeps</groupId>
<artifactId>isis-mavendeps-webapp</artifactId>
- <version>${isis.version}</version>
<type>pom</type>
</dependency>
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.