Repository: nifi-registry Updated Branches: refs/heads/master 312a179b6 -> f1e5aef7b
http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/f1e5aef7/nifi-registry-core/nifi-registry-web-api/src/test/resources/extensions/nars/nifi-test-nar-2.0.0-missing-manifest.nar ---------------------------------------------------------------------- diff --git a/nifi-registry-core/nifi-registry-web-api/src/test/resources/extensions/nars/nifi-test-nar-2.0.0-missing-manifest.nar b/nifi-registry-core/nifi-registry-web-api/src/test/resources/extensions/nars/nifi-test-nar-2.0.0-missing-manifest.nar new file mode 100644 index 0000000..cbee3ab Binary files /dev/null and b/nifi-registry-core/nifi-registry-web-api/src/test/resources/extensions/nars/nifi-test-nar-2.0.0-missing-manifest.nar differ http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/f1e5aef7/nifi-registry-core/nifi-registry-web-api/src/test/resources/extensions/nars/nifi-test-nar-2.0.0-no-dependency.nar ---------------------------------------------------------------------- diff --git a/nifi-registry-core/nifi-registry-web-api/src/test/resources/extensions/nars/nifi-test-nar-2.0.0-no-dependency.nar b/nifi-registry-core/nifi-registry-web-api/src/test/resources/extensions/nars/nifi-test-nar-2.0.0-no-dependency.nar new file mode 100644 index 0000000..68e78d3 Binary files /dev/null and b/nifi-registry-core/nifi-registry-web-api/src/test/resources/extensions/nars/nifi-test-nar-2.0.0-no-dependency.nar differ http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/f1e5aef7/nifi-registry-core/nifi-registry-web-api/src/test/resources/extensions/nars/nifi-test-nar-2.0.0.nar ---------------------------------------------------------------------- diff --git a/nifi-registry-core/nifi-registry-web-api/src/test/resources/extensions/nars/nifi-test-nar-2.0.0.nar b/nifi-registry-core/nifi-registry-web-api/src/test/resources/extensions/nars/nifi-test-nar-2.0.0.nar new file mode 100644 index 0000000..8af4909 Binary files /dev/null and b/nifi-registry-core/nifi-registry-web-api/src/test/resources/extensions/nars/nifi-test-nar-2.0.0.nar differ http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/f1e5aef7/nifi-registry-core/nifi-registry-web-ui/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-registry-core/nifi-registry-web-ui/pom.xml b/nifi-registry-core/nifi-registry-web-ui/pom.xml index e8c7548..4a0f4e7 100644 --- a/nifi-registry-core/nifi-registry-web-ui/pom.xml +++ b/nifi-registry-core/nifi-registry-web-ui/pom.xml @@ -216,6 +216,53 @@ </resources> </configuration> </execution> + + <!-- + Stage the final bundle of JS to be included in the .war + --> + <execution> + <id>copy-web-ui-bundle</id> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/${project.build.finalName} + </outputDirectory> + <resources> + <resource> + <directory>${frontend.working.dir}/webapp</directory> + <filtering>false</filtering> + <includes> + <include>nf-registry.bundle.*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <!-- + Stage the localization files to be included in the .war + --> + <execution> + <id>copy-localization</id> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/${project.build.finalName} + </outputDirectory> + <resources> + <resource> + <directory>${frontend.working.dir}/locale</directory> + <filtering>false</filtering> + <includes> + <include>*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> </executions> </plugin> <!-- @@ -307,58 +354,6 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <!-- - Stage the final bundle of JS to be included in the .war - --> - <execution> - <id>copy-web-ui-bundle</id> - <phase>prepare-package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/${project.build.finalName} - </outputDirectory> - <resources> - <resource> - <directory>${frontend.working.dir}/webapp</directory> - <filtering>false</filtering> - <includes> - <include>nf-registry.bundle.*</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - <!-- - Stage the localization files to be included in the .war - --> - <execution> - <id>copy-localization</id> - <phase>prepare-package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/${project.build.finalName} - </outputDirectory> - <resources> - <resource> - <directory>${frontend.working.dir}/locale</directory> - <filtering>false</filtering> - <includes> - <include>*</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/f1e5aef7/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html ---------------------------------------------------------------------- diff --git a/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html b/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html index 8fbd6d4..fa41287 100644 --- a/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html +++ b/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/explorer/grid-list/registry/nf-registry-grid-list-viewer.html @@ -44,7 +44,7 @@ limitations under the License. [disabled]="disabled" (expanded)="nfRegistryService.getDropletSnapshotMetadata(droplet)"> <ng-template td-expansion-panel-label> <div fxLayout="column" fxLayoutAlign="space-between start"> - <span class="md-title capitalize">{{droplet.name}} - {{droplet.bucketName}}</span> + <span class="md-title">{{droplet.name}} - {{droplet.bucketName}}</span> <span class="md-subhead">{{droplet.type}}</span> </div> </ng-template> http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/f1e5aef7/nifi-registry-core/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-registry-core/pom.xml b/nifi-registry-core/pom.xml index 13c7bd2..e09a698 100644 --- a/nifi-registry-core/pom.xml +++ b/nifi-registry-core/pom.xml @@ -45,6 +45,7 @@ <module>nifi-registry-docs</module> <module>nifi-registry-client</module> <module>nifi-registry-docker</module> + <module>nifi-registry-bundle-utils</module> </modules> <dependencyManagement> @@ -97,12 +98,7 @@ <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>2.0.0.Final</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>6.0.2.Final</version> + <version>2.0.1.Final</version> </dependency> <dependency> <groupId>org.glassfish</groupId> @@ -140,6 +136,11 @@ <artifactId>swagger-annotations</artifactId> <version>1.5.16</version> </dependency> + <dependency> + <groupId>org.glassfish.jersey.media</groupId> + <artifactId>jersey-media-multipart</artifactId> + <version>${jersey.version}</version> + </dependency> </dependencies> </dependencyManagement> http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/f1e5aef7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 57d8f22..323c703 100644 --- a/pom.xml +++ b/pom.xml @@ -92,11 +92,12 @@ <org.slf4j.version>1.7.12</org.slf4j.version> <jetty.version>9.4.11.v20180605</jetty.version> <jax.rs.api.version>2.1</jax.rs.api.version> - <jersey.version>2.26</jersey.version> - <jackson.version>2.9.6</jackson.version> - <spring.boot.version>2.0.4.RELEASE</spring.boot.version> - <spring.security.version>5.0.7.RELEASE</spring.security.version> - <flyway.version>4.2.0</flyway.version> + <jersey.version>2.27</jersey.version> + <jackson.version>2.9.7</jackson.version> + <spring.boot.version>2.1.0.RELEASE</spring.boot.version> + <spring.security.version>5.1.1.RELEASE</spring.security.version> + <flyway.version>5.2.1</flyway.version> + <flyway.tests.version>5.1.0</flyway.tests.version> <swagger.ui.version>3.12.0</swagger.ui.version> </properties>
