portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r1689521 - in /portals/jetspeed-2/portal/trunk: maven/jetspeed-db-maven-plugin/pom.xml pom.xml
Date Mon, 06 Jul 2015 23:28:15 GMT
Author: taylor
Date: Mon Jul  6 23:28:14 2015
New Revision: 1689521

URL: http://svn.apache.org/r1689521
Log:
JS2-1327: moving to Maven 3.3.x and enforcing it

Modified:
    portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml
    portals/jetspeed-2/portal/trunk/pom.xml

Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml?rev=1689521&r1=1689520&r2=1689521&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-db-maven-plugin/pom.xml Mon Jul  6 23:28:14
2015
@@ -70,6 +70,11 @@
       <artifactId>jcl-over-slf4j</artifactId>
       <version>${slf4j.version}</version>
     </dependency>
+      <dependency>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+          <version>${slf4j.version}</version>
+      </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
@@ -84,6 +89,33 @@
           <goalPrefix>jetspeed-db</goalPrefix>
         </configuration>
       </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-shade-plugin</artifactId>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <goals>
+                        <goal>shade</goal>
+                    </goals>
+                    <configuration>
+                        <artifactSet>
+                            <includes>
+                                <include>org.slf4j:slf4j-api</include>
+                                <include>${project.groupId}:jetspeed-api</include>
+                                <include>${project.groupId}:jetspeed-maven-utils</include>
+                                <include>org.apache.maven:maven-plugin-api</include>
+                                <include>org.apache.maven:maven-project</include>
+                                <include>org.apache.ddlutils:ddlutils</include>
+                                <include>cglib:cglib</include>
+                                <include>org.slf4j:jcl-over-slf4j</include>
+                                <include>org.slf4j:slf4j-log4j12</include>
+                            </includes>
+                        </artifactSet>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>
     </plugins>
   </build>
 </project>

Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=1689521&r1=1689520&r2=1689521&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Mon Jul  6 23:28:14 2015
@@ -22,6 +22,10 @@
 
   <modelVersion>4.0.0</modelVersion>
 
+    <prerequisites>
+        <maven>3.3.1</maven>
+    </prerequisites>
+
   <parent>
     <groupId>org.apache.portals</groupId>
     <artifactId>portals-pom</artifactId>
@@ -2044,7 +2048,11 @@
             </targets>
           </configuration>
         </plugin>
-        
+          <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <version>1.4</version>
+          </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
@@ -2053,6 +2061,26 @@
         <artifactId>maven-source-plugin</artifactId>
         <inherited>true</inherited>
       </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <executions>
+                <execution>
+                    <id>enforce-maven-versions</id>
+                    <goals>
+                        <goal>enforce</goal>
+                    </goals>
+                    <configuration>
+                        <rules>
+                            <requireMavenVersion>
+                                <version>3.3.1</version>
+                            </requireMavenVersion>
+                        </rules>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>
+
     </plugins>
 
     <resources>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message