Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

log4j beta 4 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1441272 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-02-01 00:05:53 +00:00
parent 08e1200edb
commit 826cc87c52
2 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/index.html
View File

@ -20,60 +20,60 @@
~ --> ~ -->
<html> <html>
<head> <head>
<link rel="stylesheet" href="css/jquery.fileupload-ui.css"/> <link rel="stylesheet" href="css/jquery.fileupload-ui.css"/>
<link rel="stylesheet" href="css/jqueryFileTree.css"/> <link rel="stylesheet" href="css/jqueryFileTree.css"/>
<link rel="stylesheet" href="css/jquery-ui-1.9.2.custom.min.css"/> <link rel="stylesheet" href="css/jquery-ui-1.9.2.custom.min.css"/>
<link rel="stylesheet" href="css/select2-3.2.css"/> <link rel="stylesheet" href="css/select2-3.2.css"/>
<link rel="stylesheet" href="css/bootstrap.2.2.1.css"> <link rel="stylesheet" href="css/bootstrap.2.2.1.css">
<link rel="stylesheet" href="css/archiva.css"> <link rel="stylesheet" href="css/archiva.css">
<link rel="shortcut icon" href="favicon.ico"/> <link rel="shortcut icon" href="favicon.ico"/>
<link rel="stylesheet" href="css/prettify.css"/> <link rel="stylesheet" href="css/prettify.css"/>
<script type="text/javascript" src="js/jquery-1.9.0.min.js"></script> <script type="text/javascript" src="js/jquery-1.9.0.min.js"></script>
<script type="text/javascript" src="js/jquery-ui-1.9.2.custom.min.js"></script> <script type="text/javascript" src="js/jquery-ui-1.9.2.custom.min.js"></script>
<script type="text/javascript" src="js/sammy.0.7.2.js"></script> <script type="text/javascript" src="js/sammy.0.7.2.js"></script>
<script type="text/javascript" data-main="js/archiva/archiva.js" src="js/require.2.1.2.js"></script> <script type="text/javascript" data-main="js/archiva/archiva.js" src="js/require.2.1.2.js"></script>
<title>Apache Archiva</title> <title>Apache Archiva</title>
</head> </head>
<body id="body_content" style="padding-top: 42px;"> <body id="body_content" style="padding-top: 42px;">
<div id="topbar-menu-container"></div> <div id="topbar-menu-container"></div>
<div class="container-fluid" style="min-height: 550px">
<div class="row-fluid">
<div class="span2 columns">
<div class="well sidebar-nav" id="sidebar-content"></div>
</div>
<div class="span10 columns">
<div class="content">
<div id="user-messages"></div>
<div id="main-content"></div>
</div>
</div>
</div>
<div class="container-fluid" style="min-height: 550px">
<div class="row-fluid">
<div class="span2 columns">
<div class="well sidebar-nav" id="sidebar-content"></div>
</div> </div>
<div class="span10 columns">
<div class="content"> <footer id="footer-content" style="vertical-align: bottom">
<div id="user-messages"></div> </footer>
<div id="main-content"></div>
<div id="html-fragments"></div>
<div id="loadingDiv">
<div class="loading-indicator">
<img src="images/medium-spinner.gif" alt="Archiva loading"/>
<span id="loading-msg">Loading</span>
</div>
</div> </div>
</div> <noscript>
</div> Archiva needs Javascript, please check the Javascript configuration of your browser
</noscript>
</div> </body>
<footer id="footer-content" style="vertical-align: bottom">
</footer>
<div id="html-fragments"></div>
<div id="loadingDiv">
<div class="loading-indicator">
<img src="images/medium-spinner.gif" alt="Archiva loading"/>
<span id="loading-msg">Loading</span>
</div>
</div>
<noscript>
Archiva needs Javascript, please check the Javascript configuration of your browser
</noscript>
</body>
</html> </html>

2
pom.xml
View File

@ -74,7 +74,7 @@
<redback.spring-utils.version>2.0</redback.spring-utils.version> <redback.spring-utils.version>2.0</redback.spring-utils.version>
<redback.taskqueue.version>2.0</redback.taskqueue.version> <redback.taskqueue.version>2.0</redback.taskqueue.version>
<slf4j.version>1.7.2</slf4j.version> <slf4j.version>1.7.2</slf4j.version>
<log4j.version>2.0-beta3</log4j.version> <log4j.version>2.0-beta4</log4j.version>
<spring.version>3.2.1.RELEASE</spring.version> <spring.version>3.2.1.RELEASE</spring.version>