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/10/23 18:58:27 UTC
empire-db git commit: release rollback due to missing excludes in
empire-assembly-all.xml
Repository: empire-db
Updated Branches:
refs/heads/master d011d07dc -> 5074041e2
release rollback due to missing excludes in empire-assembly-all.xml
Project: http://git-wip-us.apache.org/repos/asf/empire-db/repo
Commit: http://git-wip-us.apache.org/repos/asf/empire-db/commit/5074041e
Tree: http://git-wip-us.apache.org/repos/asf/empire-db/tree/5074041e
Diff: http://git-wip-us.apache.org/repos/asf/empire-db/diff/5074041e
Branch: refs/heads/master
Commit: 5074041e2c5c9b325b20cf19ea8ab21d88dc7f38
Parents: d011d07
Author: Rainer Döbele <do...@apache.org>
Authored: Tue Oct 23 20:58:22 2018 +0200
Committer: Rainer Döbele <do...@apache.org>
Committed: Tue Oct 23 20:58:22 2018 +0200
----------------------------------------------------------------------
empire-db-codegen/pom.xml | 2 +-
empire-db-dist/pom.xml | 11 +++++------
empire-db-dist/src/assemble/empire-assembly-all.xml | 4 +++-
empire-db-examples/empire-db-example-advanced/pom.xml | 2 +-
empire-db-examples/empire-db-example-basic/pom.xml | 2 +-
empire-db-examples/empire-db-example-cxf/pom.xml | 2 +-
empire-db-examples/empire-db-example-jsf2/pom.xml | 2 +-
empire-db-examples/empire-db-example-spring/pom.xml | 2 +-
empire-db-examples/empire-db-example-struts2-cxf/pom.xml | 2 +-
empire-db-examples/empire-db-example-struts2/pom.xml | 2 +-
empire-db-examples/empire-db-example-vue/pom.xml | 2 +-
empire-db-examples/pom.xml | 2 +-
empire-db-jsf2/pom.xml | 2 +-
empire-db-maven-plugin/pom.xml | 2 +-
empire-db-spring/pom.xml | 2 +-
empire-db-struts2/pom.xml | 2 +-
empire-db/pom.xml | 2 +-
pom.xml | 2 +-
18 files changed, 24 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/empire-db-codegen/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db-codegen/pom.xml b/empire-db-codegen/pom.xml
index 7f20538..3d18929 100644
--- a/empire-db-codegen/pom.xml
+++ b/empire-db-codegen/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>empire-db-parent</artifactId>
<groupId>org.apache.empire-db</groupId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
</parent>
<artifactId>empire-db-codegen</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/empire-db-dist/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db-dist/pom.xml b/empire-db-dist/pom.xml
index 8902651..47f3245 100644
--- a/empire-db-dist/pom.xml
+++ b/empire-db-dist/pom.xml
@@ -19,10 +19,9 @@
<parent>
<artifactId>empire-db-parent</artifactId>
<groupId>org.apache.empire-db</groupId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
</parent>
<artifactId>empire-db-dist</artifactId>
- <version>2.4.6</version>
<name>Apache Empire-db Distribtion</name>
<packaging>pom</packaging>
@@ -85,25 +84,25 @@
<dependency>
<groupId>org.apache.empire-db</groupId>
<artifactId>empire-db</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.apache.empire-db</groupId>
<artifactId>empire-db-struts2</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.apache.empire-db</groupId>
<artifactId>empire-db-jsf2</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
<classifier>javadoc</classifier>
</dependency>
<dependency>
<groupId>org.apache.empire-db</groupId>
<artifactId>empire-db-spring</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
<classifier>javadoc</classifier>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/empire-db-dist/src/assemble/empire-assembly-all.xml
----------------------------------------------------------------------
diff --git a/empire-db-dist/src/assemble/empire-assembly-all.xml b/empire-db-dist/src/assemble/empire-assembly-all.xml
index b2f308e..f3c44d2 100644
--- a/empire-db-dist/src/assemble/empire-assembly-all.xml
+++ b/empire-db-dist/src/assemble/empire-assembly-all.xml
@@ -43,12 +43,14 @@
</includes>
<excludes>
<exclude>**/empire-db/target/**</exclude>
- <exclude>**/empire-db-*/target/**</exclude>
+ <exclude>**/empire-db-*/target/**</exclude>
<exclude>**/.classpath/**</exclude>
<exclude>**/.project/**</exclude>
<exclude>**/.settings/**</exclude>
<exclude>**/.amateras/**</exclude>
<exclude>**/.tomcatplugin/**</exclude>
+ <exclude>**/.idea/**</exclude>
+ <exclude>**/empire-db-example-vue/src/main/vue/node_modules/**</exclude>
<exclude>empire-db-examples/tutorial.pdf</exclude>
</excludes>
</fileSet>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/empire-db-examples/empire-db-example-advanced/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db-examples/empire-db-example-advanced/pom.xml b/empire-db-examples/empire-db-example-advanced/pom.xml
index 8de91b1..3326337 100644
--- a/empire-db-examples/empire-db-example-advanced/pom.xml
+++ b/empire-db-examples/empire-db-example-advanced/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.empire-db</groupId>
<artifactId>empire-db-examples</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
</parent>
<artifactId>empire-db-example-advanced</artifactId>
<name>Apache Empire-db Advanced Example</name>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/empire-db-examples/empire-db-example-basic/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db-examples/empire-db-example-basic/pom.xml b/empire-db-examples/empire-db-example-basic/pom.xml
index b89d34c..fe0c644 100644
--- a/empire-db-examples/empire-db-example-basic/pom.xml
+++ b/empire-db-examples/empire-db-example-basic/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.empire-db</groupId>
<artifactId>empire-db-examples</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
</parent>
<artifactId>empire-db-example-basic</artifactId>
<name>Apache Empire-db Basic Example</name>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/empire-db-examples/empire-db-example-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db-examples/empire-db-example-cxf/pom.xml b/empire-db-examples/empire-db-example-cxf/pom.xml
index 6d0ab32..3b3b3e3 100644
--- a/empire-db-examples/empire-db-example-cxf/pom.xml
+++ b/empire-db-examples/empire-db-example-cxf/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>empire-db-examples</artifactId>
<groupId>org.apache.empire-db</groupId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>empire-db-example-cxf</artifactId>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/empire-db-examples/empire-db-example-jsf2/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db-examples/empire-db-example-jsf2/pom.xml b/empire-db-examples/empire-db-example-jsf2/pom.xml
index fcc21b4..ff26f71 100644
--- a/empire-db-examples/empire-db-example-jsf2/pom.xml
+++ b/empire-db-examples/empire-db-example-jsf2/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>empire-db-examples</artifactId>
<groupId>org.apache.empire-db</groupId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
</parent>
<artifactId>empire-db-example-jsf2</artifactId>
<name>Apache Empire-db JSF2 Example</name>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/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 86f5170..95efd22 100644
--- a/empire-db-examples/empire-db-example-spring/pom.xml
+++ b/empire-db-examples/empire-db-example-spring/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.empire-db</groupId>
<artifactId>empire-db-examples</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
</parent>
<artifactId>empire-db-example-spring</artifactId>
<name>Apache Empire-db Spring Example</name>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/empire-db-examples/empire-db-example-struts2-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db-examples/empire-db-example-struts2-cxf/pom.xml b/empire-db-examples/empire-db-example-struts2-cxf/pom.xml
index 58b7b41..3453f8f 100644
--- a/empire-db-examples/empire-db-example-struts2-cxf/pom.xml
+++ b/empire-db-examples/empire-db-example-struts2-cxf/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>empire-db-examples</artifactId>
<groupId>org.apache.empire-db</groupId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>empire-db-example-struts2-cxf</artifactId>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/empire-db-examples/empire-db-example-struts2/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db-examples/empire-db-example-struts2/pom.xml b/empire-db-examples/empire-db-example-struts2/pom.xml
index 1a683cb..5a78452 100644
--- a/empire-db-examples/empire-db-example-struts2/pom.xml
+++ b/empire-db-examples/empire-db-example-struts2/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.empire-db</groupId>
<artifactId>empire-db-examples</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
</parent>
<artifactId>empire-db-example-struts2</artifactId>
<packaging>war</packaging>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/empire-db-examples/empire-db-example-vue/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db-examples/empire-db-example-vue/pom.xml b/empire-db-examples/empire-db-example-vue/pom.xml
index 94115f2..e39cc24 100644
--- a/empire-db-examples/empire-db-example-vue/pom.xml
+++ b/empire-db-examples/empire-db-example-vue/pom.xml
@@ -16,7 +16,7 @@
<parent>
<artifactId>empire-db-examples</artifactId>
<groupId>org.apache.empire-db</groupId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
</parent>
<artifactId>empire-db-example-vue</artifactId>
<packaging>war</packaging>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/empire-db-examples/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db-examples/pom.xml b/empire-db-examples/pom.xml
index 93f0e8a..a2cca98 100644
--- a/empire-db-examples/pom.xml
+++ b/empire-db-examples/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.empire-db</groupId>
<artifactId>empire-db-parent</artifactId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>empire-db-examples</artifactId>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/empire-db-jsf2/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db-jsf2/pom.xml b/empire-db-jsf2/pom.xml
index d1f46c4..0193bb6 100644
--- a/empire-db-jsf2/pom.xml
+++ b/empire-db-jsf2/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>empire-db-parent</artifactId>
<groupId>org.apache.empire-db</groupId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
</parent>
<artifactId>empire-db-jsf2</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/empire-db-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db-maven-plugin/pom.xml b/empire-db-maven-plugin/pom.xml
index 30cd265..55bbea3 100644
--- a/empire-db-maven-plugin/pom.xml
+++ b/empire-db-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>empire-db-parent</artifactId>
<groupId>org.apache.empire-db</groupId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
</parent>
<artifactId>empire-db-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/empire-db-spring/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db-spring/pom.xml b/empire-db-spring/pom.xml
index d76fbe3..d342309 100644
--- a/empire-db-spring/pom.xml
+++ b/empire-db-spring/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>empire-db-parent</artifactId>
<groupId>org.apache.empire-db</groupId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
</parent>
<artifactId>empire-db-spring</artifactId>
<name>Apache Empire-db Spring JDBC Template</name>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/empire-db-struts2/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db-struts2/pom.xml b/empire-db-struts2/pom.xml
index cfa369a..131d577 100644
--- a/empire-db-struts2/pom.xml
+++ b/empire-db-struts2/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>empire-db-parent</artifactId>
<groupId>org.apache.empire-db</groupId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
</parent>
<artifactId>empire-db-struts2</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/empire-db/pom.xml
----------------------------------------------------------------------
diff --git a/empire-db/pom.xml b/empire-db/pom.xml
index 63bd0ee..c93ee88 100644
--- a/empire-db/pom.xml
+++ b/empire-db/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>empire-db-parent</artifactId>
<groupId>org.apache.empire-db</groupId>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
</parent>
<artifactId>empire-db</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/empire-db/blob/5074041e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3b5aeaf..118f03a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.apache.empire-db</groupId>
<artifactId>empire-db-parent</artifactId>
<packaging>pom</packaging>
- <version>2.5.0-SNAPSHOT</version>
+ <version>2.4.7-SNAPSHOT</version>
<name>Apache Empire-db</name>
<description>Apache Empire-db is an Open Source relational data persistence component which allows database vendor independent dynamic query definition as well as safe and simple data retrieval and updating. Compared to most other solutions like e.g. Hibernate, TopLink, iBATIS or JPA implementations, Empire-db takes a considerably different approach, with a special focus on compile-time safety, reduced redundancies and improved developer productivity.</description>
<inceptionYear>2008</inceptionYear>