Skip to content
This repository has been archived by the owner on Jan 21, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1659 from prb112/master
Browse files Browse the repository at this point in the history 
addresses security issues and minor updates to java and js core code and tests
  • Loading branch information
@prb112
prb112 committed Feb 21, 2015
2 parents 13164e0 + 3127c89 commit b4c88be
Show file tree
Hide file tree
Showing 4,712 changed files with 100,263 additions and 214,898 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
364 changes: 181 additions & 183 deletions assembly/cdnjs/sbt-core-dojo-amd.js
View file

Large diffs are not rendered by default.

1,704 changes: 852 additions & 852 deletions assembly/cdnjs/sbt-core-dojo-amd.js.uncompressed.js
View file

Large diffs are not rendered by default.

1,643 changes: 821 additions & 822 deletions assembly/cdnjs/sbt-extra-controls-dojo-amd.js
View file

Large diffs are not rendered by default.

73,356 changes: 36,678 additions & 36,678 deletions assembly/cdnjs/sbt-extra-controls-dojo-amd.js.uncompressed.js
View file

Large diffs are not rendered by default.

80 changes: 40 additions & 40 deletions assembly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>com.ibm.sbt</groupId>
<artifactId>com.ibm.sbt</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
</parent>

<build>
Expand Down Expand Up @@ -84,10 +84,10 @@
<goal>wget</goal>
</goals>
<configuration>
<url>http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.54/bin/apache-tomcat-7.0.54.zip</url>
<url>http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.59/bin/apache-tomcat-7.0.59.zip</url>
<unpack>true</unpack>
<outputDirectory>${project.build.directory}/tomcat/unzip</outputDirectory>
<md5>6b5a52ad653979b7e2e276351051b7b1</md5>
<md5>3109af3fda8092c5647fb2380738ee12</md5>
</configuration>
</execution>
<execution>
Expand Down Expand Up @@ -145,38 +145,38 @@
<artifactId>commons-logging</artifactId>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/lib</outputDirectory>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>com.ibm.sbt</groupId>
<artifactId>sbt.dojo180</artifactId>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/webapps</outputDirectory>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/webapps</outputDirectory>
<destFileName>sbt.dojo180.war</destFileName>
</artifactItem>
<artifactItem>
<groupId>com.ibm.sbt</groupId>
<artifactId>sbt.jquery182</artifactId>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/webapps</outputDirectory>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/webapps</outputDirectory>
<destFileName>sbt.jquery182.war</destFileName>
</artifactItem>
<artifactItem>
<groupId>com.ibm.sbt</groupId>
<artifactId>sbt.bootstrap211</artifactId>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/webapps</outputDirectory>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/webapps</outputDirectory>
<destFileName>sbt.bootstrap211.war</destFileName>
</artifactItem>
<artifactItem>
<groupId>com.ibm.sbt</groupId>
<artifactId>sbt.sample.web</artifactId>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/webapps</outputDirectory>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/webapps</outputDirectory>
<destFileName>sbt.sample.web.war</destFileName>
</artifactItem>

Expand All @@ -187,7 +187,7 @@
<artifactId>com.ibm.sbt.landing</artifactId>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/webapps</outputDirectory>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/webapps</outputDirectory>
<destFileName>ROOT.war</destFileName>
</artifactItem>

Expand All @@ -196,23 +196,23 @@
<artifactId>acme.social.sample.dataapp</artifactId>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/webapps</outputDirectory>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/webapps</outputDirectory>
<destFileName>acme.social.sample.dataapp.war</destFileName>
</artifactItem>
<artifactItem>
<groupId>com.ibm.sbt</groupId>
<artifactId>acme.social.sample.webapp</artifactId>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/webapps</outputDirectory>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/webapps</outputDirectory>
<destFileName>acme.social.sample.webapp.war</destFileName>
</artifactItem>
<artifactItem>
<groupId>com.ibm.sbt</groupId>
<artifactId>helloworld.webapp</artifactId>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/webapps</outputDirectory>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/webapps</outputDirectory>
<destFileName>helloworld.webapp.war</destFileName>
</artifactItem>

Expand All @@ -226,23 +226,23 @@
<artifactId>smartcloud.webapp</artifactId>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/webapps</outputDirectory>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/webapps</outputDirectory>
<destFileName>smartcloud.webapp.war</destFileName>
</artifactItem>
<artifactItem>
<groupId>com.ibm.sbt</groupId>
<artifactId>grantaccess.webapp</artifactId>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/webapps</outputDirectory>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/webapps</outputDirectory>
<destFileName>grantaccess.webapp.war</destFileName>
</artifactItem>
<artifactItem>
<groupId>com.ibm.sbt</groupId>
<artifactId>acme.sample.webapp</artifactId>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/webapps</outputDirectory>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/webapps</outputDirectory>
<destFileName>acme.sample.webapp.war</destFileName>
</artifactItem>

Expand All @@ -255,29 +255,29 @@
<artifactId>com.ibm.sbt.web</artifactId>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/webapps</outputDirectory>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/webapps</outputDirectory>
<destFileName>sbt.war</destFileName>
</artifactItem>
<artifactItem>
<groupId>com.ibm.sbt</groupId>
<artifactId>com.ibm.commons</artifactId>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/lib</outputDirectory>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>com.ibm.sbt</groupId>
<artifactId>com.ibm.commons.runtime</artifactId>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/lib</outputDirectory>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/lib</outputDirectory>
</artifactItem>
<artifactItem>
<groupId>com.ibm.sbt</groupId>
<artifactId>com.ibm.commons.xml</artifactId>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/lib</outputDirectory>
<outputDirectory>${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/lib</outputDirectory>
</artifactItem>


Expand Down Expand Up @@ -318,22 +318,22 @@
<target>
<!-- Package Tomcat -->
<delete
dir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/webapps/ROOT" />
dir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/webapps/ROOT" />



<copy
todir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/conf"
todir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/conf"
file="./../samples/config/sbt.properties" />


<copy
file="./../libraries/com.ibm.sbt.libs.java/lib/com.ibm.sbt.javamail-1.4.5.jar"
todir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/lib" />
todir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/lib" />


<copy
todir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.54/conf">
todir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.59/conf">
<fileset dir="platform/tomcat">
<include name="keystore" />
<include name="context.xml" />
Expand Down Expand Up @@ -370,7 +370,7 @@


<zip basedir="${project.build.directory}/tomcat/unzip"
destfile="${project.build.directory}/tomcat/apache-tomcat-7.0.54-sbt.zip"
destfile="${project.build.directory}/tomcat/apache-tomcat-7.0.59-sbt.zip"
compress="true" />

<zip basedir="${project.build.directory}/sources/SocialSDK"
Expand Down Expand Up @@ -419,28 +419,28 @@
<groupId>com.ibm.sbt</groupId>
<artifactId>sbt.dojo180</artifactId>

<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.ibm.sbt</groupId>
<artifactId>sbt.jquery182</artifactId>

<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.ibm.sbt</groupId>
<artifactId>sbt.bootstrap211</artifactId>

<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.ibm.sbt</groupId>
<artifactId>sbt.sample.web</artifactId>

<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
<type>war</type>
</dependency>

Expand All @@ -450,29 +450,29 @@
<groupId>com.ibm.sbt</groupId>
<artifactId>com.ibm.sbt.landing</artifactId>

<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
<type>war</type>
</dependency>

<dependency>
<groupId>com.ibm.sbt</groupId>
<artifactId>acme.social.sample.dataapp</artifactId>

<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.ibm.sbt</groupId>
<artifactId>acme.social.sample.webapp</artifactId>

<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.ibm.sbt</groupId>
<artifactId>helloworld.webapp</artifactId>

<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
<type>war</type>
</dependency>

Expand All @@ -485,21 +485,21 @@
<groupId>com.ibm.sbt</groupId>
<artifactId>smartcloud.webapp</artifactId>

<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.ibm.sbt</groupId>
<artifactId>grantaccess.webapp</artifactId>

<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.ibm.sbt</groupId>
<artifactId>acme.sample.webapp</artifactId>

<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
<type>war</type>
</dependency>

Expand All @@ -511,7 +511,7 @@
<groupId>com.ibm.sbt</groupId>
<artifactId>com.ibm.sbt.web</artifactId>

<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
<type>war</type>
</dependency>

Expand All @@ -523,7 +523,7 @@
<dependency>
<groupId>com.ibm.sbt</groupId>
<artifactId>com.ibm.commons.runtime</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
</dependency>
<dependency>
<groupId>com.ibm.sbt</groupId>
Expand All @@ -534,19 +534,19 @@
<dependency>
<groupId>com.ibm.sbt</groupId>
<artifactId>com.ibm.sbt.php.wordpress</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>com.ibm.sbt</groupId>
<artifactId>com.ibm.sbt.php.core</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>com.ibm.sbt</groupId>
<artifactId>com.ibm.sbt.php.moodle</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
<type>zip</type>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion commons/com.ibm.commons.runtime/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Common Runtime Classes
Bundle-SymbolicName: com.ibm.commons.runtime
Bundle-Version: 1.1.3.qualifier
Bundle-Version: 1.1.3.20150220
Bundle-Vendor: IBM
Export-Package: com.ibm.commons.runtime,com.ibm.commons.runtime.beans,
com.ibm.commons.runtime.impl,com.ibm.commons.runtime.impl.app,com.ibm
Expand Down
2 changes: 1 addition & 1 deletion commons/com.ibm.commons.runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ibm.sbt</groupId>
<artifactId>com.ibm.sbt.commons</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
</parent>

</project>
2 changes: 1 addition & 1 deletion commons/com.ibm.commons.xml/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ibm.sbt</groupId>
<artifactId>com.ibm.sbt.commons</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
</parent>

<version>9.0.0</version>
Expand Down
2 changes: 1 addition & 1 deletion commons/com.ibm.commons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ibm.sbt</groupId>
<artifactId>com.ibm.sbt.commons</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
</parent>

<version>9.0.0</version>
Expand Down
2 changes: 1 addition & 1 deletion commons/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>com.ibm.sbt</artifactId>
<groupId>com.ibm.sbt</groupId>
<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
</parent>
<modules>
<module>com.ibm.commons</module>
Expand Down
2 changes: 1 addition & 1 deletion deps/com.ibm.sbt.bootstrap211/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.ibm.sbt</groupId>
<artifactId>com.ibm.sbt.dependencies</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
</parent>

</project>
2 changes: 1 addition & 1 deletion deps/com.ibm.sbt.ckeditor422/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<parent>
<groupId>com.ibm.sbt</groupId>
<artifactId>com.ibm.sbt.dependencies</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.1.3.20150220</version>
</parent>
</project>
Loading

0 comments on commit b4c88be

Please sign in to comment.