On 12/10/2010 10:55 AM, Cris J Holdorph wrote:
> Is this something worth conducting an informal vote on, to see where the
> community sits? Both sides (including/not including these changes) seem
> to make a lot of sense. I'd be interested in hearing from a few uPortal
> institutions which they'd prefer, in order to help make the final
> decision. Those places might not follow uportal-dev.
I don't know what to suggest for a next step on this topic due to my
growing confusion with the discussion. The concerns about the change
are now being raised on behalf of the very people it was intended to help.
The people who can benefit from this enhancement, from my perspective,
are (1) people who already do something like it home-grown, and (2)
people who would like to adopt the practice.
As someone who uses maven filtering and routinely has to manage those
customizations in the face of new releases, my sense is that the best
way to improve my experience in this area is to get out of the business
of customizing poms altogether -- or at least reduce the number & degree.
I'm attaching an >svn diff of the root uPortal pom from 3.2.0-GA to the
last commit before I added the filtering. It's over 500 lines (half the
size of the actual pom). I would love it if the next time I take a new
version from Jasig I can simply drop my own customizations to that file.
When this discussion began I was of the mind that the first point above
-- that folks with similar home-grown solutions are the *beneficiaries*
of the enhancement -- was uncontroversial. If others don't see it the
way I do that's fine... it can wait for 3.3.
drew
--
You are currently subscribed to [email protected] as:
[email protected]
To unsubscribe, change settings or access archives, see
http://www.ja-sig.org/wiki/display/JSG/uportal-dev
Index: pom.xml
===================================================================
--- pom.xml (.../tags/rel-3-2-0-GA/pom.xml) (revision 22646)
+++ pom.xml (.../branches/rel-3-2-patches/pom.xml) (revision 22548)
@@ -1,28 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
- <groupId>org.jasig</groupId>
+ <groupId>org.jasig.parent</groupId>
<artifactId>jasig-parent</artifactId>
- <version>13</version>
+ <version>30</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jasig.portal</groupId>
<artifactId>uportal-parent</artifactId>
+ <version>3.2.5-SNAPSHOT</version>
<packaging>pom</packaging>
<name>uPortal</name>
<description>The root project definition for the uPortal
project.</description>
- <version>3.2.0</version>
<url>${jasig-site-base}/uportal/${project.version}</url>
<scm>
-
<connection>scm:svn:https://www.ja-sig.org/svn/uPortal/trunk</connection>
-
<developerConnection>scm:svn:https://www.ja-sig.org/svn/uPortal/trunk</developerConnection>
-
<url>http://developer.jasig.org/source/browse/jasigsvn/uPortal/trunk</url>
+
<connection>scm:svn:https://source.jasig.org/uPortal/branches/rel-3-2-patches</connection>
+
<developerConnection>scm:svn:https://source.jasig.org/uPortal/branches/rel-3-2-patches</developerConnection>
+
<url>https://developer.jasig.org/source/browse/jasigsvn/uPortal/branches/rel-3-2-patches</url>
</scm>
<distributionManagement>
@@ -54,60 +52,26 @@
<repositories>
<repository>
- <id>jasig-m2</id>
- <name>Jasig Maven2 Repository</name>
- <url>http://developer.jasig.org/repo/content/repositories/m2</url>
- </repository>
- <repository>
<id>jasig-3rd-party</id>
<name>Jasig 3rd Party Repository</name>
<url>http://developer.jasig.org/repo/content/repositories/3rd-party</url>
+ <releases><enabled>true</enabled></releases>
+ <snapshots><enabled>false</enabled></snapshots>
</repository>
-
- <repository>
- <id>Codehaus Snapshots</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
+ <repository>
+ <id>sonatype-nexus-snapshots</id>
+ <name>Sonatype Nexus Snapshots</name>
+ <url>http://oss.sonatype.org/content/repositories/snapshots</url>
+ <releases><enabled>false</enabled></releases>
+ <snapshots><enabled>true</enabled></snapshots>
</repository>
- <repository>
- <id>apache.snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
</repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>jasig-m2</id>
- <name>Jasig Maven2 Repository</name>
- <url>http://developer.jasig.org/repo/content/repositories/m2</url>
- </pluginRepository>
- <pluginRepository>
- <id>Codehaus Snapshots</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
<properties>
<!-- The final name of the uPortal web-application -->
<uportal.docbase>uPortal</uportal.docbase>
+ <project-site-path>/uportal/${project.version}</project-site-path>
<!-- The JDBC Driver used by uPortal -->
<jdbc.groupId>hsqldb</jdbc.groupId>
@@ -116,39 +80,39 @@
<!-- WAR Dependency Version Properties -->
- <BookmarksPortlet.version>1.0.8</BookmarksPortlet.version>
+ <BookmarksPortlet.version>1.0.10</BookmarksPortlet.version>
<cas-server.version>3.3.5</cas-server.version>
-
<cas-proxy-test-portlet.version>1.0.0-RC1</cas-proxy-test-portlet.version>
+
<cas-proxy-test-portlet.version>1.0.0-RC2</cas-proxy-test-portlet.version>
<FunctionalTestsPortlet.version>1.0.2</FunctionalTestsPortlet.version>
-
<jasig-widget-portlets.version>1.0.0-RC1</jasig-widget-portlets.version>
+
<jasig-widget-portlets.version>1.0.0-RC2</jasig-widget-portlets.version>
<googleportlet.version>0.4</googleportlet.version>
<RssPortlet.version>1.0.0</RssPortlet.version>
- <WeatherPortlet.version>1.0.5</WeatherPortlet.version>
- <WebProxyPortlet.version>1.1.0-RC1</WebProxyPortlet.version>
+ <WeatherPortlet.version>1.0.6</WeatherPortlet.version>
+ <WebProxyPortlet.version>1.1.1</WebProxyPortlet.version>
<!-- Project Dependency Version Properties -->
<aopalliance.version>1.0</aopalliance.version>
<activation.version>1.1</activation.version>
<ant.version>1.7.1</ant.version>
- <aspectjrt.version>1.6.8</aspectjrt.version>
- <aspectjweaver.version>1.6.8</aspectjweaver.version>
+ <aspectjrt.version>1.6.9</aspectjrt.version>
+ <aspectjweaver.version>1.6.9</aspectjweaver.version>
<casclient.version>3.1.10</casclient.version>
- <cernunnos.version>1.2.0</cernunnos.version>
+ <cernunnos.version>1.2.1</cernunnos.version>
<commons-cli.version>1.2</commons-cli.version>
<commons-codec.version>1.4</commons-codec.version>
<commons-collections.version>3.2.1</commons-collections.version>
- <commons-dbcp.version>1.2.2</commons-dbcp.version>
+ <commons-dbcp.version>1.4</commons-dbcp.version>
<commons-fileupload>1.2.1</commons-fileupload>
<commons-httpclient.version>3.1</commons-httpclient.version>
<commons-io.version>1.4</commons-io.version>
- <commons-lang.version>2.4</commons-lang.version>
+ <commons-lang.version>2.5</commons-lang.version>
<commons-logging.version>1.1.1</commons-logging.version>
<commons-logging-api.version>1.1</commons-logging-api.version>
<commons-pool.version>1.5.4</commons-pool.version>
<dom4j.version>1.6.1</dom4j.version>
- <easymock.version>2.5.2</easymock.version>
+ <easymock.version>3.0</easymock.version>
<ejb3-persistence.version>1.0.1.GA</ejb3-persistence.version>
- <ehcache.version>1.7.2</ehcache.version>
+ <ehcache.version>2.2.0</ehcache.version>
<ehcache-web.version>2.0.0</ehcache-web.version>
<hibernate-annotations.version>3.3.1.GA</hibernate-annotations.version>
<hibernate-commons-annotations.version>3.3.0.ga</hibernate-commons-annotations.version>
@@ -158,14 +122,14 @@
<hsqldb.version>1.8.0.7</hsqldb.version>
<icu4j.version>3.8</icu4j.version>
<javassist.version>3.8.0.GA</javassist.version>
- <jasypt.version>1.5</jasypt.version>
- <jaxb-api.version>2.1</jaxb-api.version>
+ <jasypt.version>1.6</jasypt.version>
+ <jaxb-api.version>2.2.1</jaxb-api.version>
<jdom.version>1.0</jdom.version>
<json-lib-ext-spring.version>1.0.2</json-lib-ext-spring.version>
<jsp-api.version>2.1</jsp-api.version>
<jstl.version>1.1.2</jstl.version>
<jtidy.version>4aug2000r7-dev</jtidy.version>
- <junit.version>4.4</junit.version>
+ <junit.version>4.8.1</junit.version>
<log4j.version>1.2.15</log4j.version>
<mail.version>1.4.1</mail.version>
<ognl.version>2.7.3</ognl.version>
@@ -175,11 +139,12 @@
<person-directory.version>1.5.0-RC6</person-directory.version>
<pluto.version>1.1.7</pluto.version>
<portlet-api.version>1.0</portlet-api.version>
- <quartz.version>1.6.1</quartz.version>
- <resource-server.version>1.0.6</resource-server.version>
+ <quartz.version>1.8.4</quartz.version>
+ <resource-aggregator.version>1.0.4</resource-aggregator.version>
+ <resource-server.version>1.0.12</resource-server.version>
<rome.version>0.9</rome.version>
<servlet-api.version>2.5</servlet-api.version>
- <slf4j.version>1.5.10</slf4j.version>
+ <slf4j.version>1.6.1</slf4j.version>
<spring-framework.version>2.5.6</spring-framework.version>
<spring-ldap.version>1.2.1</spring-ldap.version>
<spring-modules.version>0.8a</spring-modules.version>
@@ -188,7 +153,7 @@
<tyrex.version>1.0.1</tyrex.version>
<uportal-ear-deployer.version>1.0.1</uportal-ear-deployer.version>
<xalan.version>2.7.1</xalan.version>
- <xercesImpl.version>2.8.1</xercesImpl.version>
+ <xercesImpl.version>2.9.1</xercesImpl.version>
<xml-apis.version>1.0.b2</xml-apis.version>
<xml-resolver.version>1.2-JASIG_PATCH</xml-resolver.version>
<xmlParserAPIs.version>2.6.2</xmlParserAPIs.version>
@@ -204,6 +169,7 @@
<module>uportal-war</module>
<module>uportal-ear</module>
<module>uportal-portlets-overlay</module>
+ <module>bootstrap</module>
</modules>
<dependencyManagement>
@@ -418,8 +384,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.opensymphony.quartz</groupId>
- <artifactId>quartz-all</artifactId>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
<version>${quartz.version}</version>
</dependency>
<dependency>
@@ -529,6 +495,11 @@
<version>${hibernate-tools.version}</version>
</dependency>
<dependency>
+ <groupId>org.jasig.resource-aggregator</groupId>
+ <artifactId>resource-aggregator-util</artifactId>
+ <version>${resource-aggregator.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.jasig.cas</groupId>
<artifactId>cas-client-core</artifactId>
<version>${casclient.version}</version>
@@ -541,7 +512,7 @@
<dependency>
<groupId>org.jasig.portal</groupId>
<artifactId>uportal-impl</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jasig.resourceserver</groupId>
@@ -847,7 +818,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
@@ -872,13 +842,11 @@
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<configuration>
- <basedir>${basedir}</basedir>
- <header>${jasig-short-license-url}</header>
<aggregate>true</aggregate>
<excludes>
+ <exclude>**/NOTICE</exclude>
+ <exclude>README</exclude>
<exclude>LICENSE</exclude>
- <exclude>license.txt</exclude>
- <exclude>docs/licenses/**</exclude>
<exclude>jquery.css</exclude>
<exclude>data/*</exclude>
<exclude>**/fluid/fluid.*.css</exclude>
@@ -889,12 +857,20 @@
<exclude>**/*.group_membership</exclude>
<exclude>**/*.layout</exclude>
<exclude>**/*.permission</exclude>
+ <exclude>**/*.permission_owner</exclude>
+ <exclude>**/*.disabled</exclude>
<exclude>**/*.permission_set</exclude>
<exclude>**/*.profile</exclude>
<exclude>**/*.structure</exclude>
<exclude>**/*.theme</exclude>
<exclude>**/*.user</exclude>
<exclude>**/*.template-user</exclude>
+ <exclude>**/*.example</exclude>
+ <exclude>**/*.res</exclude>
+ <exclude>**/*.ent</exclude>
+ <exclude>**/*.psd</exclude>
+ <exclude>build.properties</exclude>
+
<exclude>**/src/main/webapp/media/skins/universality/hc/jquery-ui-1.7.2.custom/**</exclude>
</excludes>
<mapping>
<crn>XML_STYLE</crn>
@@ -904,13 +880,23 @@
<tld>XML_STYLE</tld>
<tag>DYNASCRIPT_STYLE</tag>
<inc>DYNASCRIPT_STYLE</inc>
+ <mappings>SCRIPT_STYLE</mappings>
</mapping>
- <properties>
-
<jasig-license-url>${jasig-license-url}</jasig-license-url>
-
<jasig-license-year>${jasig-license-year}</jasig-license-year>
- </properties>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.jasig.maven</groupId>
+ <artifactId>maven-notice-plugin</artifactId>
+ <configuration>
+ <noticeTemplate>NOTICE.template</noticeTemplate>
+ <generateChildNotices>false</generateChildNotices>
+ <excludedModules>
+
<excludedModule>uportal-portlets-overlay-parent</excludedModule>
+ <excludedModule>bootstrap</excludedModule>
+ <excludedModule>uportal-ear</excludedModule>
+ </excludedModules>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -920,11 +906,11 @@
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4.1</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -937,96 +923,59 @@
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
<artifactId>maven-ear-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4.2</version>
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-4</version>
+ <version>1.0-beta-1</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3.1</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3.1</version>
</plugin>
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4.3</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-7</version>
+ <version>2.1.1</version>
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
+ <version>2.1.2</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1-alpha-2</version>
+ <version>2.1-beta-1</version>
</plugin>
<plugin>
- <groupId>org.apache.pluto</groupId>
+ <groupId>net.sf.alchim</groupId>
+ <artifactId>yuicompressor-maven-plugin</artifactId>
+ <version>0.7.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.portals.pluto</groupId>
<artifactId>maven-pluto-plugin</artifactId>
<version>${pluto.version}</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>changelog-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
+ <groupId>org.jasig.portal</groupId>
+ <artifactId>maven-uportal-plugin</artifactId>
+ <version>1.0.0-M3</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>1.2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0-beta-2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>surefire-report-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.3</version>
- </plugin>
</plugins>
</pluginManagement>
</build>
@@ -1035,21 +984,26 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>surefire-report-maven-plugin</artifactId>
+ <version>2.0-beta-1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jxr-maven-plugin</artifactId>
+ <version>2.0-beta-1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.4</version>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
+ <version>2.5</version>
<configuration>
<linkXref>true</linkXref>
<sourceEncoding>utf-8</sourceEncoding>
@@ -1060,17 +1014,21 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>changelog-maven-plugin</artifactId>
+ <version>2.0-beta-1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.1</version>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
<configuration>
<source>1.6</source>
<maxmemory>512m</maxmemory>
@@ -1078,11 +1036,7 @@
<link>http://java.sun.com/javase/6/docs/api/</link>
<link>http://java.sun.com/javaee/5/docs/api/</link>
<link>http://portals.apache.org/pluto/portlet-1.0-apidocs/</link>
- <!-- Pluto apidocs are for 2.0 now
-
<link>http://portals.apache.org/pluto/pluto-container/apidocs/</link>
-
<link>http://portals.apache.org/pluto/pluto-descriptor-api/apidocs/</link>
- -->
-
<link>http://static.springframework.org/spring/docs/2.5.x/api/</link>
+
<link>http://static.springsource.org/spring/docs/2.5.x/api/</link>
<link>http://static.springframework.org/spring-ldap/docs/1.2.0/api/spring-ldap/</link>
<link>http://developer.jasig.org/projects/person-directory/1.5.0-RC2/apidocs/</link>
</links>
@@ -1091,17 +1045,18 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
+ <version>2.0-beta-2</version>
</plugin>
</plugins>
</reporting>
-
+
<profiles>
<profile>
<id>ci-local-site</id>
<distributionManagement>
<site>
<id>ci-local-site</id>
-
<url>file:/jasig/htdocs/developer.ja-sig.org/projects/uportal/${project.version}</url>
+ <url>${jasig-site-ci-dist-base}${project-site-path}</url>
</site>
</distributionManagement>
</profile>
