diff options
Diffstat (limited to 'spec')
8 files changed, 0 insertions, 311 deletions
diff --git a/spec/fixtures/java/maven/my-spring-app2/.mvn/wrapper/maven-wrapper.jar b/spec/fixtures/java/maven/my-spring-app2/.mvn/wrapper/maven-wrapper.jar Binary files differdeleted file mode 100644 index 9cc84ea..0000000 --- a/spec/fixtures/java/maven/my-spring-app2/.mvn/wrapper/maven-wrapper.jar +++ /dev/null diff --git a/spec/fixtures/java/maven/my-spring-app2/.mvn/wrapper/maven-wrapper.properties b/spec/fixtures/java/maven/my-spring-app2/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index b573bb5..0000000 --- a/spec/fixtures/java/maven/my-spring-app2/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip diff --git a/spec/fixtures/java/maven/my-spring-app2/mvnw b/spec/fixtures/java/maven/my-spring-app2/mvnw deleted file mode 100755 index 5d8e6c3..0000000 --- a/spec/fixtures/java/maven/my-spring-app2/mvnw +++ /dev/null @@ -1,165 +0,0 @@ -#!/bin/sh - -if [ -z "$MAVEN_SKIP_RC" ] ; then - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi -fi - -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - PRG="$0" - - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - saveddir=`pwd` - M2_HOME=`dirname "$PRG"`/.. - M2_HOME=`cd "$M2_HOME" && pwd` - cd "$saveddir" -fi - -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -find_maven_basedir() { - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - done - echo "${basedir}" -} - -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -echo $MAVEN_PROJECTBASEDIR -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/spec/fixtures/java/maven/my-spring-app2/pom.xml b/spec/fixtures/java/maven/my-spring-app2/pom.xml deleted file mode 100644 index a603294..0000000 --- a/spec/fixtures/java/maven/my-spring-app2/pom.xml +++ /dev/null @@ -1,90 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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> - <groupId>com.example</groupId> - <artifactId>demo</artifactId> - <version>0.0.1-SNAPSHOT</version> - <packaging>jar</packaging> - <name>demo</name> - <description>Demo project for Spring Boot</description> - <parent> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-parent</artifactId> - <version>2.0.1.RELEASE</version> - <relativePath/> <!-- lookup parent from repository --> - </parent> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <java.version>1.8</java.version> - </properties> - <dependencies> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-web</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-core</artifactId> - <version>2.2.3.1</version> - </dependency> - <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>barcodes</artifactId> - <version>7.0.0</version> - </dependency> - <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>font-asian</artifactId> - <version>7.0.0</version> - </dependency> - <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>forms</artifactId> - <version>7.0.0</version> - </dependency> - <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>hyph</artifactId> - <version>7.0.0</version> - </dependency> - <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>io</artifactId> - <version>7.0.0</version> - </dependency> - <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>kernel</artifactId> - <version>7.0.0</version> - </dependency> - <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>layout</artifactId> - <version>7.0.0</version> - </dependency> - <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>pdfa</artifactId> - <version>7.0.0</version> - </dependency> - <dependency> - <groupId>com.itextpdf</groupId> - <artifactId>sign</artifactId> - <version>7.0.0</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - </plugin> - </plugins> - </build> -</project> diff --git a/spec/fixtures/java/maven/my-spring-app2/src/main/java/com/example/demo/DemoApplication.java b/spec/fixtures/java/maven/my-spring-app2/src/main/java/com/example/demo/DemoApplication.java deleted file mode 100644 index 1a42144..0000000 --- a/spec/fixtures/java/maven/my-spring-app2/src/main/java/com/example/demo/DemoApplication.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.example.demo; - -import org.springframework.boot.*; -import org.springframework.boot.autoconfigure.*; -import org.springframework.web.bind.annotation.*; - -@SpringBootApplication -@RestController -public class DemoApplication { - @GetMapping("/") - String home() { - return "Spring is here!"; - } - - public static void main(String[] args) { - SpringApplication.run(DemoApplication.class, args); - } -} diff --git a/spec/fixtures/java/maven/my-spring-app2/src/main/resources/application.properties b/spec/fixtures/java/maven/my-spring-app2/src/main/resources/application.properties deleted file mode 100644 index e69de29..0000000 --- a/spec/fixtures/java/maven/my-spring-app2/src/main/resources/application.properties +++ /dev/null diff --git a/spec/fixtures/java/maven/my-spring-app2/src/test/java/com/example/demo/DemoApplicationTests.java b/spec/fixtures/java/maven/my-spring-app2/src/test/java/com/example/demo/DemoApplicationTests.java deleted file mode 100644 index e7be4a5..0000000 --- a/spec/fixtures/java/maven/my-spring-app2/src/test/java/com/example/demo/DemoApplicationTests.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.example.demo; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.junit4.SpringRunner; -import static org.assertj.core.api.Assertions.assertThat; - -@RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -public class DemoApplicationTests { - @Test - public void contextLoads() { } - - @Autowired - private TestRestTemplate restTemplate; - - @Test - public void homeResponse() { - String body = this.restTemplate.getForObject("/", String.class); - assertThat(body).isEqualTo("Spring is here!"); - } -} diff --git a/spec/integration/java/maven_spec.rb b/spec/integration/java/maven_spec.rb index faa5fc1..aa2d1ff 100644 --- a/spec/integration/java/maven_spec.rb +++ b/spec/integration/java/maven_spec.rb @@ -154,17 +154,6 @@ RSpec.describe "maven" do end end - context "when scanning a project that depends on an older version of maven" do - subject { runner.scan } - - before do - runner.mount(dir: fixture_file('java/maven/my-spring-app2')) - end - - specify { expect(subject).to match_schema } - specify { expect(subject.dependency_names).to match_array(["asm", "asm-commons", "asm-tree", "barcodes", "classmate", "commons-fileupload", "commons-io", "commons-lang", "font-asian", "forms", "freemarker", "hibernate-validator", "hyph", "io", "jackson-annotations", "jackson-core", "jackson-databind", "jackson-datatype-jdk8", "jackson-datatype-jsr310", "jackson-module-parameter-names", "javassist", "javax.annotation-api", "jboss-logging", "jul-to-slf4j", "kernel", "layout", "log4j-api", "log4j-to-slf4j", "logback-classic", "logback-core", "ognl", "pdfa", "sign", "slf4j-api", "snakeyaml", "spring-aop", "spring-beans", "spring-boot", "spring-boot-autoconfigure", "spring-boot-starter", "spring-boot-starter-json", "spring-boot-starter-logging", "spring-boot-starter-tomcat", "spring-boot-starter-web", "spring-context", "spring-core", "spring-expression", "spring-jcl", "spring-web", "spring-webmvc", "struts2-core", "tomcat-embed-core", "tomcat-embed-el", "tomcat-embed-websocket", "validation-api", "xwork-core"]) } - end - [ { java: '8', maven: ['3.6.3', '3.5.4', '3.3.9', '3.2.5'] }, { java: '11', maven: ['3.6.3', '3.5.4', '3.3.9', '3.2.5'] } |