deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johndam...@apache.org
Subject [3/3] deltaspike git commit: Merge branch 'ds-1.7.0'
Date Sun, 19 Jun 2016 23:06:57 GMT
Merge branch 'ds-1.7.0'


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/691ffdf0
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/691ffdf0
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/691ffdf0

Branch: refs/heads/master
Commit: 691ffdf059a350691de0d091d596b84719b04a47
Parents: 03347f0 8e774af
Author: John D. Ament <johndament@apache.org>
Authored: Sun Jun 19 19:06:36 2016 -0400
Committer: John D. Ament <johndament@apache.org>
Committed: Sun Jun 19 19:06:36 2016 -0400

----------------------------------------------------------------------
 deltaspike/cdictrl/api/pom.xml                                 | 2 +-
 deltaspike/cdictrl/impl-openejb/pom.xml                        | 2 +-
 deltaspike/cdictrl/impl-owb/pom.xml                            | 2 +-
 deltaspike/cdictrl/impl-weld/pom.xml                           | 2 +-
 deltaspike/cdictrl/pom.xml                                     | 4 ++--
 deltaspike/cdictrl/servlet/pom.xml                             | 2 +-
 deltaspike/cdictrl/tck/pom.xml                                 | 2 +-
 deltaspike/checkstyle-rules/pom.xml                            | 2 +-
 deltaspike/core/api/pom.xml                                    | 2 +-
 deltaspike/core/impl/pom.xml                                   | 2 +-
 deltaspike/core/pom.xml                                        | 2 +-
 deltaspike/dist/bom/pom.xml                                    | 2 +-
 deltaspike/dist/full/pom.xml                                   | 2 +-
 deltaspike/dist/pom.xml                                        | 4 ++--
 deltaspike/examples/jse-examples/pom.xml                       | 2 +-
 deltaspike/examples/jsf-examples/pom.xml                       | 2 +-
 deltaspike/examples/jsf-playground/pom.xml                     | 2 +-
 deltaspike/examples/pom.xml                                    | 2 +-
 deltaspike/examples/scheduler-playground/pom.xml               | 2 +-
 .../examples/security-requested-page-after-login-cdi/pom.xml   | 2 +-
 .../security-requested-page-after-login-picketlink/pom.xml     | 2 +-
 deltaspike/modules/bean-validation/api/pom.xml                 | 2 +-
 deltaspike/modules/bean-validation/impl/pom.xml                | 2 +-
 deltaspike/modules/bean-validation/pom.xml                     | 4 ++--
 deltaspike/modules/data/api/pom.xml                            | 2 +-
 deltaspike/modules/data/impl/pom.xml                           | 2 +-
 deltaspike/modules/data/pom.xml                                | 2 +-
 deltaspike/modules/data/test-java8/pom.xml                     | 6 ++----
 deltaspike/modules/jpa/api/pom.xml                             | 2 +-
 deltaspike/modules/jpa/impl/pom.xml                            | 2 +-
 deltaspike/modules/jpa/pom.xml                                 | 4 ++--
 deltaspike/modules/jsf/api/pom.xml                             | 2 +-
 deltaspike/modules/jsf/impl-ee6/pom.xml                        | 2 +-
 deltaspike/modules/jsf/impl/pom.xml                            | 2 +-
 deltaspike/modules/jsf/pom.xml                                 | 4 ++--
 deltaspike/modules/partial-bean/api/pom.xml                    | 2 +-
 deltaspike/modules/partial-bean/impl/pom.xml                   | 2 +-
 deltaspike/modules/partial-bean/pom.xml                        | 4 ++--
 deltaspike/modules/pom.xml                                     | 4 ++--
 deltaspike/modules/proxy/api/pom.xml                           | 2 +-
 deltaspike/modules/proxy/impl-asm5/pom.xml                     | 2 +-
 deltaspike/modules/proxy/pom.xml                               | 4 ++--
 deltaspike/modules/scheduler/api/pom.xml                       | 2 +-
 deltaspike/modules/scheduler/impl/pom.xml                      | 2 +-
 deltaspike/modules/scheduler/pom.xml                           | 4 ++--
 deltaspike/modules/security/api/pom.xml                        | 2 +-
 deltaspike/modules/security/impl/pom.xml                       | 2 +-
 deltaspike/modules/security/pom.xml                            | 4 ++--
 deltaspike/modules/servlet/api/pom.xml                         | 2 +-
 deltaspike/modules/servlet/impl/pom.xml                        | 2 +-
 deltaspike/modules/servlet/pom.xml                             | 4 ++--
 deltaspike/modules/test-control/api/pom.xml                    | 2 +-
 deltaspike/modules/test-control/impl/pom.xml                   | 2 +-
 deltaspike/modules/test-control/pom.xml                        | 4 ++--
 deltaspike/parent/code/pom.xml                                 | 2 +-
 deltaspike/parent/pom.xml                                      | 2 +-
 deltaspike/pom.xml                                             | 4 ++--
 deltaspike/test-utils/pom.xml                                  | 2 +-
 documentation/pom.xml                                          | 4 ++--
 pom.xml                                                        | 2 +-
 site/pom.xml                                                   | 4 ++--
 61 files changed, 77 insertions(+), 79 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/691ffdf0/deltaspike/cdictrl/pom.xml
----------------------------------------------------------------------
diff --cc deltaspike/cdictrl/pom.xml
index 1586569,822266e..eb7a2c2
--- a/deltaspike/cdictrl/pom.xml
+++ b/deltaspike/cdictrl/pom.xml
@@@ -22,9 -22,9 +22,9 @@@
  
      <parent>
          <groupId>org.apache.deltaspike</groupId>
-         <artifactId>parent-code</artifactId>
-         <version>1.7.0-SNAPSHOT</version>
+         <artifactId>parent</artifactId>
+         <version>1.7.1-SNAPSHOT</version>
 -        <relativePath>../parent/pom.xml</relativePath>
 +        <relativePath>../parent/code/pom.xml</relativePath>
      </parent>
  
      <groupId>org.apache.deltaspike.cdictrl</groupId>

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/691ffdf0/deltaspike/cdictrl/servlet/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/691ffdf0/deltaspike/modules/scheduler/impl/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/691ffdf0/deltaspike/parent/code/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/deltaspike/blob/691ffdf0/deltaspike/parent/pom.xml
----------------------------------------------------------------------


Mime
View raw message