Skip to content
Snippets Groups Projects
Commit 76d429f7 authored by Martin Lowe's avatar Martin Lowe :flag_ca:
Browse files

Update project for yarn, modern common package, and build fixes for CI

parent 9233fafb
No related branches found
No related tags found
1 merge request!2Add Jenkinsfile for CI build
clean:; clean:;
mvn clean mvn clean
compile-java: validate-spec; compile-java: generate-spec;
mvn compile package mvn compile package
compile-java-quick: validate-spec; compile-java-quick: generate-spec;
mvn compile package -Dmaven.test.skip=true mvn compile package -Dmaven.test.skip=true
compile: clean compile-java; compile: clean compile-java;
compile-quick: clean compile-java-quick; compile-quick: clean compile-java-quick;
install-npm:; install-yarn:;
npm ci yarn install --frozen-lockfile --audit
validate-spec: install-npm; generate-spec: install-yarn validate-spec;
npm run test yarn run generate-json-schema
validate-spec: install-yarn;
compile-start: compile-quick; compile-start: compile-quick;
docker-compose down docker-compose down
docker-compose build docker-compose build
docker-compose up docker-compose up
start-spec: validate-spec; start-spec: validate-spec;
npm run start yarn run start
\ No newline at end of file \ No newline at end of file
This diff is collapsed.
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
}, },
"private": true, "private": true,
"scripts": { "scripts": {
"start": "npm run generate-json-schema && npx @redocly/openapi-cli preview-docs spec/openapi.yaml -p 8093", "start": "yarn run generate-json-schema && npx @redocly/openapi-cli preview-docs spec/openapi.yaml -p 8093",
"test": "npm run generate-json-schema && npx @redocly/openapi-cli lint spec/openapi.yaml", "test": "yarn run generate-json-schema && npx @redocly/openapi-cli lint spec/openapi.yaml",
"generate-json-schema": "npm run clean && node src/main/js/openapi2schema.js -s spec/openapi.yaml -t src/test/resources", "generate-json-schema": "yarn run clean && node src/main/js/openapi2schema.js -s spec/openapi.yaml -t src/test/resources",
"clean": "rm -rf src/test/resources/schemas/" "clean": "rm -rf src/test/resources/schemas/"
} }
} }
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
<artifactId>eclipsefdn-mailing-lists</artifactId> <artifactId>eclipsefdn-mailing-lists</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<properties> <properties>
<eclipse-api-version>0.4-SNAPSHOT</eclipse-api-version> <eclipse-api-version>0.6.1-SNAPSHOT</eclipse-api-version>
<surefire-plugin.version>2.22.1</surefire-plugin.version> <surefire-plugin.version>2.22.1</surefire-plugin.version>
<compiler-plugin.version>3.8.1</compiler-plugin.version> <compiler-plugin.version>3.8.1</compiler-plugin.version>
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.source>11</maven.compiler.source>
<quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id> <quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<quarkus.platform.version>2.1.4.Final</quarkus.platform.version> <quarkus.platform.version>2.6.3.Final</quarkus.platform.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding> <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
<maven.compiler.parameters>true</maven.compiler.parameters> <maven.compiler.parameters>true</maven.compiler.parameters>
...@@ -119,7 +119,6 @@ ...@@ -119,7 +119,6 @@
<dependency> <dependency>
<groupId>com.google.auto.value</groupId> <groupId>com.google.auto.value</groupId>
<artifactId>auto-value-annotations</artifactId> <artifactId>auto-value-annotations</artifactId>
<version>${auto-value.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.findbugs</groupId> <groupId>com.google.code.findbugs</groupId>
...@@ -202,56 +201,6 @@ ...@@ -202,56 +201,6 @@
</annotationProcessorPaths> </annotationProcessorPaths>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.3.2</version>
<executions>
<execution>
<id>npm install (initialize)</id>
<goals>
<goal>exec</goal>
</goals>
<phase>initialize</phase>
<configuration>
<executable>npm</executable>
<arguments>
<argument>install</argument>
<argument>-f</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>npm clean</id>
<goals>
<goal>exec</goal>
</goals>
<phase>clean</phase>
<configuration>
<executable>npm</executable>
<arguments>
<argument>run</argument>
<argument>clean</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>npm run pre-test</id>
<goals>
<goal>exec</goal>
</goals>
<phase>generate-test-resources</phase>
<configuration>
<executable>npm</executable>
<skip>${maven.test.skip}</skip>
<arguments>
<argument>run</argument>
<argument>generate-json-schema</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-plugin.version}</version> <version>${surefire-plugin.version}</version>
......
yarn.lock 0 → 100644
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment