You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2015/03/20 20:23:26 UTC
svn commit: r1668125 - in /portals/jetspeed-2/portal/trunk: ./ components/
components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/
components/jetspeed-portal/
maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed...
Author: taylor
Date: Fri Mar 20 19:23:25 2015
New Revision: 1668125
URL: http://svn.apache.org/r1668125
Log:
JS2-1321: prepare for release. fixing a number of issues related to upgrading to latest Apache Master POM
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
portals/jetspeed-2/portal/trunk/components/pom.xml
portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
portals/jetspeed-2/portal/trunk/openid-step2/common/pom.xml
portals/jetspeed-2/portal/trunk/openid-step2/pom.xml
portals/jetspeed-2/portal/trunk/pom.xml
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java?rev=1668125&r1=1668124&r2=1668125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-deploy-tools/src/main/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java Fri Mar 20 19:23:25 2015
@@ -16,17 +16,10 @@
*/
package org.apache.jetspeed.tools.deploy;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.File;
-import java.nio.channels.FileChannel;
-import java.util.Enumeration;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.jar.JarOutputStream;
-import java.util.zip.ZipEntry;
+import org.w3c.dom.Document;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -37,11 +30,17 @@ import javax.xml.transform.TransformerEx
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-
-import org.w3c.dom.Document;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.FileChannel;
+import java.util.Enumeration;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.jar.JarOutputStream;
+import java.util.zip.ZipEntry;
/**
* Makes a web application Deploy-ready for Jetspeed.
Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml?rev=1668125&r1=1668124&r2=1668125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-portal/pom.xml Fri Mar 20 19:23:25 2015
@@ -201,11 +201,21 @@
<dependency>
<groupId>org.openid4java</groupId>
<artifactId>openid4java-consumer</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java-nodeps</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>com-google-step2-common</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java-nodeps</artifactId>
+ </dependency>
<!-- Test Dependencies -->
<dependency>
Modified: portals/jetspeed-2/portal/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/pom.xml?rev=1668125&r1=1668124&r2=1668125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/pom.xml Fri Mar 20 19:23:25 2015
@@ -35,6 +35,14 @@
</parent>
<packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<modules>
<module>jetspeed-capability</module>
<module>jetspeed-cm</module>
Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java?rev=1668125&r1=1668124&r2=1668125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java (original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java Fri Mar 20 19:23:25 2015
@@ -16,6 +16,14 @@
*/
package org.apache.jetspeed.maven.plugins;
+import org.apache.jetspeed.maven.utils.Artifacts;
+import org.apache.jetspeed.tools.deploy.DeployFactory;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+
import java.io.File;
import java.io.FileFilter;
import java.io.FileInputStream;
@@ -39,14 +47,6 @@ import java.util.StringTokenizer;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
-import org.apache.jetspeed.maven.utils.Artifacts;
-import org.apache.jetspeed.tools.deploy.DeployFactory;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-
/**
* DeployerMojo is a generic Jetspeed Portal artifacts en resources deployer.
*
@@ -90,7 +90,7 @@ public class DeployMojo extends Abstract
private Boolean expand;
private boolean expandKeepExt;
private Boolean infuse;
- private Boolean infusionStripLoggers;
+ private Boolean infusionStripLoggers = false;
private String infusionForcedVersion;
}
Modified: portals/jetspeed-2/portal/trunk/openid-step2/common/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/openid-step2/common/pom.xml?rev=1668125&r1=1668124&r2=1668125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/openid-step2/common/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/openid-step2/common/pom.xml Fri Mar 20 19:23:25 2015
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.openid4java</groupId>
<artifactId>openid4java-nodeps</artifactId>
- <version>0.9.5</version>
</dependency>
<dependency>
<groupId>org.openxri</groupId>
Modified: portals/jetspeed-2/portal/trunk/openid-step2/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/openid-step2/pom.xml?rev=1668125&r1=1668124&r2=1668125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/openid-step2/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/openid-step2/pom.xml Fri Mar 20 19:23:25 2015
@@ -35,18 +35,6 @@
<maven>2.0.9</maven>
</prerequisites>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<modules>
<module>common</module>
</modules>
Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=1668125&r1=1668124&r2=1668125&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Fri Mar 20 19:23:25 2015
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.portals</groupId>
<artifactId>portals-pom</artifactId>
- <version>1.3</version>
+ <version>1.4-SNAPSHOT</version>
</parent>
<groupId>org.apache.portals.jetspeed-2</groupId>
@@ -1512,6 +1512,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.openid4java</groupId>
+ <artifactId>openid4java-nodeps</artifactId>
+ <version>${org.openid4java.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.portals.jetspeed-2</groupId>
<artifactId>com-google-step2-common</artifactId>
<version>${step2.version}</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org