Skip to content

Commit 8319579

Browse files
author
Chris Wiechmann
authored
Merge branch 'develop' into master
2 parents e287e03 + 3102b52 commit 8319579

646 files changed

Lines changed: 23865 additions & 16971 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
/target/
2-
/.settings/
32
.classpath
3+
.settings/
44
.project
55
/test-output/
66

7-
distribution/target/
8-
modules/*/target/
9-
modules/*/test-output/
10-
modules/*/.settings/
7+
# Exclude files in all modules
8+
9+
/modules/**/target/
10+
/modules/**/.project
11+
/modules/**/.classpath
12+
/modules/**/.settings/
13+
/modules/**/test-output/
14+
15+
/distribution/**/target/

‎.travis.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,3 @@ install:
4949
- docker-compose run --rm start_apimgmt
5050
# Give API-Manager a moment to start
5151
- docker-compose logs --tail 30 apimgmt
52-
53-
after_failure:
54-
- docker-compose logs --tail 1000 apimgmt

modules/distribution/README.md renamed to distribution/README.md

File renamed without changes.

modules/distribution/src/main/assembly/dist-release.xml renamed to distribution/assembly/dist-release.xml

Lines changed: 72 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,72 @@
1-
<assembly>
2-
<id>release</id>
3-
<formats>
4-
<format>tar.gz</format>
5-
<format>zip</format>
6-
<format>dir</format>
7-
</formats>
8-
<includeBaseDirectory>true</includeBaseDirectory>
9-
<includeSiteDirectory>false</includeSiteDirectory>
10-
<baseDirectory>swagger-promote-${pom.version}</baseDirectory>
11-
<moduleSets>
12-
<moduleSet>
13-
<useAllReactorProjects>true</useAllReactorProjects>
14-
<includes>
15-
<include>com.github.axway-api-management-plus.swagger-promote:axway-swagger-promote-core</include>
16-
<include>com.github.axway-api-management-plus.swagger-promote:axway-swagger-promote-export</include>
17-
</includes>
18-
<binaries>
19-
<unpack>false</unpack>
20-
<outputDirectory>lib</outputDirectory>
21-
</binaries>
22-
<sources>
23-
<includeModuleDirectory>false</includeModuleDirectory>
24-
<fileSets>
25-
<fileSet>
26-
<directory>src/main/assembly/samples</directory>
27-
<outputDirectory>/samples</outputDirectory>
28-
<includes>
29-
<include>**/*</include>
30-
</includes>
31-
<excludes>
32-
<exclude>*.formatted</exclude>
33-
</excludes>
34-
</fileSet>
35-
<fileSet>
36-
<directory>src/main/assembly/conf</directory>
37-
<outputDirectory>/conf</outputDirectory>
38-
<includes>
39-
<include>**/*</include>
40-
</includes>
41-
<excludes>
42-
<exclude>*.formatted</exclude>
43-
</excludes>
44-
</fileSet>
45-
<fileSet>
46-
<directory>src/main/assembly/lib</directory>
47-
<outputDirectory>/lib</outputDirectory>
48-
<includes>
49-
<include>*</include>
50-
</includes>
51-
<lineEnding>unix</lineEnding>
52-
<excludes>
53-
<exclude>*.formatted</exclude>
54-
</excludes>
55-
</fileSet>
56-
<fileSet>
57-
<directory>src/main/assembly/scripts</directory>
58-
<outputDirectory>/scripts</outputDirectory>
59-
<includes>
60-
<include>*.sh</include>
61-
<include>*.bat</include>
62-
</includes>
63-
<fileMode>0755</fileMode>
64-
<lineEnding>unix</lineEnding>
65-
</fileSet>
66-
</fileSets>
67-
</sources>
68-
</moduleSet>
69-
</moduleSets>
70-
71-
<fileSets>
72-
<fileSet>
73-
<directory>${project.basedir}/../..</directory>
74-
<outputDirectory></outputDirectory>
75-
<includes>
76-
<include>README.md</include>
77-
<include>LICENSE</include>
78-
</includes>
79-
</fileSet>
80-
</fileSets>
81-
82-
</assembly>
1+
<assembly>
2+
<id>release</id>
3+
<formats>
4+
<format>tar.gz</format>
5+
<format>zip</format>
6+
<format>dir</format>
7+
</formats>
8+
<includeBaseDirectory>true</includeBaseDirectory>
9+
<includeSiteDirectory>false</includeSiteDirectory>
10+
<baseDirectory>apim-cli-${pom.version}</baseDirectory>
11+
<moduleSets>
12+
<moduleSet>
13+
<useAllReactorProjects>true</useAllReactorProjects>
14+
<includes>
15+
<include>com.github.axway-api-management-plus.apim-cli:apimcli-core</include>
16+
<include>com.github.axway-api-management-plus.apim-cli:apimcli-api-import</include>
17+
<include>com.github.axway-api-management-plus.apim-cli:apimcli-api-export</include>
18+
<include>com.github.axway-api-management-plus.apim-cli:apimcli-app-import</include>
19+
<include>com.github.axway-api-management-plus.apim-cli:apimcli-app-export</include>
20+
<include>com.github.axway-api-management-plus.apim-cli:apimcli-tool</include>
21+
</includes>
22+
<binaries>
23+
<unpack>false</unpack>
24+
<outputDirectory>lib</outputDirectory>
25+
</binaries>
26+
<sources>
27+
<includeModuleDirectory>false</includeModuleDirectory>
28+
<fileSets>
29+
<fileSet>
30+
<directory>assembly/</directory>
31+
<outputDirectory>/</outputDirectory>
32+
<includes>
33+
<include>**/*</include>
34+
</includes>
35+
<excludes>
36+
<exclude>*.formatted</exclude>
37+
</excludes>
38+
</fileSet>
39+
<fileSet>
40+
<directory>src/main/resources</directory>
41+
<outputDirectory>/lib</outputDirectory>
42+
<includes>
43+
<include>log4j.xml</include>
44+
</includes>
45+
</fileSet>
46+
<fileSet>
47+
<directory>assembly/scripts</directory>
48+
<outputDirectory>/scripts</outputDirectory>
49+
<includes>
50+
<include>*.sh</include>
51+
<include>*.bat</include>
52+
</includes>
53+
<fileMode>0755</fileMode>
54+
<lineEnding>unix</lineEnding>
55+
</fileSet>
56+
</fileSets>
57+
</sources>
58+
</moduleSet>
59+
</moduleSets>
60+
61+
<fileSets>
62+
<fileSet>
63+
<directory>${project.basedir}/..</directory>
64+
<outputDirectory></outputDirectory>
65+
<includes>
66+
<include>README.md</include>
67+
<include>LICENSE</include>
68+
</includes>
69+
</fileSet>
70+
</fileSets>
71+
72+
</assembly>

‎distribution/pom.xml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
9+
<artifactId>parent</artifactId>
10+
<version>0.0.9-SNAPSHOT</version>
11+
<relativePath>../pom.xml</relativePath>
12+
</parent>
13+
14+
<artifactId>distribution</artifactId>
15+
16+
<packaging>pom</packaging>
17+
18+
<name>Distribution</name>
19+
20+
<dependencies>
21+
<dependency>
22+
<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
23+
<artifactId>apimcli-core</artifactId>
24+
</dependency>
25+
<dependency>
26+
<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
27+
<artifactId>apimcli-api-export</artifactId>
28+
</dependency>
29+
<dependency>
30+
<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
31+
<artifactId>apimcli-api-import</artifactId>
32+
</dependency>
33+
<dependency>
34+
<groupId>com.github.axway-api-management-plus.apim-cli</groupId>
35+
<artifactId>apimcli-app-export</artifactId>
36+
</dependency>
37+
</dependencies>
38+
39+
<build>
40+
<plugins>
41+
<plugin>
42+
<artifactId>maven-assembly-plugin</artifactId>
43+
<version>3.2.0</version>
44+
<executions>
45+
<execution>
46+
<id>distribution</id>
47+
<phase>package</phase>
48+
<goals>
49+
<goal>single</goal>
50+
</goals>
51+
<configuration>
52+
<finalName>apimanager-apimcli-${project.version}</finalName>
53+
<appendAssemblyId>false</appendAssemblyId>
54+
<descriptors>
55+
<descriptor>assembly/dist-release.xml</descriptor>
56+
</descriptors>
57+
<attach>false</attach>
58+
<appendAssemblyId>false</appendAssemblyId>
59+
</configuration>
60+
</execution>
61+
</executions>
62+
</plugin>
63+
<plugin>
64+
<groupId>org.apache.maven.plugins</groupId>
65+
<artifactId>maven-surefire-plugin</artifactId>
66+
<configuration>
67+
<skipTests>true</skipTests>
68+
</configuration>
69+
</plugin>
70+
<plugin>
71+
<groupId>org.apache.maven.plugins</groupId>
72+
<artifactId>maven-jar-plugin</artifactId>
73+
<configuration>
74+
<skipIfEmpty>true</skipIfEmpty>
75+
</configuration>
76+
</plugin>
77+
</plugins>
78+
</build>
79+
</project>

modules/swagger-promote-export/src/main/assembly/scripts/api-export.bat renamed to modules/api-export/assembly/scripts/api-export.bat

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
1-
@echo off
2-
3-
where java >nul 2>nul
4-
SET javaFound=%errorlevel%
5-
6-
IF DEFINED JAVA_HOME IF EXIST "%JAVA_HOME%\bin\java.exe" (
7-
REM ECHO Using Java from JAVA_HOME
8-
SET _java="%JAVA_HOME%\bin\java.exe"
9-
) ELSE (
10-
IF %javaFound%==0 (
11-
REM ECHO "Using Java runtime from search path."
12-
SET _java=java
13-
) ELSE (
14-
GOTO :MissingJava
15-
)
16-
)
17-
18-
SET currentDir=%cd%
19-
SET programDir=%~dp0
20-
SET bkpClassPath=%CLASSPATH%
21-
22-
CD %programDir%\..
23-
SET CLASSPATH=%programDir%..\lib;%programDir%..\conf
24-
25-
FOR /R ./lib %%a in (*.jar) DO CALL :AddToPath %%a
26-
27-
GOTO :OkClassPath
28-
29-
:AddToPath
30-
SET CLASSPATH=%1;%CLASSPATH%
31-
GOTO :EOF
32-
33-
:MissingJava
34-
ECHO "No Java runtime available. Make java available to the path or set JAVA_HOME!"
35-
SET ERRNO=1
36-
GOTO :END
37-
38-
:OkClassPath
39-
40-
CD %currentDir%
41-
42-
%_java% -Xms64m -Xmx256m -Dlog4j.configuration=../lib/log4j.xml -classpath "%CLASSPATH%" com.axway.apim.ExportApp %*
43-
SET ERRNO=%ERRORLEVEL%
44-
45-
:END
46-
SET CLASSPATH=%bkpClassPath%
47-
48-
EXIT /B %ERRNO%
1+
@echo off
2+
3+
where java >nul 2>nul
4+
SET javaFound=%errorlevel%
5+
6+
IF DEFINED JAVA_HOME IF EXIST "%JAVA_HOME%\bin\java.exe" (
7+
REM ECHO Using Java from JAVA_HOME
8+
SET _java="%JAVA_HOME%\bin\java.exe"
9+
) ELSE (
10+
IF %javaFound%==0 (
11+
REM ECHO "Using Java runtime from search path."
12+
SET _java=java
13+
) ELSE (
14+
GOTO :MissingJava
15+
)
16+
)
17+
18+
SET currentDir=%cd%
19+
SET programDir=%~dp0
20+
SET bkpClassPath=%CLASSPATH%
21+
22+
CD %programDir%\..
23+
SET CLASSPATH=%programDir%..\lib;%programDir%..\conf
24+
25+
FOR /R ./lib %%a in (*.jar) DO CALL :AddToPath %%a
26+
27+
GOTO :OkClassPath
28+
29+
:AddToPath
30+
SET CLASSPATH=%1;%CLASSPATH%
31+
GOTO :EOF
32+
33+
:MissingJava
34+
ECHO "No Java runtime available. Make java available to the path or set JAVA_HOME!"
35+
SET ERRNO=1
36+
GOTO :END
37+
38+
:OkClassPath
39+
40+
CD %currentDir%
41+
42+
%_java% -Xms64m -Xmx256m -Dlog4j.configuration=../lib/log4j.xml -classpath "%CLASSPATH%" com.axway.apim.APIExportApp %*
43+
SET ERRNO=%ERRORLEVEL%
44+
45+
:END
46+
SET CLASSPATH=%bkpClassPath%
47+
48+
EXIT /B %ERRNO%

0 commit comments

Comments
 (0)