archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marti...@apache.org
Subject [archiva-redback-components-spring-utils] 31/47: use sisu plexus from eclipse and google guice directly not a fork
Date Mon, 09 Apr 2018 20:21:18 GMT
This is an automated email from the ASF dual-hosted git repository.

martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-utils.git

commit 449106ae2f1380448cc0db5acf0807e77d8eeaaf
Author: Olivier Lamy <olamy@apache.org>
AuthorDate: Sun Apr 28 10:24:38 2013 +0000

    use sisu plexus from eclipse and google guice directly not a fork
    
    git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1476749
13f79535-47bb-0310-9956-ffa450edef68
---
 pom.xml | 43 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9126544..c35825d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,18 +75,24 @@
     </dependency>
 
     <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-inject-plexus</artifactId>
-      <version>2.2.2</version>
-      <optional>true</optional>
+      <groupId>org.eclipse.sisu</groupId>
+      <artifactId>org.eclipse.sisu.plexus</artifactId>
+      <version>0.0.0.M2a</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.sonatype.sisu</groupId>
+          <artifactId>sisu-guice</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
+
     <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-guice</artifactId>
-      <version>3.0.1</version>
-      <optional>true</optional>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <version>3.0</version>
     </dependency>
 
+
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-classworlds</artifactId>
@@ -141,6 +147,27 @@
           </instructions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <bannedDependencies>
+                  <excludes>
+                    <exclude>org.sonatype.sisu:sisu-guice</exclude>
+                    <exclude>org.sonatype.sisu:sisu-guava</exclude>
+                  </excludes>
+                </bannedDependencies>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

-- 
To stop receiving notification emails like this one, please contact
martin_s@apache.org.

Mime
View raw message