You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2018/09/21 09:21:17 UTC
empire-db git commit: Maven configuration improvement
Repository: empire-db
Updated Branches:
refs/heads/master da638a89d -> b51167731
Maven configuration improvement
Project: http://git-wip-us.apache.org/repos/asf/empire-db/repo
Commit: http://git-wip-us.apache.org/repos/asf/empire-db/commit/b5116773
Tree: http://git-wip-us.apache.org/repos/asf/empire-db/tree/b5116773
Diff: http://git-wip-us.apache.org/repos/asf/empire-db/diff/b5116773
Branch: refs/heads/master
Commit: b51167731b473ea2d9eac28bdb439de899e214eb
Parents: da638a8
Author: Rainer Döbele <do...@apache.org>
Authored: Fri Sep 21 11:21:12 2018 +0200
Committer: Rainer Döbele <do...@apache.org>
Committed: Fri Sep 21 11:21:12 2018 +0200
----------------------------------------------------------------------
.../empire-db-example-codegen/pom.xml | 8 ++---
.../empire-db-example-spring/pom.xml | 1 -
empire-db/pom.xml | 34 +++++++++++++++++++-
3 files changed, 36 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/empire-db/blob/b5116773/empire-db-examples/empire-db-example-codegen/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db-examples/empire-db-example-codegen/pom.xml b/empire-db-examples/empire-db-example-codegen/pom.xml
index 089fe3a..6d05010 100644
--- a/empire-db-examples/empire-db-example-codegen/pom.xml
+++ b/empire-db-examples/empire-db-example-codegen/pom.xml
@@ -49,7 +49,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -74,17 +73,16 @@
<dbClassName>MyDatabase</dbClassName>
-->
</configuration>
+ <!-- enable the code generation on each build.
+ when left out "mvn generate-sources" must be called
<executions>
- <!--
- We enable the code generation on each build. The other option is
- to leave out this section and call mvn generate-sources
- -->
<execution>
<goals>
<goal>codegen</goal>
</goals>
</execution>
</executions>
+ -->
<dependencies>
<dependency>
<groupId>hsqldb</groupId>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/b5116773/empire-db-examples/empire-db-example-spring/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db-examples/empire-db-example-spring/pom.xml b/empire-db-examples/empire-db-example-spring/pom.xml
index bf31efb..95efd22 100644
--- a/empire-db-examples/empire-db-example-spring/pom.xml
+++ b/empire-db-examples/empire-db-example-spring/pom.xml
@@ -111,7 +111,6 @@
<dependency>
<groupId>org.apache.empire-db</groupId>
<artifactId>empire-db-spring</artifactId>
- <version>2.4.7-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/b5116773/empire-db/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db/pom.xml b/empire-db/pom.xml
index c3a5844..c93ee88 100644
--- a/empire-db/pom.xml
+++ b/empire-db/pom.xml
@@ -91,7 +91,39 @@
<version>1.4</version>
<scope>test</scope>
</dependency>
-
</dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- Eclipse: void message "maven-remote-resources-plugin (goal "process") is ignored by m2e." -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
</project>