You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2018/12/31 06:27:43 UTC

[archiva-redback-core] branch master updated (9dbee34 -> 2421de1)

This is an automated email from the ASF dual-hosted git repository.

olamy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git.


    from 9dbee34  disableConcurrentBuilds
     new ca4112b  use jetty version from parent
     new 2421de1  version properties moved to parent

The 2 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:
 pom.xml                                                        | 10 ++++------
 .../redback-rest/redback-rest-services/pom.xml                 |  5 ++---
 2 files changed, 6 insertions(+), 9 deletions(-)


[archiva-redback-core] 01/02: use jetty version from parent

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git

commit ca4112b4c35886f125eff8c4404eac4d65853ed8
Author: olivier lamy <ol...@apache.org>
AuthorDate: Mon Dec 31 15:58:07 2018 +1000

    use jetty version from parent
    
    Signed-off-by: olivier lamy <ol...@apache.org>
---
 redback-integrations/redback-rest/redback-rest-services/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml b/redback-integrations/redback-rest/redback-rest-services/pom.xml
index 8ef5f63..e021bcd 100644
--- a/redback-integrations/redback-rest/redback-rest-services/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml
@@ -32,7 +32,6 @@
 
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
-    <jetty.version>9.4.5.v20170502</jetty.version>
     <rest.test.timeout>1000000</rest.test.timeout>
   </properties>
 


[archiva-redback-core] 02/02: version properties moved to parent

Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git

commit 2421de12dee81493e471a5e11fc4d3700d96d482
Author: olivier lamy <ol...@apache.org>
AuthorDate: Mon Dec 31 16:27:27 2018 +1000

    version properties moved to parent
    
    Signed-off-by: olivier lamy <ol...@apache.org>
---
 pom.xml                                                        | 10 ++++------
 .../redback-rest/redback-rest-services/pom.xml                 |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1273ee2..61ab7fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,8 +73,6 @@
   <properties>
     <site.staging.base>${project.basedir}</site.staging.base>
     <springVersion>4.3.10.RELEASE</springVersion>
-    <slf4jVersion>1.7.25</slf4jVersion>
-    <log4j2Version>2.8.2</log4j2Version>
     <commons-collections.version>4.1</commons-collections.version>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -430,24 +428,24 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>${slf4jVersion}</version>
+        <version>${slf4j.version}</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-simple</artifactId>
-        <version>${slf4jVersion}</version>
+        <version>${slf4j.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
-        <version>${slf4jVersion}</version>
+        <version>${slf4j.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>jul-to-slf4j</artifactId>
-        <version>${slf4jVersion}</version>
+        <version>${slf4j.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml b/redback-integrations/redback-rest/redback-rest-services/pom.xml
index e021bcd..29b7688 100644
--- a/redback-integrations/redback-rest/redback-rest-services/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml
@@ -154,14 +154,14 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
-      <version>${log4j2Version}</version>
+      <version>${log4j.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
-      <version>${log4j2Version}</version>
+      <version>${log4j.version}</version>
       <scope>test</scope>
     </dependency>