summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2020-03-03Merge "Rework the activate pdp group payload"Sébastien Determe4-39/+98
2020-03-03Rework the activate pdp group payloadxuegao4-39/+98
2020-03-02Merge "Upload Tosca Model changes to remove policy model type parsing from UI...Sébastien Determe13-238/+328
2020-02-27Fix bug in operational policysebdet13-2735/+3120
2020-02-27Upload Tosca Model changes to remove policy model type parsing from UI.Ashwin Sharma13-238/+328
2020-02-27Standardize loop controllersebdet3-5/+32
2020-02-27Change emulator policy responsesebdet17-1/+1273
2020-02-27Fix the loopCachesebdet3-5/+5
2020-02-27Add Create loop dialogsebdet37-125/+468
2020-02-26Add new dialog for policysebdet10-35/+219
2020-02-26Create get Pdp Groups flowxuegao20-2092/+2808
2020-02-25Fix Bug due to user management changessebdet11-2137/+2128
2020-02-25Simplify the user managementsebdet30-1324/+221
2020-02-25Modify the Uisebdet23-15784/+14054
2020-02-25Operational policy modificationsebdet30-394/+604
2020-02-17Fix the loop template viewsebdet12-6889/+24430
2020-02-14Changes include Metadata support, Upload tosca policy model and Loop Templateash7426839-706/+4133
2020-02-14Add testssebdet13-2098/+141
2020-02-14Merge "Fix deploy flow bug"Sébastien Determe3-6/+6
2020-02-13Fix deploy flow bugxuegao3-6/+6
2020-02-13Merge "Add tests"Xue Gao9-67/+139
2020-02-13Add testssebdet9-67/+139
2020-02-12Merge "Migrate clamp docs"Christophe Closset9-0/+145
2020-02-11Merge "Add policy downloader"Xue Gao9-63/+160
2020-02-11Add policy downloadersebdet9-63/+160
2020-02-10Migrate clamp docsJessica Wagantall9-0/+145
2020-02-10Fix npm repo missingsebdet2-1/+4
2020-02-10Merge "Removal of ELK"Sébastien Determe63-2515/+1
2020-02-10Merge "Removal of useless files"Sébastien Determe56-177/+0
2020-02-10Removal of ELKsebdet63-2515/+1
2020-02-10Removal of useless filessebdet56-177/+0
2020-02-10Bump up clampsebdet2-3/+3
2020-02-10Get policy in CsarInstallersebdet50-2649/+2026
2020-02-10Merge "Update get Dcae Status flow"Sébastien Determe12-113/+328
2020-02-10Update get Dcae Status flowxuegao12-113/+328
2020-02-05Merge "Changes for populating ReactJS component library"Sébastien Determe10-44/+270
2020-02-05Update SSL Certs and docChrisC5-54/+66
2020-02-04Changes for populating ReactJS component libraryTed Humphrey10-44/+270
2020-01-30Merge "Remove blueprintId in loop"Xue Gao9-121/+57
2020-01-30Remove blueprintId in loopsebdet9-121/+57
2020-01-30Merge "Change the Csar installer"Xue Gao17-186/+245
2020-01-30Merge "Add a unit test"Xue Gao2-13/+72
2020-01-30Merge "Enable multithread for failsafe"Xue Gao1-1/+1
2020-01-30Change the Csar installersebdet17-186/+245
2020-01-30Update undeploy-loop flowxuegao5-93/+310
2020-01-30Merge "Update deploy-loop route"Sébastien Determe12-24/+508
2020-01-30Update deploy-loop routexuegao12-24/+508
2020-01-30Add a unit testsebdet2-13/+72
2020-01-29Merge "Create a camel route that would retrieve all the DCAE blueprints"Xue Gao8-15/+272
2020-01-29Enable multithread for failsafesebdet1-1/+1
sion>3.4.0</cassandra.version> <zookeeper.version>3.4.11</zookeeper.version> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <!--nexus --> <nexusproxy>https://nexus.onap.org</nexusproxy> <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath> <releaseNexusPath>/content/repositories/releases/</releaseNexusPath> <stagingNexusPath>/content/repositories/staging/</stagingNexusPath> <sitePath>/content/sites/site/org/onap/music/${project.version}</sitePath> <!--maven --> <timestamp>${maven.build.timestamp}</timestamp> <maven.build.timestamp.format>yyyy.MM.dd.HH.mm</maven.build.timestamp.format> <!--docker --> <docker.tag>${project.version}-${timestamp}</docker.tag> <docker.latest.tag>${project.version}-latest</docker.latest.tag> </properties> <repositories> <repository> <id>ecomp-releases</id> <name>ECOMP Release Repository</name> <url>${onap.nexus.url}/${releaseNexusPath}</url> </repository> <repository> <id>ecomp-snapshots</id> <name>Snapshot Repository</name> <url>${nexusproxy}/${snapshotNexusPath}</url> </repository> <repository> <id>ecomp-staging</id> <name>Staging Repository</name> <url>${nexusproxy}/${stagingNexusPath}</url> </repository> </repositories> <build> <finalName>MUSIC</finalName> <sourceDirectory>src/main/java</sourceDirectory> <outputDirectory>src/main/webapp/WEB-INF/classes</outputDirectory> <testSourceDirectory>src/test/java</testSourceDirectory> <testOutputDirectory>target/test-classes</testOutputDirectory> <defaultGoal>validate</defaultGoal> <resources> <resource> <directory>src/main/resources</directory> <filtering>true</filtering> </resource> </resources> <plugins> <plugin> <artifactId>maven-eclipse-plugin</artifactId> <version>2.9</version> <configuration> <additionalProjectnatures> <projectnature>org.springframework.ide.eclipse.core.springnature</projectnature> </additionalProjectnatures> <additionalBuildcommands> <buildcommand>org.springframework.ide.eclipse.core.springbuilder</buildcommand> </additionalBuildcommands> <downloadSources>true</downloadSources> <downloadJavadocs>true</downloadJavadocs> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>3.5.1</version> <configuration> <source>1.7</source> <target>1.7</target> <excludes> <exclude>jar/**</exclude> </excludes> </configuration> </plugin> <plugin> <artifactId>maven-war-plugin</artifactId> <version>2.4</version> <configuration> <warSourceDirectory>WebContent</warSourceDirectory> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <version>2.4</version> <executions> <execution> <id>make-a-jar</id> <phase>compile</phase> <goals> <goal>jar</goal> </goals> <configuration> <excludes> <exclude>**/*.xml</exclude> <exclude>**/*.properties</exclude> <exclude>**/Sample*</exclude> </excludes> </configuration> </execution> </executions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> <version>2.4</version> <executions> <execution> <phase>install</phase> <goals> <goal>install-file</goal> </goals> <configuration> <packaging>jar</packaging> <artifactId>${project.artifactId}</artifactId> <groupId>${project.groupId}</groupId> <version>${project.version}</version> <file>${project.build.directory}/${project.artifactId}.jar</file> </configuration> </execution> </executions> </plugin> </plugins> </build> <dependencies> <!-- Development --> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.4</version> <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> <version>3.0.1</version> <scope>provided</scope> </dependency> <!-- /Development --> <!-- Logging --> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> <version>1.2.3</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> <version>1.2.3</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>com.att.eelf</groupId> <artifactId>eelf-core</artifactId> <version>1.0.1-oss</version> </dependency> <!-- End Logging --> <!-- Cassandra --> <dependency> <groupId>com.datastax.cassandra</groupId> <artifactId>cassandra-driver-core</artifactId> <version>${cassandra.version}</version> </dependency> <!-- /Cassandra --> <!-- Zookeeper --> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> <version>${zookeeper.version}</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> </exclusions> </dependency> <!-- /Zookeeper --> <!-- Jersey --> <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-client</artifactId> <version>${jersey1.version}</version> </dependency> <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-server</artifactId> <version>${jersey1.version}</version> </dependency> <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-json</artifactId> <version>${jersey1.version}</version> </dependency> <dependency> <groupId>com.sun.jersey</groupId> <artifactId>jersey-servlet</artifactId> <version>${jersey1.version}</version> </dependency> <!-- /Jersey --> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-jcs-core</artifactId> <version>2.2</version> </dependency> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <version>1.11</version> </dependency> <!-- Testing --> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.12</version> <scope>test</scope> </dependency> <dependency> <groupId>org.cassandraunit</groupId> <artifactId>cassandra-unit</artifactId> <version>3.3.0.2</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.curator</groupId> <artifactId>curator-test</artifactId> <version>2.3.0</version> <exclusions> <exclusion> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> </exclusion> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> </exclusions> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <version>1.9.0</version> <scope>test</scope> </dependency> <!-- /Testing --> <dependency> <groupId>io.netty</groupId> <artifactId>netty-handler</artifactId> <version>4.0.56.Final</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> <version>2.9.4</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> <version>4.5.3</version> </dependency> <dependency> <groupId>io.swagger</groupId> <artifactId>swagger-jersey-jaxrs</artifactId> <version>1.5.18</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>19.0</version> </dependency> <dependency> <groupId>de.svenkubiak</groupId> <artifactId>jBCrypt</artifactId> <version>0.4.1</version> </dependency> <!-- <dependency> <groupId>org.mindrot</groupId> <artifactId>jbcrypt</artifactId> <version>0.4</version> </dependency>--> <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec --> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> <version>1.9</version> </dependency> <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 --> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> <version>3.0</version> </dependency> </dependencies> <reporting> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <version>2.10.3</version> <configuration> <author>true</author> <breakiterator>true</breakiterator> <version>true</version> <links> <link>https://docs.oracle.com/javase/7/docs/api/</link> <link>https://tomcat.apache.org/tomcat-7.0-doc/jspapi/</link> <link>http://docs.oracle.com/javaee/7/api/</link> </links> </configuration> </plugin> </plugins> </reporting> <profiles> <profile> <id>docker</id> <build> <plugins> <plugin> <groupId>io.fabric8</groupId> <artifactId>docker-maven-plugin</artifactId> <version>0.19.1</version> <configuration> <verbose>true</verbose> <apiVersion>1.23</apiVersion> <registry>nexus3.onap.org:10003</registry> <images> <!-- MUSIC War --> <image> <name>onap/music/music</name> <alias>docker_music</alias> <build> <cleanup>true</cleanup> <tags> <tag>${docker.tag}</tag> <tag>${docker.latest.tag}</tag> </tags> <dockerFileDir>${project.basedir}</dockerFileDir> <assembly> <descriptorRef>artifact</descriptorRef> </assembly> </build> </image> <!-- Cassandra --> <image> <name>onap/music/cassandra_music</name> <alias>docker_cassandra</alias> <build> <cleanup>true</cleanup> <tags> <tag>3.0-${timestamp}</tag> <tag>3.0-latest</tag> </tags> <dockerFileDir>${project.basedir}/distribution/cassandra</dockerFileDir> </build> </image> <!-- Zookeeper --> <!-- <image> <name>onap/music/zookeeper_music</name> <alias>docker_zookeeper</alias> <build> <cleanup>true</cleanup> <tags> <tag>3.4-${timestamp}</tag> <tag>3.4-latest</tag> </tags> <dockerFileDir>${project.basedir}/distribution/zookeeper</dockerFileDir> </build> </image> --> <!-- tomcat 8.5 --> <!-- <image> <name>onap/music/tomcat_music</name> <alias>docker_tomcat</alias> <build> <cleanup>true</cleanup> <tags> <tag>8.5-${timestamp}</tag> <tag>8.5-latest</tag> </tags> <dockerFileDir>${project.basedir}/distribution/tomcat</dockerFileDir> </build> </image>\ --> </images> </configuration> <executions> <execution> <id>clean-images</id> <phase>pre-clean</phase> <goals> <goal>remove</goal> </goals> <configuration> <removeAll>true</removeAll> <image>music</image> </configuration> </execution> <execution> <id>generate-images</id> <phase>package</phase> <goals> <goal>build</goal> </goals> </execution> <execution> <id>push-images</id> <phase>deploy</phase> <goals> <goal>push</goal> </goals> <configuration> <image>onap/music/music</image> </configuration> </execution> </executions> </plugin> </plugins> </build> </profile> </profiles> <distributionManagement> <repository> <id>ecomp-releases</id> <name>Release Repository</name> <url>${nexusproxy}/${releaseNexusPath}</url> </repository> <snapshotRepository> <id>ecomp-snapshots</id> <name>Snapshot Repository</name> <url>${nexusproxy}/${snapshotNexusPath}</url> </snapshotRepository> <!-- added for javadoc --> <site> <id>ecomp-site</id> <url>dav:${nexusproxy}${sitePath}</url> </site> </distributionManagement> </project>