Generate OSGi-compliant MANIFEST.MF files
diff --git a/core/pom.xml b/core/pom.xml
index cd0293e..70e07e0 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-SNAPSHOT</version>
</parent>
<artifactId>encoder</artifactId>
diff --git a/esapi/pom.xml b/esapi/pom.xml
index 260f0f5..93654f3 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-SNAPSHOT</version>
</parent>
<artifactId>encoder-esapi</artifactId>
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.owasp.esapi</groupId>
<artifactId>esapi</artifactId>
- <version>[2.0,3)</version>
+ <version>[2.0,2.1)</version>
</dependency>
</dependencies>
</project>
diff --git a/esapi/src/main/java/org/owasp/encoder/esapi/ESAPIEncoder.java b/esapi/src/main/java/org/owasp/encoder/esapi/ESAPIEncoder.java
index 1aa72b1..0f00de0 100644
--- a/esapi/src/main/java/org/owasp/encoder/esapi/ESAPIEncoder.java
+++ b/esapi/src/main/java/org/owasp/encoder/esapi/ESAPIEncoder.java
@@ -35,8 +35,6 @@
package org.owasp.encoder.esapi;
import java.io.IOException;
-import java.net.URI;
-
import org.owasp.encoder.Encode;
import org.owasp.esapi.Encoder;
import org.owasp.esapi.codecs.Codec;
@@ -238,15 +236,5 @@
public byte[] decodeFromBase64(String s) throws IOException {
return _referenceEncoder.decodeFromBase64(s);
}
-
- /** {@inheritDoc} */
- public String encodeForLDAP(String input, boolean encodeWildcards) {
- return _referenceEncoder.encodeForLDAP(input, encodeWildcards);
- }
-
- /** {@inheritDoc} */
- public String getCanonicalizedURI(URI dirtyUri) {
- return _referenceEncoder.getCanonicalizedURI(dirtyUri);
- }
}
}
diff --git a/jsp/pom.xml b/jsp/pom.xml
index 2407a5c..02722aa 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-SNAPSHOT</version>
</parent>
<artifactId>encoder-jsp</artifactId>
diff --git a/pom.xml b/pom.xml
index d81ad2c..c427304 100755
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<groupId>org.owasp.encoder</groupId>
<artifactId>encoder-parent</artifactId>
- <version>1.2.2</version>
+ <version>1.2.3-SNAPSHOT</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>
