package init
This commit is contained in:
parent
5a892b4290
commit
7051580c33
80
0002-Adjust-IVY-paths.patch
Normal file
80
0002-Adjust-IVY-paths.patch
Normal file
@ -0,0 +1,80 @@
|
||||
From 07fe18c259b12c725c12758e5ca32b88c840ba81 Mon Sep 17 00:00:00 2001
|
||||
From: Marek Goldmann <marek.goldmann@gmail.com>
|
||||
Date: Mon, 16 Dec 2013 11:27:28 +0100
|
||||
Subject: [PATCH] Adjust IVY paths
|
||||
|
||||
---
|
||||
ivy.settings.xml | 10 ++++------
|
||||
ivy.xml | 13 +++++++------
|
||||
2 files changed, 11 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/ivy.settings.xml b/ivy.settings.xml
|
||||
index 3ebabf1..a2d5426 100644
|
||||
--- a/ivy.settings.xml
|
||||
+++ b/ivy.settings.xml
|
||||
@@ -26,8 +26,10 @@
|
||||
artifactPattern="[organisation]/[module]/[type]s/[artifact]-[revision](-[classifier]).[ext]"/>
|
||||
<resolvers>
|
||||
<filesystem name="local">
|
||||
- <ivy pattern="${ivy.cache.dir}/[module]/ivy-[revision].xml"/>
|
||||
- <artifact pattern="${ivy.cache.dir}/[organisation]/[module]/[artifact]-[revision](-[classifier]).[ext]"/>
|
||||
+ <ivy pattern="${basedir}/[module]/ivy-[revision].xml"/>
|
||||
+ <artifact pattern="/usr/share/java/[artifact].[ext]" />
|
||||
+ <artifact pattern="/usr/share/java/[artifact]/[artifact].[ext]" />
|
||||
+ <artifact pattern="/usr/share/java/jboss/[artifact].[ext]" />
|
||||
</filesystem>
|
||||
<ibiblio name="jboss" m2compatible="true" usepoms="false" root="${jboss.repo}"
|
||||
pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
|
||||
@@ -39,10 +41,6 @@
|
||||
pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
|
||||
<chain name="default" returnFirst="true">
|
||||
<resolver ref="local"/>
|
||||
- <resolver ref="jboss"/>
|
||||
- <resolver ref="snapshots"/>
|
||||
- <resolver ref="central"/>
|
||||
- <resolver ref="fungal"/>
|
||||
</chain>
|
||||
</resolvers>
|
||||
</ivysettings>
|
||||
diff --git a/ivy.xml b/ivy.xml
|
||||
index d4ad55e..0de4366 100644
|
||||
--- a/ivy.xml
|
||||
+++ b/ivy.xml
|
||||
@@ -98,9 +98,10 @@
|
||||
<!-- Maven doesn't handle dependencies well, so logging has to be first -->
|
||||
<dependency org="org.jboss.jdeparser" name="jdeparser" rev="${version.jboss.jdeparser}" conf="as,common,ironjacamar-depchain"/>
|
||||
<dependency org="org.jboss.logging" name="jboss-logging" rev="${version.jboss.logging}" conf="as,common,ironjacamar-common-impl,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-common,ironjacamar-deployers-fungal"/>
|
||||
- <dependency org="org.jboss.logging" name="jboss-logging-processor" rev="${version.jboss.logging-processor}" conf="as,common"/>
|
||||
+ <dependency org="org.jboss.logging" name="jboss-logging-tools/jboss-logging-processor" rev="${version.jboss.logging-processor}" conf="as,common"/>
|
||||
+ <dependency org="org.jboss.logging" name="jboss-logging-tools/jboss-logging-annotations" rev="${version.jboss.logging-processor}" conf="common,as"/>
|
||||
<dependency org="org.jboss.logmanager" name="jboss-logmanager" rev="${version.jboss.logmanager}" conf="as,common,ironjacamar-depchain"/>
|
||||
- <dependency org="org.jboss.logmanager" name="log4j-jboss-logmanager" rev="${version.jboss.logmanager.log4j}" conf="as,common,ironjacamar-depchain"/>
|
||||
+ <dependency org="org.jboss.logmanager" name="log4j-jboss-logmanager/log4j-jboss-logmanager" rev="${version.jboss.logmanager.log4j}" conf="as,common,ironjacamar-depchain"/>
|
||||
|
||||
<!-- Keep these sorted -->
|
||||
<dependency org="apache-logging" name="commons-logging" rev="${version.apache-logging}" conf="common,ironjacamar-depchain"/>
|
||||
@@ -117,8 +118,8 @@
|
||||
<dependency org="javax.el" name="javax.el-api" rev="${version.jetty.el}" conf="jetty"/>
|
||||
<dependency org="javax.servlet" name="javax.servlet-api" rev="${version.jetty.servlet}" conf="jetty"/>
|
||||
<dependency org="javax.servlet.jsp" name="javax.servlet.jsp-api" rev="${version.jetty.jsp}" conf="jetty"/>
|
||||
- <dependency org="javax.validation" name="validation-api" rev="${version.validation-api}" conf="as,common,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal"/>
|
||||
- <dependency org="jdepend" name="jdepend" rev="${version.jdepend}" conf="tools"/>
|
||||
+ <dependency org="javax.validation" name="bean-validation-api" rev="${version.validation-api}" conf="as,common,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal"/>
|
||||
+ <dependency org="jdepend" name="jdepend" rev="${version.jdepend}" conf="tools,as"/>
|
||||
<dependency org="junit" name="junit" rev="${version.junit}" conf="test"/>
|
||||
<dependency org="log4j" name="log4j" rev="${version.apache-log4j}" conf="common,ironjacamar-depchain"/>
|
||||
<dependency org="net.sf.saxon" name="saxon" rev="${version.saxon}" conf="tools"/>
|
||||
@@ -188,8 +189,8 @@
|
||||
<dependency org="org.jboss.shrinkwrap" name="shrinkwrap-spi" rev="${version.jboss.shrinkwrap}" conf="embedded,ironjacamar-depchain"/>
|
||||
<dependency org="org.jboss.slf4j" name="slf4j-jboss-logmanager" rev="${version.jboss.slf4j.logmanager}" conf="common,ironjacamar-depchain"/>
|
||||
<dependency org="org.jboss.spec.javax.jms" name="jboss-jms-api_1.1_spec" rev="${version.jboss.jms.api}" conf="hornetq"/>
|
||||
- <dependency org="org.jboss.spec.javax.security.auth.message" name="jboss-jaspi-api_1.0_spec" rev="${version.jboss.jaspi.api}" conf="as,common,ironjacamar-core-impl,ironjacamar-depchain"/>
|
||||
- <dependency org="org.jboss.spec.javax.transaction" name="jboss-transaction-api_1.2_spec" rev="${version.transaction.api}" conf="as,common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal,ironjacamar-spec-api,ironjacamar-jdbc"/>
|
||||
+ <dependency org="org.jboss.spec.javax.security.auth.message" name="jboss-jaspi-1.0-api/jboss-jaspi-api_1.0_spec" rev="${version.jboss.jaspi.api}" conf="as,common,ironjacamar-core-impl,ironjacamar-depchain"/>
|
||||
+ <dependency org="org.jboss.spec.javax.transaction" name="jboss-transaction-1.2-api/jboss-transaction-api_1.2_spec" rev="${version.transaction.api}" conf="as,common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal,ironjacamar-spec-api,ironjacamar-jdbc"/>
|
||||
<dependency org="org.jboss.stdio" name="jboss-stdio" rev="${version.jboss.stdio}" conf="common,ironjacamar-depchain"/>
|
||||
<dependency org="org.jboss.threads" name="jboss-threads" rev="${version.jboss.threads}" conf="as,common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain"/>
|
||||
<dependency org="org.jgroups" name="jgroups" rev="${version.jgroups}" conf="as,common,ironjacamar-depchain"/>
|
||||
--
|
||||
1.8.4.2
|
||||
|
||||
24
ironjacamar-1.3.4-remove-ambiguous-reference-to-tracef.patch
Normal file
24
ironjacamar-1.3.4-remove-ambiguous-reference-to-tracef.patch
Normal file
@ -0,0 +1,24 @@
|
||||
diff -Nru ironjacamar-ironjacamar-1.3.4.Final/adapters/src/main/java/org/jboss/jca/adapters/jdbc/extensions/db2/DB2ExceptionSorter.java ironjacamar-ironjacamar-1.3.4.Final.tracef/adapters/src/main/java/org/jboss/jca/adapters/jdbc/extensions/db2/DB2ExceptionSorter.java
|
||||
--- ironjacamar-ironjacamar-1.3.4.Final/adapters/src/main/java/org/jboss/jca/adapters/jdbc/extensions/db2/DB2ExceptionSorter.java 2016-03-29 11:13:27.000000000 +0200
|
||||
+++ ironjacamar-ironjacamar-1.3.4.Final.tracef/adapters/src/main/java/org/jboss/jca/adapters/jdbc/extensions/db2/DB2ExceptionSorter.java 2016-07-20 19:33:05.569716665 +0200
|
||||
@@ -72,7 +72,7 @@
|
||||
isFatal = true;
|
||||
}
|
||||
|
||||
- logger.tracef("Evaluated SQL error code %d isException returned %b", code, isFatal);
|
||||
+ logger.tracef("Evaluated SQL error code %d isException returned %b", (Object) code, isFatal);
|
||||
|
||||
return isFatal;
|
||||
}
|
||||
diff -Nru ironjacamar-ironjacamar-1.3.4.Final/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java ironjacamar-ironjacamar-1.3.4.Final.tracef/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java
|
||||
--- ironjacamar-ironjacamar-1.3.4.Final/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java 2016-03-29 11:13:27.000000000 +0200
|
||||
+++ ironjacamar-ironjacamar-1.3.4.Final.tracef/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java 2016-07-20 19:38:34.107908565 +0200
|
||||
@@ -1143,7 +1143,7 @@
|
||||
if (wasTrackByTx)
|
||||
{
|
||||
log.tracef("afterCompletion(%d) isTrackByTx=%b for %s"
|
||||
- , status, isTrackByTx(), TxConnectionListener.this);
|
||||
+ , (Object) status, isTrackByTx(), TxConnectionListener.this);
|
||||
|
||||
if (wasFreed(null))
|
||||
{
|
||||
15
ironjacamar-1.3.4.Final-Use-local-provided-IVY.patch
Normal file
15
ironjacamar-1.3.4.Final-Use-local-provided-IVY.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff -Nru ironjacamar-ironjacamar-1.3.4.Final/build.xml ironjacamar-ironjacamar-1.3.4.Final.ivy/build.xml
|
||||
--- ironjacamar-ironjacamar-1.3.4.Final/build.xml 2016-03-29 11:13:27.000000000 +0200
|
||||
+++ ironjacamar-ironjacamar-1.3.4.Final.ivy/build.xml 2016-07-01 23:06:50.425994323 +0200
|
||||
@@ -298,10 +298,7 @@
|
||||
Bootstrap Ivy
|
||||
================================= -->
|
||||
<mkdir dir="${ivy.dir}"/>
|
||||
- <get usetimestamp="true" src="https://repository.apache.org/content/repositories/releases/org/apache/ivy/ivy/${ivy.version}/${ivy.jar.name}"
|
||||
- skipexisting="true"
|
||||
- dest="${ivy.dir}/${ivy.jar.name}"/>
|
||||
- <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.dir}/${ivy.jar.name}"/>
|
||||
+ <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="/usr/share/java/ivy.jar"/>
|
||||
|
||||
<!-- =================================
|
||||
Target: init
|
||||
BIN
ironjacamar-1.3.4.Final.tar.gz
Normal file
BIN
ironjacamar-1.3.4.Final.tar.gz
Normal file
Binary file not shown.
100
ironjacamar.spec
Normal file
100
ironjacamar.spec
Normal file
@ -0,0 +1,100 @@
|
||||
%global namedreltag .Final
|
||||
%global namedversion %{version}%{?namedreltag}
|
||||
Name: ironjacamar
|
||||
Version: 1.3.4
|
||||
Release: 1
|
||||
Summary: Java Connector Architecture 1.7 implementation
|
||||
License: LGPLv2+
|
||||
URL: http://www.ironjacamar.org/
|
||||
Source0: https://github.com/ironjacamar/ironjacamar/archive/%{name}-%{namedversion}.tar.gz
|
||||
Patch0: ironjacamar-1.3.4.Final-Use-local-provided-IVY.patch
|
||||
Patch1: 0002-Adjust-IVY-paths.patch
|
||||
Patch2: ironjacamar-1.3.4-remove-ambiguous-reference-to-tracef.patch
|
||||
BuildRequires: ant apache-ivy graphviz ivy-local java-devel javapackages-local
|
||||
BuildRequires: mvn(javax.validation:validation-api) mvn(jdepend:jdepend)
|
||||
BuildRequires: mvn(org.apache.ant:ant) mvn(org.jboss:jandex)
|
||||
BuildRequires: mvn(org.jboss:jboss-transaction-spi) mvn(org.jboss.apiviz:apiviz)
|
||||
BuildRequires: mvn(org.jboss.jdeparser:jdeparser) mvn(org.jboss.logging:jboss-logging)
|
||||
BuildRequires: mvn(org.jboss.logging:jboss-logging-annotations)
|
||||
BuildRequires: mvn(org.jboss.logging:jboss-logging-processor)
|
||||
BuildRequires: mvn(org.jboss.logmanager:jboss-logmanager)
|
||||
BuildRequires: mvn(org.jboss.logmanager:log4j-jboss-logmanager)
|
||||
BuildRequires: mvn(org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.0_spec)
|
||||
BuildRequires: mvn(org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec)
|
||||
BuildRequires: mvn(org.jboss.threads:jboss-threads) mvn(org.jgroups:jgroups)
|
||||
BuildRequires: mvn(org.picketbox:picketbox)
|
||||
Requires: java-headless javapackages-tools mvn(javax.validation:validation-api)
|
||||
Requires: mvn(org.jboss:jandex) mvn(org.jboss:jboss-transaction-spi)
|
||||
Requires: mvn(org.jboss.logging:jboss-logging)
|
||||
Requires: mvn(org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.0_spec)
|
||||
Requires: mvn(org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec)
|
||||
Requires: mvn(org.jboss.threads:jboss-threads)
|
||||
Requires: mvn(org.jboss.logmanager:log4j-jboss-logmanager) mvn(org.picketbox:picketbox)
|
||||
BuildArch: noarch
|
||||
%description
|
||||
The IronJacamar project implements the Java Connector Architecture 1.7
|
||||
specification.
|
||||
The Java Connector Architecture (JCA) defines a standard architecture for
|
||||
connecting the Java EE platform to heterogeneous Enterprise Information
|
||||
Systems (EIS). Examples of EISs include Enterprise Resource Planning (ERP),
|
||||
mainframe transaction processing (TP), database and messaging systems.
|
||||
|
||||
%package help
|
||||
Summary: Javadoc for %{name}
|
||||
provides: %{name}-help = %{version}-%{release}
|
||||
obsoletes: %{name}-help < %{version}-%{release}
|
||||
%description help
|
||||
This package contains the API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -qn %{name}-%{name}-%{namedversion}
|
||||
find -name "*.class" -print -delete
|
||||
find -name "*.jar" -print -delete
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
files='
|
||||
api/src/main/java/javax/resource/spi/BootstrapContext.java
|
||||
api/src/main/java/javax/resource/spi/work/SecurityContext.java
|
||||
'
|
||||
for f in ${files}; do
|
||||
native2ascii -encoding UTF8 ${f} ${f}
|
||||
done
|
||||
cp -r doc/licenses/lgpl-2.1.txt LICENSE.txt
|
||||
mkdir lib
|
||||
sed -i '/IronJacamar requires JDK7/d' build.xml
|
||||
sed -i '/Nexus requires JDK7/d' build.xml
|
||||
sed -i '/<deploy-file/d' build.xml
|
||||
sed -i '/<install-file/d' build.xml
|
||||
|
||||
%build
|
||||
ant -Divy.mode=local -Das jars-base clean docs nexus-base
|
||||
%pom_change_dep org.jboss.spec.javax.transaction: :jboss-transaction-api_1.2_spec target/%{name}-core-api.xml
|
||||
%pom_change_dep javax.validation: :validation-api target/%{name}-core-impl.xml
|
||||
%pom_change_dep org.jboss.spec.javax.security.auth.message: :jboss-jaspi-api_1.0_spec target/%{name}-core-impl.xml
|
||||
%pom_change_dep org.jboss.spec.javax.transaction: :jboss-transaction-api_1.2_spec target/%{name}-core-impl.xml
|
||||
%pom_change_dep org.jboss.spec.javax.transaction: :jboss-transaction-api_1.2_spec target/%{name}-jdbc.xml
|
||||
%pom_change_dep org.jboss.spec.javax.transaction: :jboss-transaction-api_1.2_spec target/%{name}-spec-api.xml
|
||||
|
||||
%install
|
||||
mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name} \
|
||||
$RPM_BUILD_ROOT%{_mavenpomdir} \
|
||||
$RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
for m in common-api common-impl common-spi core-api core-impl deployers-common jdbc spec-api validator; do
|
||||
install -pm 644 target/%{name}-${m}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-${m}.jar
|
||||
install -pm 644 target/%{name}-${m}.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-${m}.pom
|
||||
%add_maven_depmap JPP.%{name}-%{name}-${m}.pom %{name}/%{name}-${m}.jar
|
||||
done
|
||||
cp -rp target/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
||||
|
||||
%files -f .mfiles
|
||||
%doc README.md
|
||||
%license LICENSE.txt
|
||||
|
||||
%files help
|
||||
%{_javadocdir}/%{name}
|
||||
%license LICENSE.txt
|
||||
|
||||
%changelog
|
||||
* Mon Aug 24 2020 huanghaitao <huanghaitao8@huawei.com> - 1.3.4-1
|
||||
- package init
|
||||
4
ironjacamar.yaml
Normal file
4
ironjacamar.yaml
Normal file
@ -0,0 +1,4 @@
|
||||
version_control: github
|
||||
src_repo: ironjacamar/ironjacamar
|
||||
tag_pattern: ironjacamar-(.*?).Final
|
||||
seperator: "."
|
||||
Loading…
x
Reference in New Issue
Block a user