diff options
| author | Jeremy Long <jeremy.long@gmail.com> | 2020-11-08 07:38:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-08 07:38:22 -0500 |
| commit | 8daeb092edca7692add613dde484549d4285d15e (patch) | |
| tree | def4c448f849eca26a5b965930a2e3ee15dc4fb1 | |
| parent | d816d12b4f06c091fd998afe43f4b98f90f13b81 (diff) | |
| parent | 4a45510d5c8dee2787441cde1b2dac2c4ed94351 (diff) | |
| download | java-encoder-8daeb092edca7692add613dde484549d4285d15e.tar.gz | |
Merge branch 'master' into master
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | core/pom.xml | 2 | ||||
| -rw-r--r-- | esapi/pom.xml | 2 | ||||
| -rw-r--r-- | jsp/pom.xml | 2 | ||||
| -rwxr-xr-x | pom.xml | 46 |
5 files changed, 49 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index a26172b..5206c1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: java +dist: trusty jdk: - openjdk8 diff --git a/core/pom.xml b/core/pom.xml index cd0293e..ad329f1 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -42,7 +42,7 @@ <parent>
<groupId>org.owasp.encoder</groupId>
<artifactId>encoder-parent</artifactId>
- <version>1.2.2</version>
+ <version>1.2.3</version>
</parent>
<artifactId>encoder</artifactId>
diff --git a/esapi/pom.xml b/esapi/pom.xml index 637012a..263f4e0 100644 --- a/esapi/pom.xml +++ b/esapi/pom.xml @@ -42,7 +42,7 @@ <parent> <groupId>org.owasp.encoder</groupId> <artifactId>encoder-parent</artifactId> - <version>1.2.2</version> + <version>1.2.3</version> </parent> <artifactId>encoder-esapi</artifactId> diff --git a/jsp/pom.xml b/jsp/pom.xml index 2407a5c..f720cb6 100644 --- a/jsp/pom.xml +++ b/jsp/pom.xml @@ -42,7 +42,7 @@ <parent> <groupId>org.owasp.encoder</groupId> <artifactId>encoder-parent</artifactId> - <version>1.2.2</version> + <version>1.2.3</version> </parent> <artifactId>encoder-jsp</artifactId> @@ -41,7 +41,7 @@ <groupId>org.owasp.encoder</groupId> <artifactId>encoder-parent</artifactId> - <version>1.2.2</version> + <version>1.2.3</version> <packaging>pom</packaging> <name>OWASP Java Encoder Project</name> @@ -239,6 +239,11 @@ <version>3.6</version> </plugin> <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>3.3.0</version> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> <version>2.3</version> @@ -266,6 +271,26 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <executions> + <execution> + <id>default-bundle</id> + <phase>process-classes</phase> + <goals> + <goal>manifest</goal> + </goals> + <configuration> + <excludeDependencies>true</excludeDependencies> + <instructions> + <_noee>true</_noee> + <_nouses>true</_nouses> + </instructions> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> <configuration> @@ -299,6 +324,25 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>default-jar</id> + <phase>package</phase> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <skipIfEmpty>true</skipIfEmpty> + <archive> + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <executions> <execution> |