You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2019/06/06 12:06:45 UTC
[servicemix-bundles] branch master updated: Fix jasypt 1.9.3
bundles pom.xml and add for next release cycle (1.9.4 would be better as it
should include an expected fix)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git
The following commit(s) were added to refs/heads/master by this push:
new b5614bb Fix jasypt 1.9.3 bundles pom.xml and add for next release cycle (1.9.4 would be better as it should include an expected fix)
b5614bb is described below
commit b5614bb351c2735f68c2d00af5e0e7a53d8d9e40
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Thu Jun 6 14:06:01 2019 +0200
Fix jasypt 1.9.3 bundles pom.xml and add for next release cycle (1.9.4 would be better as it should include an expected fix)
---
jasypt-1.9.2/pom.xml | 101 --------------------
.../src/main/resources/OSGI-INF/bundle.info | 26 -----
jasypt-1.9.3/pom.xml | 6 ++
jasypt-spring31-1.9.2/pom.xml | 105 ---------------------
.../src/main/resources/OSGI-INF/bundle.info | 26 -----
jasypt-spring31-1.9.3/pom.xml | 6 ++
pom.xml | 90 +-----------------
7 files changed, 13 insertions(+), 347 deletions(-)
diff --git a/jasypt-1.9.2/pom.xml b/jasypt-1.9.2/pom.xml
deleted file mode 100644
index dba51bc..0000000
--- a/jasypt-1.9.2/pom.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>bundles-pom</artifactId>
- <version>11</version>
- <relativePath>../bundles-pom/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jasypt</artifactId>
- <version>1.9.2_2-SNAPSHOT</version>
- <packaging>bundle</packaging>
- <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
- <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-
- <properties>
- <pkgGroupId>org.jasypt</pkgGroupId>
- <pkgArtifactId>jasypt</pkgArtifactId>
- <pkgVersion>1.9.2</pkgVersion>
- <servicemix.osgi.export.pkg>
- org.jasypt
- </servicemix.osgi.export.pkg>
- <servicemix.osgi.import.pkg>
- javax.crypto*,
- com.ibm.icu.text*;resolution:=optional,
- javax.servlet*;resolution:=optional,
- </servicemix.osgi.import.pkg>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}</artifactId>
- <version>${pkgVersion}</version>
- </dependency>
-
- <!-- sources -->
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}</artifactId>
- <version>${pkgVersion}</version>
- <classifier>sources</classifier>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>${pkgGroupId}:${pkgArtifactId}</include>
- </includes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
- <excludes>
- <exclude>**</exclude>
- </excludes>
- </filter>
- </filters>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/jasypt-1.9.2/src/main/resources/OSGI-INF/bundle.info b/jasypt-1.9.2/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index 41e8a46..0000000
--- a/jasypt-1.9.2/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,26 +0,0 @@
-\u001B[1mSYNOPSIS\u001B[0m
- ${project.description}
-
- Original Maven URL:
- \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
- Jasypt is a java library which allows the developer to add basic encryption
- capabilities to his/her projects with minimum effort, and without the need
- of having deep knowledge on how cryptography works.
-
- * High-security, standards-based encryption techniques, both for
- unidirectional and bidirectional encryption. Encrypt passwords,
- texts, numbers, binaries...
- * Transparent integration with Hibernate.
- * Suitable for integration into Spring-based applications and also
- transparently integrable with Spring Security.
- * Integrated capabilities for encrypting the configuration of applications
- (i.e. datasources).
- * Specific features for high-performance encryption in
- multi-processor/multi-core systems.
- * Open API for use with any JCE provider.
- * ...and much more
-
-\u001B[1mSEE ALSO\u001B[0m
- \u001B[36mhttp://www.jasypt.org/\u001B[0m
diff --git a/jasypt-1.9.3/pom.xml b/jasypt-1.9.3/pom.xml
index ae972c1..0a3f335 100644
--- a/jasypt-1.9.3/pom.xml
+++ b/jasypt-1.9.3/pom.xml
@@ -35,6 +35,12 @@
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
+ <scm>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
+ <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
+ </scm>
+
<properties>
<pkgGroupId>org.jasypt</pkgGroupId>
<pkgArtifactId>jasypt</pkgArtifactId>
diff --git a/jasypt-spring31-1.9.2/pom.xml b/jasypt-spring31-1.9.2/pom.xml
deleted file mode 100644
index 7a605c9..0000000
--- a/jasypt-spring31-1.9.2/pom.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>bundles-pom</artifactId>
- <version>11</version>
- <relativePath>../bundles-pom/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jasypt-spring31</artifactId>
- <version>1.9.2_2-SNAPSHOT</version>
- <packaging>bundle</packaging>
- <name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
- <description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
-
- <properties>
- <pkgGroupId>org.jasypt</pkgGroupId>
- <pkgArtifactId>jasypt-spring31</pkgArtifactId>
- <pkgVersion>1.9.2</pkgVersion>
- <servicemix.osgi.export.pkg>
- org.jasypt.spring31
- </servicemix.osgi.export.pkg>
- <servicemix.osgi.import.pkg>
- org.jasypt*,
- org.springframework.beans*,
- org.springframework.context*,
- org.springframework.core*,
- org.springframework.util*,
- org.springframework.web*;resolution:=optional,
- org.w3c.dom
- </servicemix.osgi.import.pkg>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}</artifactId>
- <version>${pkgVersion}</version>
- </dependency>
-
- <!--sources -->
- <dependency>
- <groupId>${pkgGroupId}</groupId>
- <artifactId>${pkgArtifactId}</artifactId>
- <version>${pkgVersion}</version>
- <classifier>sources</classifier>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>${pkgGroupId}:${pkgArtifactId}</include>
- </includes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>${pkgGroupId}:${pkgArtifactId}</artifact>
- <excludes>
- <exclude>**</exclude>
- </excludes>
- </filter>
- </filters>
- <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
- <createDependencyReducedPom>true</createDependencyReducedPom>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/jasypt-spring31-1.9.2/src/main/resources/OSGI-INF/bundle.info b/jasypt-spring31-1.9.2/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index 41e8a46..0000000
--- a/jasypt-spring31-1.9.2/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,26 +0,0 @@
-\u001B[1mSYNOPSIS\u001B[0m
- ${project.description}
-
- Original Maven URL:
- \u001B[33mmvn:${pkgGroupId}/${pkgArtifactId}/${pkgVersion}\u001B[0m
-
-\u001B[1mDESCRIPTION\u001B[0m
- Jasypt is a java library which allows the developer to add basic encryption
- capabilities to his/her projects with minimum effort, and without the need
- of having deep knowledge on how cryptography works.
-
- * High-security, standards-based encryption techniques, both for
- unidirectional and bidirectional encryption. Encrypt passwords,
- texts, numbers, binaries...
- * Transparent integration with Hibernate.
- * Suitable for integration into Spring-based applications and also
- transparently integrable with Spring Security.
- * Integrated capabilities for encrypting the configuration of applications
- (i.e. datasources).
- * Specific features for high-performance encryption in
- multi-processor/multi-core systems.
- * Open API for use with any JCE provider.
- * ...and much more
-
-\u001B[1mSEE ALSO\u001B[0m
- \u001B[36mhttp://www.jasypt.org/\u001B[0m
diff --git a/jasypt-spring31-1.9.3/pom.xml b/jasypt-spring31-1.9.3/pom.xml
index 811356a..4088a5c 100644
--- a/jasypt-spring31-1.9.3/pom.xml
+++ b/jasypt-spring31-1.9.3/pom.xml
@@ -35,6 +35,12 @@
<name>Apache ServiceMix :: Bundles :: ${pkgArtifactId}</name>
<description>This OSGi bundle wraps ${pkgArtifactId} ${pkgVersion} jar file.</description>
+ <scm>
+ <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
+ <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
+ <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
+ </scm>
+
<properties>
<pkgGroupId>org.jasypt</pkgGroupId>
<pkgArtifactId>jasypt-spring31</pkgArtifactId>
diff --git a/pom.xml b/pom.xml
index 1d3069e..06d9765 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,95 +42,7 @@
<name>Apache ServiceMix :: Bundles</name>
<modules>
- <module>retrofit-2.5.0-2</module>
- <module>saxon-9.9.1-3</module>
- <module>elasticsearch-6.6.2</module>
- <module>elasticsearch-7.0.1</module>
- <module>elasticsearch-7.1.0</module>
- <module>fastjson-1.2.58</module>
- <module>zxing-3.4.0</module>
- <module>libphonenumber-8.10.12</module>
- <module>braintree-java-2.96.0</module>
- <module>spring-data-commons-2.1.8.RELEASE</module>
- <module>spring-data-keyvalue-2.1.8.RELEASE</module>
- <module>spring-data-redis-2.1.8.RELEASE</module>
- <module>azure-storage-8.3.0</module>
- <module>qpid-6.3.4</module>
- <module>aws-java-sdk-1.11.559</module>
- <module>sparkjava-core-2.9.1</module>
- <module>cglib-3.2.12</module>
- <module>grpc-1.21.0</module>
- <module>gae-1.9.74</module>
- <module>javax-cache-api-1.1.1</module>
- <module>json4s-3.6.6</module>
- <module>poi-4.1.0</module>
- <module>solr-solrj-8.1.0</module>
- <module>lucene-8.1.0</module>
- <module>lucene-analyzers-common-8.1.0</module>
- <module>lucene-queries-8.1.0</module>
- <module>lucene-queryparser-8.1.0</module>
- <module>lucene-sandbox-8.1.0</module>
- <module>xmlbeans-3.1.0</module>
- <module>aspectj-1.9.4</module>
- <module>ant-1.10.6</module>
- <module>neo4j-3.5.6</module>
- <module>avro-1.9.0</module>
- <module>avro-ipc-1.9.0</module>
- <module>spring-aop-5.1.7.RELEASE</module>
- <module>spring-aspects-5.1.7.RELEASE</module>
- <module>spring-beans-5.1.7.RELEASE</module>
- <module>spring-context-5.1.7.RELEASE</module>
- <module>spring-context-support-5.1.7.RELEASE</module>
- <module>spring-core-5.1.7.RELEASE</module>
- <module>spring-expression-5.1.7.RELEASE</module>
- <module>spring-instrument-5.1.7.RELEASE</module>
- <module>spring-jdbc-5.1.7.RELEASE</module>
- <module>spring-jms-5.1.7.RELEASE</module>
- <module>spring-messaging-5.1.7.RELEASE</module>
- <module>spring-orm-5.1.7.RELEASE</module>
- <module>spring-oxm-5.1.7.RELEASE</module>
- <module>spring-test-5.1.7.RELEASE</module>
- <module>spring-tx-5.1.7.RELEASE</module>
- <module>spring-web-5.1.7.RELEASE</module>
- <module>spring-webmvc-5.1.7.RELEASE</module>
- <module>spring-websocket-5.1.7.RELEASE</module>
- <module>spring-aop-5.0.14.RELEASE</module>
- <module>spring-aspects-5.0.14.RELEASE</module>
- <module>spring-beans-5.0.14.RELEASE</module>
- <module>spring-context-5.0.14.RELEASE</module>
- <module>spring-context-support-5.0.14.RELEASE</module>
- <module>spring-core-5.0.14.RELEASE</module>
- <module>spring-expression-5.0.14.RELEASE</module>
- <module>spring-instrument-5.0.14.RELEASE</module>
- <module>spring-jdbc-5.0.14.RELEASE</module>
- <module>spring-jms-5.0.14.RELEASE</module>
- <module>spring-messaging-5.0.14.RELEASE</module>
- <module>spring-orm-5.0.14.RELEASE</module>
- <module>spring-oxm-5.0.14.RELEASE</module>
- <module>spring-test-5.0.14.RELEASE</module>
- <module>spring-tx-5.0.14.RELEASE</module>
- <module>spring-web-5.0.14.RELEASE</module>
- <module>spring-webmvc-5.0.14.RELEASE</module>
- <module>spring-websocket-5.0.14.RELEASE</module>
- <module>spring-aop-4.3.24.RELEASE</module>
- <module>spring-aspects-4.3.24.RELEASE</module>
- <module>spring-beans-4.3.24.RELEASE</module>
- <module>spring-context-4.3.24.RELEASE</module>
- <module>spring-context-support-4.3.24.RELEASE</module>
- <module>spring-core-4.3.24.RELEASE</module>
- <module>spring-expression-4.3.24.RELEASE</module>
- <module>spring-instrument-4.3.24.RELEASE</module>
- <module>spring-jdbc-4.3.24.RELEASE</module>
- <module>spring-jms-4.3.24.RELEASE</module>
- <module>spring-messaging-4.3.24.RELEASE</module>
- <module>spring-orm-4.3.24.RELEASE</module>
- <module>spring-oxm-4.3.24.RELEASE</module>
- <module>spring-test-4.3.24.RELEASE</module>
- <module>spring-tx-4.3.24.RELEASE</module>
- <module>spring-web-4.3.24.RELEASE</module>
- <module>spring-webmvc-4.3.24.RELEASE</module>
- <module>spring-webmvc-portlet-4.3.24.RELEASE</module>
- <module>spring-websocket-4.3.24.RELEASE</module>
+ <module>jasypt-1.9.3</module>
</modules>
</project>