update to 2.5.0.Final

windup · May 5, 2016 · 60322f7 · 60322f7
1 parent 2a7587e
commit 60322f7
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 59 deletions.
diff --git a/ejb-beanutils-async/pom.xml b/ejb-beanutils-async/pom.xml
@@ -4,12 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <version.windup>2.5.0-SNAPSHOT</version.windup>
+        <version.windup>2.5.0.Final</version.windup>
     </properties>
 
     <groupId>org.jboss.windup.quickstarts</groupId>
     <artifactId>windup-ejb-beanutils-async</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.5.0.Final</version>
     <packaging>pom</packaging>
 
     <name>Windup Quickstart: ejb-beanutils-async</name>

diff --git a/ejb-beanutils-async/rules-java/README.adoc b/ejb-beanutils-async/rules-java/README.adoc
@@ -78,7 +78,7 @@ To find these values, open the  QUICKSTART_HOME/rules-java/pom.xml file. These v
 ----
 <groupId>org.jboss.windup.quickstarts</groupId>
 <artifactId>windup-ejb-beanutils-async-rules-java</artifactId>
-<version>2.5.0-SNAPSHOT</version>
+<version>2.5.0.Final</version>
 ----
 
 Follow these steps to add the rule to Windup.

diff --git a/ejb-beanutils-async/rules-java/pom.xml b/ejb-beanutils-async/rules-java/pom.xml
@@ -5,15 +5,15 @@
 
     <groupId>org.jboss.windup.quickstarts</groupId>
     <artifactId>windup-ejb-beanutils-async-rules-java</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.5.0.Final</version>
     <name>Windup Quickstart: ejb-beanutils-async-rules-java</name>
     <description>Windup Quickstart: Rule That Detects Seam Asynchronous Annotation in Remote EJBs</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
-        <version.windup>2.5.0-SNAPSHOT</version.windup>
+        <version.windup>2.5.0.Final</version.windup>
     </properties>
 
     <dependencyManagement>

diff --git a/maven-plugin-usage/pom.xml b/maven-plugin-usage/pom.xml
@@ -1,12 +1,9 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.jboss.windup.quickstarts</groupId>
-        <artifactId>windup-quickstarts-root</artifactId>
-        <version>2.5.0-SNAPSHOT</version>
-    </parent>
+    <groupId>org.jboss.windup.quickstarts</groupId>
     <artifactId>maven-plugin-usage</artifactId>
+    <version>2.5.0.Final</version>
     <description>This example shows how to use Windup for generating reports natively in Maven project</description>
 
     <name>Windup Quickstart: windup-maven-plugin</name>
@@ -27,8 +24,8 @@
     </scm>
 
     <properties>
-        <version.windup>2.5.0-SNAPSHOT</version.windup>
-        <version.windup-maven-plugin>1.0-SNAPSHOT</version.windup-maven-plugin>
+        <version.windup>2.5.0.Final</version.windup>
+        <version.windup-maven-plugin>2.5.0.Final</version.windup-maven-plugin>
     </properties>
 
     <dependencyManagement>
@@ -206,7 +203,7 @@
                                             <version>${version.windup}</version>
                                             <classifier>jeeapp</classifier>
                                             <type>ear</type>
-                                            <overWrite>[ true or false ]</overWrite>
+                                            <overWrite>true</overWrite>
                                             <outputDirectory>${project.build.directory}</outputDirectory>
                                             <destFileName>jee-app.ear</destFileName>
                                         </artifactItem>
@@ -234,7 +231,7 @@
                                     -->
 
                                     <!-- Where the Windup report is generated to. -->
-                                    <output>${project.build.directory}/reports-jee</output>
+                                    <output>${project.build.directory}/reports-example-ear</output>
 
                                     <!-- The application archive to analyze. -->
                                     <input>${project.build.directory}/jee-app.ear</input>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <version.windup>2.5.0-SNAPSHOT</version.windup>
+        <version.windup>2.5.0.Final</version.windup>
     </properties>
 
     <parent>
@@ -16,7 +16,7 @@
 
     <groupId>org.jboss.windup.quickstarts</groupId>
     <artifactId>windup-quickstarts-root</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.5.0.Final</version>
     <packaging>pom</packaging>
 
     <name>Windup QuickStart Root</name>

diff --git a/proprietary-javaee-servlet/pom.xml b/proprietary-javaee-servlet/pom.xml
@@ -4,12 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <version.windup>2.5.0-SNAPSHOT</version.windup>
+        <version.windup>2.5.0.Final</version.windup>
     </properties>
 
     <groupId>org.jboss.windup.quickstarts</groupId>
     <artifactId>windup-proprietary-javaee-servlet</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.5.0.Final</version>
     <packaging>pom</packaging>
 
     <name>Windup Quickstart: Proprietary to Java EE Servlet</name>

diff --git a/proprietary-javaee-servlet/rules-java/README.adoc b/proprietary-javaee-servlet/rules-java/README.adoc
@@ -95,7 +95,7 @@ To find these values, open the  QUICKSTART_HOME/rules-java/pom.xml file. These v
 ----
 <groupId>org.jboss.windup.quickstarts</groupId>
 <artifactId>windup-proprietary-javaee-servlet-rules-java</artifactId>
-<version>2.5.0-SNAPSHOT</version>
+<version>2.5.0.Final</version>
 ----
 
 Follow these steps to add the rule to Windup.

diff --git a/proprietary-javaee-servlet/rules-java/pom.xml b/proprietary-javaee-servlet/rules-java/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.jboss.windup.quickstarts</groupId>
     <artifactId>windup-proprietary-javaee-servlet-rules-java</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.5.0.Final</version>
 
     <name>Windup Quickstart: Proprietary to Java EE Servlet Rules</name>
     <description>Windup Quickstart: Proprietary Servlet Annotations</description>
@@ -14,7 +14,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
-        <version.windup>2.5.0-SNAPSHOT</version.windup>
+        <version.windup>2.5.0.Final</version.windup>
     </properties>
 
     <dependencyManagement>

diff --git a/victi.ms/README.adoc b/victi.ms/README.adoc
@@ -41,7 +41,7 @@ The Windup JavaDoc is located here: http://windup.github.io/windup/docs/latest/j
 
 The rule this project produces is designed to be run on Windup 2.x or later.
 
-This project requires Java 6.0 (Java SDK 1.6) or later and Maven 3.0 or later.
+This project requires Java 7 (Java SDK 1.7) or later and Maven 3.0 or later.
 
 [[install-windup]]
 == Install Windup
@@ -82,7 +82,8 @@ To find these values, open the  QUICKSTART_HOME/pom.xml file. These values are l
 ----
 <groupId>org.jboss.windup.quickstarts</groupId>
 <artifactId>windup-victims</artifactId>
-<version>2.5.0-SNAPSHOT</version>
+<version>2.5.0.Final
+</version>
 ----
 
 Follow these steps to add the rule to Windup.

diff --git a/victi.ms/pom.xml b/victi.ms/pom.xml
@@ -5,15 +5,15 @@
 
     <groupId>org.jboss.windup.quickstarts</groupId>
     <artifactId>windup-victims</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.5.0.Final</version>
 
     <name>Windup Quickstart: Victi.ms Ruleset</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.7</maven.compiler.source>
         <maven.compiler.target>1.7</maven.compiler.target>
-        <version.windup>2.5.0-SNAPSHOT</version.windup>
+        <version.windup>2.5.0.Final</version.windup>
     </properties>
 
     <dependencyManagement>

diff --git a/victi.ms/src/main/java/org/jboss/windup/qs/victims/Report-Security.html b/victi.ms/src/main/java/org/jboss/windup/qs/victims/Report-Security.html
@@ -23,11 +23,12 @@
                 <td><#if file.fileName?has_content> ${file.fileName} </#if></td>
                 <td><#if file.filePath?has_content> ${file.filePath} </#if></td>
                 <td>
-                    <li><#list file.vulnerabilities.iterator() as vul>
-                        <ul>
-                            <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=${vul.cve}">${vul.cve}</a>
-                        </ul> </#list>
-                </li>
+                    <ul><#list file.vulnerabilities.iterator() as vul>
+	                        <li>
+	                        <a href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=${vul.cve}">${vul.cve}</a>
+	                        </li> 
+                        </#list>
+                    </ul>
                 </td>
             </tr>
             </#list>
@@ -47,44 +48,39 @@
     <link href="resources/css/windup.java.css" rel="stylesheet" media="screen">
 </head>
 <body role="document">
-
-	<!-- Fixed navbar -->
-	<div class="navbar-fixed-top windup-bar" role="navigation">
-		<div class="container theme-showcase" role="main">
-			<img src="resources/img/windup-logo.png" class="logo" />
-		</div>
+	<!-- Navbar -->
+	<div id="main-navbar" class="navbar navbar-default navbar-fixed-top">
+	    <div class="navbar-header">
+	        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
+	            <span class="icon-bar"></span>
+	            <span class="icon-bar"></span>
+	            <span class="icon-bar"></span>
+	        </button>
+	    </div>
+
+	    <#if applicationReportIndexModel??>
+	        <div class="navbar-collapse collapse navbar-responsive-collapse">
+	            <#include "/reports/templates/include/navbar.ftl">
+	        </div><!-- /.nav-collapse -->
+	    </#if>
 	</div>
+	<!-- / Navbar -->
 
-	<div class="container" role="main">
+    <!--  container -->
+	<div class="container-fluid" role="main">
 		<div class="row">
 			<div class="page-header page-header-no-border">
-				<h1>
-					Ignored files from <span class="slash">/</span
-                    ><small style="margin-left: 20px; font-weight: 100;">${reportModel.projectModel.name}</small>
+				<h1>Ignored files from <span class="slash">/</span><small style="margin-left: 20px; font-weight: 100;">${reportModel.projectModel.name}</small>
 				</h1>
-				<div class="navbar navbar-default">
-					<div class="navbar-header">
-						<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
-							<span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span>
-						</button>
-					</div>
-					<div class="navbar-collapse collapse navbar-responsive-collapse">
-						<ol class="breadcrumb top-menu">
-							<li><a href="../index.html">All Applications</a></li>
-                            <#include "/reports/templates/include/breadcrumbs.ftl">
-						</ol>
-
-					</div>
-					<!-- /.nav-collapse -->
-					<div class="navbar-collapse collapse navbar-responsive-collapse">
-						<ul class="nav navbar-nav"> <#include "/reports/templates/include/navbar.ftl"> </ul>
-					</div>
-					<!-- /.nav-collapse -->
+				<div>
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
+						<span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span>
+					</button>
 				</div>
 			</div>
 		</div>
 
-		<div class="container theme-showcase" role="main">
+		<div class="container-fluid theme-showcase" role="main">
 			<@affectedJarsRenderer reportModel />
         </div>
 	</div>