Merge "Bump bouncycastle version to 1.49"

James Moger

2013-12-02 b6976fc0a4b1fd07e1e72fdd06597a0ffb9d48ef

Merge "Bump bouncycastle version to 1.49"

 .classpath

@@ -44,9 +44,9 @@
    <classpathentry kind="lib" path="ext/jsch-0.1.46.jar" sourcepath="ext/src/jsch-0.1.46.jar" />
    <classpathentry kind="lib" path="ext/JavaEWAH-0.5.6.jar" sourcepath="ext/src/JavaEWAH-0.5.6.jar" />
    <classpathentry kind="lib" path="ext/org.eclipse.jgit.http.server-3.1.0.201310021548-r.jar" sourcepath="ext/src/org.eclipse.jgit.http.server-3.1.0.201310021548-r.jar" />
    <classpathentry kind="lib" path="ext/bcprov-jdk15on-1.47.jar" sourcepath="ext/src/bcprov-jdk15on-1.47.jar" />
    <classpathentry kind="lib" path="ext/bcmail-jdk15on-1.47.jar" sourcepath="ext/src/bcmail-jdk15on-1.47.jar" />
    <classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.47.jar" sourcepath="ext/src/bcpkix-jdk15on-1.47.jar" />
    <classpathentry kind="lib" path="ext/bcprov-jdk15on-1.49.jar" sourcepath="ext/src/bcprov-jdk15on-1.49.jar" />
    <classpathentry kind="lib" path="ext/bcmail-jdk15on-1.49.jar" sourcepath="ext/src/bcmail-jdk15on-1.49.jar" />
    <classpathentry kind="lib" path="ext/bcpkix-jdk15on-1.49.jar" sourcepath="ext/src/bcpkix-jdk15on-1.49.jar" />
    <classpathentry kind="lib" path="ext/rome-0.9.jar" sourcepath="ext/src/rome-0.9.jar" />
    <classpathentry kind="lib" path="ext/jdom-1.0.jar" sourcepath="ext/src/jdom-1.0.jar" />
    <classpathentry kind="lib" path="ext/gson-1.7.2.jar" sourcepath="ext/src/gson-1.7.2.jar" />

 build.moxie

@@ -104,7 +104,7 @@
  lucene.version : 4.6.0
  jgit.version   : 3.1.0.201310021548-r
  groovy.version : 1.8.8
  bouncycastle.version : 1.47
  bouncycastle.version : 1.49
  selenium.version : 2.28.0
  wikitext.version : 1.4
  }

 gitblit.iml

@@ -461,35 +461,35 @@
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="bcprov-jdk15on-1.47.jar">
      <library name="bcprov-jdk15on-1.49.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/bcprov-jdk15on-1.47.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/bcprov-jdk15on-1.49.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/bcprov-jdk15on-1.47.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/bcprov-jdk15on-1.49.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="bcmail-jdk15on-1.47.jar">
      <library name="bcmail-jdk15on-1.49.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/bcmail-jdk15on-1.47.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/bcmail-jdk15on-1.49.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/bcmail-jdk15on-1.47.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/bcmail-jdk15on-1.49.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>
    <orderEntry type="module-library">
      <library name="bcpkix-jdk15on-1.47.jar">
      <library name="bcpkix-jdk15on-1.49.jar">
        <CLASSES>
          <root url="jar://$MODULE_DIR$/ext/bcpkix-jdk15on-1.47.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/bcpkix-jdk15on-1.49.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES>
          <root url="jar://$MODULE_DIR$/ext/src/bcpkix-jdk15on-1.47.jar!/" />
          <root url="jar://$MODULE_DIR$/ext/src/bcpkix-jdk15on-1.49.jar!/" />
        </SOURCES>
      </library>
    </orderEntry>

 releases.moxie

@@ -57,6 +57,7 @@
    - updated to Jetty 8.1.13
    - updated to JGit 3.1.0
    - updated to Lucene 4.6.0
    - updated to BouncyCastle 1.49
    - replaced MarkdownPapers with pegdown 1.4.1
    - added Eclipse WikiText libraries for processing confluence, mediawiki, textile, tracwiki, and twiki
    settings: